diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4111fc7c42fd..fec758d9abaa 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 514139659921..55159aed023a 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/app-text/sword-modules/Manifest b/acct-group/nginx-unit/Manifest
similarity index 100%
rename from app-text/sword-modules/Manifest
rename to acct-group/nginx-unit/Manifest
diff --git a/acct-group/nginx-unit/metadata.xml b/acct-group/nginx-unit/metadata.xml
new file mode 100644
index 000000000000..694b1295412e
--- /dev/null
+++ b/acct-group/nginx-unit/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mpagano@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-group/nginx-unit/nginx-unit-0.ebuild b/acct-group/nginx-unit/nginx-unit-0.ebuild
new file mode 100644
index 000000000000..dc8f1f58f989
--- /dev/null
+++ b/acct-group/nginx-unit/nginx-unit-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for www-servers/nginx-unit"
+
+ACCT_GROUP_ID="526"
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index b7f22db20ada..4890071e6d2d 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/nginx-unit/Manifest b/acct-user/nginx-unit/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/nginx-unit/metadata.xml b/acct-user/nginx-unit/metadata.xml
new file mode 100644
index 000000000000..694b1295412e
--- /dev/null
+++ b/acct-user/nginx-unit/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mpagano@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-user/nginx-unit/nginx-unit-0.ebuild b/acct-user/nginx-unit/nginx-unit-0.ebuild
new file mode 100644
index 000000000000..9af0cc52ab82
--- /dev/null
+++ b/acct-user/nginx-unit/nginx-unit-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID="526"
+ACCT_USER_GROUPS=( "nginx-unit" )
+ACCT_USER_HOME="/var/lib/nginx-unit"
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 87796af4f1f3..40ad59e8bd35 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index b2b071657346..83ae48519e84 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,3 +1,5 @@
 DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737
 DIST ansible-core-2.13.7.tar.gz 13940230 BLAKE2B fd3556514f7692b48a66987ff5a084b132217c910ba0b216f2533cd1e542a9b6da6d2aa96e8e32142ab3a6ed7357fc1b68b9827ceaf44b91238bfbcb15b5d026 SHA512 f46d8acb07fa1d397e6e640c52237ed70b575ae0760eeb82b9e41afc6c06d99d341856d6af3452edb82e63a708600c2f348782b8bebc18c0ea9b03a4df80594a
+DIST ansible-core-2.13.8.tar.gz 13985893 BLAKE2B c0fd9ebde2dacd590588a654df29ed56e681ee67f3df41f1d1e91351259c22a0b01f0eb108763596198133e4d980c2130317f79d4f8f25ea1e36dac9325a8b40 SHA512 a3abeaca7076a590892b31735c901447654b5f1db59ca3095ad1d98c8de11b982e1375a22f1814712545fe84a870f57132d87c2ca47fa6a779bd53cd99d17ba4
 DIST ansible-core-2.14.2.tar.gz 11514103 BLAKE2B f908ca83497f4a444ab738cd0f7f75a00e1ee6f2e7dc9c32a67c7e5fcfba166fe7b2938168c8a0fdbafdfcdf5bc08e582cc1c98ab0c032e3768a8fb4e21a99af SHA512 210dcd32b3a7faa50028200cc7f2ef4b8a8c5ee90fdfdf31cb61d2bc6d03c86aeb644a751e0c14aea3c1a95ea9e18703de1de304beeedcda4a98780f3e79cfec
+DIST ansible-core-2.14.3.tar.gz 11516886 BLAKE2B 95c209842c1ccd090467e529f8c84def76cb3df69863b02c01f61a1ac6d4fa911134cc336e51e087215939efa91883ad51d4c01d2b3f4c124b82c540ab0e3be0 SHA512 95278d9c55d3eef2f66db1ee62648b5493e138f19513c32780684c55631c1ec49f94988a8d0f5eede44dbcceca7b4dd34aca10fa67d17dbe90ef8cf37051581d
diff --git a/app-admin/ansible-core/ansible-core-2.13.8.ebuild b/app-admin/ansible-core/ansible-core-2.13.8.ebuild
new file mode 100644
index 000000000000..84f6bffd432f
--- /dev/null
+++ b/app-admin/ansible-core/ansible-core-2.13.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
diff --git a/app-admin/ansible-core/ansible-core-2.14.3.ebuild b/app-admin/ansible-core/ansible-core-2.14.3.ebuild
new file mode 100644
index 000000000000..84f6bffd432f
--- /dev/null
+++ b/app-admin/ansible-core/ansible-core-2.14.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild
index 26d1841f8eab..e04e303184de 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 4495677d3f08..3fff4e4744d5 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,3 +1,4 @@
 DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385
 DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
 DIST ansible-7.2.0.tar.gz 36997591 BLAKE2B 3652ff103cf9d6c415387537d5abe1d11ec9c2b7f8b1e8728308532b2ba449bd3efa08d49d2edb8424d3f845c1c3694557c1acae99b7dcdf93f0e97c6b8623a2 SHA512 30d7f912cd6b2e41f1e5d880b014f00d332b4cc533512be8de885e95b63cf890ffb38a616de74c6b7fd9d6a961b7e2a1843bfe758fbcd9f3c962f1c856f20725
+DIST ansible-7.3.0.tar.gz 37218246 BLAKE2B 04a1a4d00c8f33fa81b907d71f76988ea58e66bb88817475ed4f53fd0fef61468e9e2623ff9224e37f7ea06301aad34ebc39f68e51bdfe049e110d683e6b0171 SHA512 078bda71b6de438c083068902da1543b97f160265a6607fdbf9a386361b0932ba673cf46192c5a3521bc52724489ea9fc0900b0f742756ff4dbf5d2b7d4471bc
diff --git a/app-admin/ansible/ansible-7.3.0.ebuild b/app-admin/ansible/ansible-7.3.0.ebuild
new file mode 100644
index 000000000000..f5a53bb0b081
--- /dev/null
+++ b/app-admin/ansible/ansible-7.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.14.0
+	<app-admin/ansible-core-2.15"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 64094936f5ff..a525d48da651 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,2 +1,4 @@
 DIST aws-cli-1.27.74.gh.tar.gz 2368706 BLAKE2B 3eb9d8c21b9ddfd3a3e4bb53172a46ad69ca71033785bd29fd8b0b0f694c2ed62a4cad998ccd13b07949b86a89f2ca238a63a4553e591ba9066832f51ed87759 SHA512 cf61a3f1dd643bb7d0f81f047c1eeae78a7793532bffa612045273c46ae970b2763156a7679b6e16e65c2f886dec68e54db0169580bb3c37cc08420f874e704c
 DIST aws-cli-1.27.79.gh.tar.gz 2376690 BLAKE2B 8e55d3607b805ebc5673c682731483f0fd6eb77a6cc972d58ce3219c33f9f2054529df6ab46fc85b39849871580cea03c4d7f490c4386cd5ce9d222ecb3c8eda SHA512 fd8b880b6358c50ed189fac538d91ef88d762b8c382da1b57bb086a316f7ee96fa33206a53f3eae2df98df175929c819b855c7ff5b7e5f84c73ecff88f297c79
+DIST aws-cli-1.27.80.gh.tar.gz 2377306 BLAKE2B 3a0e6c66bb9c373456bb05537f20ad339c0987290557c30dbd2e2a8ea127b0f8bfc7028930db712fcbe7461c7bc87dac123c1847da93b675403822f6c02b1d3f SHA512 b94aab2588e8bc0ad007e0392c6eed0642683246b1803007332563495a69deb5da924eda48944e37b674c714cf2e5a45aeddbbedb5d12d51ad8c9c8e76c18ebc
+DIST aws-cli-1.27.81.gh.tar.gz 2377937 BLAKE2B 7323c06cab727066c6541772478a961bc4f7b409b0910e57c79207fad928b7ec82d1b0048983e64d8a8fa3e7ef69d1898cadf2fbd1ea560e05d7a2582e726f88 SHA512 19cff28cd4721df32079795cfab852a11b36f1a2d0335567f0f1dae48eaaf268ae04163dac960a2d543be869f39e8c55e6a0bcee746ccbab29bcf8f37881c305
diff --git a/app-admin/awscli/awscli-1.27.80.ebuild b/app-admin/awscli/awscli-1.27.80.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.80.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.27.81.ebuild b/app-admin/awscli/awscli-1.27.81.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.81.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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/eselect/Manifest b/app-admin/eselect/Manifest
index c648030ffb11..73ae2c1fd565 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,2 +1,2 @@
-DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 DIST eselect-1.4.20.tar.xz 180272 BLAKE2B 424653d00eda45335c3aaae50f6fbf2e89486da4529f657596516352f3b7fcb9859ceb2dc5b9762a34c44fb64e645fa27c46b86453bf50be6e8ae820664a4289 SHA512 9589ed89c4d5d31f71d535886eb50da67b84dec8a13a5df081e7569efee861dede4eaa43a0bfb9930c5b95d4f334e19245cb8820a73f7361527da262da1d1fb2
+DIST eselect-1.4.21.tar.xz 182780 BLAKE2B 64db8ec3655bc78ad0e40be3c83625f46c49b1cd88e881dba843f05cdc56aba4e746b5fd27ab5c6663947dacc93211a98b224d48aeccc0154e203d3929d49116 SHA512 0dfb771401af3ce5f4002ac6717b37351b3a37b0421cf292b7b5a432f4ee2cff1705a44a45f8e5b3dee73440c7b49b2b76a69fb1cfa727874dd64285d1097eb7
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
deleted file mode 100644
index e9515b20c937..000000000000
--- a/app-admin/eselect/eselect-1.4.17.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs vim-syntax"
-
-DEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		app-misc/realpath
-	)"
-RDEPEND="${DEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-BDEPEND="doc? ( dev-python/docutils )"
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-admin/eselect/eselect-1.4.21.ebuild b/app-admin/eselect/eselect-1.4.21.ebuild
new file mode 100644
index 000000000000..db0f598986ef
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.21.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+DEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		app-misc/realpath
+	)"
+RDEPEND="${DEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+BDEPEND="doc? ( dev-python/docutils )"
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index e0e187c65f47..08d8376794ab 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,215 +1,4 @@
-DIST bitbucket.org%2Fcreachadair%2Fstringset%2F@v%2Fv0.0.10.mod 95 BLAKE2B f1b561f9a00d82da2b38e6df5320d512dfc63a5b9ddc1830996d196f8c31126eeaec0f7052d1492be160e8b9b0414d57d9c7168709ed97d371b6e2d0044e3b23 SHA512 84dd7a56ac2312c4cdec85605591fd626983af181f63d85568d4906ebabdc7aedc8649030be2b667804cb2eb07e8aa9ea827a6f6c672917150733a494ed2c4c3
-DIST bitbucket.org%2Fcreachadair%2Fstringset%2F@v%2Fv0.0.10.zip 23450 BLAKE2B daf844c39e56389e9feed78885364ec3fde9e3dce59fdd03062235c4c38db69d21891c748e0b251f4159bef1bf689ca0fdafa7a5855d24fc1570cd76815a6c91 SHA512 23d22670b8fc0b7601788db2e07824b6325b06476f5726af0b631798ba6b1c735e87464bc75d420c1dbf390e4d23ea0db2aa50a294c1bbb2e1f49775b42ed7b1
-DIST filippo.io%2Fage%2F@v%2Fv1.0.0.mod 264 BLAKE2B 11ba1064e7b8c65d0b4172f47b375712b69bf9d8a8e1d87f68d0002390300b2e2617c4d83bfa0af248b6705c4d78b19f3639a79d8740df3e184082f86ad652d5 SHA512 aa7083851a4f24db8278409c712445236419bb58c1fb80727bda9e0f78f7074fe3edbc104cddce608afb45c73a77572f1cfa27b21062f66954c66669ba2c444c
-DIST filippo.io%2Fage%2F@v%2Fv1.0.0.zip 89334 BLAKE2B a4e7a6f06fb66edaeab28235f9e559f456d2427ebd3f1cfa68c873908b03932dea136a1b5297b5ca3e95fd4024919a2347ac9873c4d42337237195e2e0ef50d2 SHA512 fce5261b55f5665315f2546b32926f67002b6570768cec4b47cd2859892757097e3ba6e409ada9711a3c924a6c180555e814a1155532e9f5d5bd3666277192f8
-DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0.mod 40 BLAKE2B 895e3b61e3e272387257e288b70e2a7d461c0de2ed2284e1909ac2bf2eedf841246e175ed848174ec510c53ae207d801cff7a39c560fd2b0c0b4dc08c67f4856 SHA512 2a56ce66f7ba29cd8f975014291690c2f929738a4a8b93529c2c367c0236b767f92e4f6dfda9fe1fdf981926302d7ab26665f7d64b022a22e5305aea693ad2dc
-DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0.zip 48930 BLAKE2B 6c07f4db0c698292593c13d8bc6b58905b145c21a4fcd2ffac36be4fcd04226ba01a31a517b8628c68f16afc82ed87d11613ad978fbb5987d55620ddf40ff045 SHA512 620fd5866637206e1dbcd1f5bd58275a24743d0dfcfa82ea631b679ea65e02992b67dff311ba31a3138d4c013787387d1e8e9f6a584e96118944567eae9259f4
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.4.1.mod 43 BLAKE2B e00572fff0f57c166be62ec93eacb189f004073581077cded1cb443b17c3e03cd1b2db37f0b7a504deb287b6515dd32648678d2ae763d6b6fbd7206a9bdcf30b SHA512 0e8cdda81300811f629bce3a9307de05450036f750f8c3c0cd5b70854f8f95bd962ce99bfe1325c8d1bf562a5b7b94afb9e9fd2dbe4dcc45325fac6e27471102
-DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20220730123233-d6ffb7692adf.mod 165 BLAKE2B 3b1c885a2b1b8a9a712e0fce3b782a21fc58e1ccc370c4601da5fb42d6746ca943c46c249e00a9924d465821cf1e310f71a2ca3e34645151e1aab3c2e5789a59 SHA512 bad488a2884acabcbadc581a09b0814dabef467b14f9b8d3c5b4ced8084e567c0198845a41d678df304f4113793637450f058cf4bc6cf6c132d23ecc473491eb
-DIST github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20220730123233-d6ffb7692adf.zip 358837 BLAKE2B bd6f332a20f5ccdc3817da74657493ee1a9ffb6710fb93bc5794ea96d089a5b1c9fbd0d5fbb96a73dea82dc89b8470d16771b984419aca689ead500f96fc2a79 SHA512 e916beab21a6583fa2d997a9b63b23ed85d53354ac0ec2e7125ed3892f48c732472dfc2755f3f9d377d6f855d2b97d5aa5392d81528410447585ab350932fc47
-DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
-DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.zip 8606 BLAKE2B 47f87ff503a7c47ef7062b0ac3ddab26f8f3d322d27a746ccc1950cb6cb9571237b694eab48f95e1253800dd297df58c0c2ca67b21040e151cff634ebcbdde4a SHA512 5a6d9bc0761469bcf803cbb9d1aa43cc784171a81e53df8c4a14bd56e52db6ee7cd8a45e2fc81ce75bbe19f00cb53be3e170fab9ac3e73e83deaf09b799a9e1a
-DIST github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod 43 BLAKE2B 0bb8e89eb31061bf2d38a3ffef58a48d3fa9a0dee26aeaaad7f38119d76ab9f34f0bb8ea4bddf277b9dea40acfaceff8925d32eb3386e898d6da9916b55bd647 SHA512 3fd19a3f311a3d0a6faa4488daa0932c661c27aad69568efbfa8aac052b175e2934055f7563c081718fb8a5ae560316a0e884a0f904694d9dd128f61dee2ecb9
-DIST github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip 17076 BLAKE2B 93c0e7eb4b46ebfdb442e42b18ad6ff9e531d17b8ea3f140dc5e7cf8a9a4f46263df409b449f157a66f3af34be33a9c35a935533e172a3d6d918cb8c5a127d40 SHA512 ec0402d9a33a5930b3c667e65620c48bc36446e1ccedc608aa1429f9c45d15e7dbed9d00a05f09c7b9b0f933a52525ea7c376c269017e237837887bf95700d70
-DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod 36 BLAKE2B 357371a37d5f2ee657900c4ca455d9aa8aa993989fc6829e182a2c72586f18447600442e31110c5a01f6fbb8de8a17f881d86ee6b882b4b27db1bc566ca33fb4 SHA512 1487d5ffde5f6d64bc21be1aa02926261a519fad462731254f03cf124758162cb6f6848fe412cd5b02606674f566ed213ae4fb7b5e54afe29df5ea60e08d3c03
-DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip 89256 BLAKE2B 27127a6badaaf38ae3da05614ef5b83449ca6af65188d4ce8c23e02aed11177cb01bd9cac09499d4f00a11e7d6b9a4614ede7858a11aff4d0ce016fff7228768 SHA512 5ee5fe1288e593efa2ee87ba131b74c6dd51f1e9649093cd9cc728f6f20a5113e716a94f2568b58badb102547084b733a64bc3a5c172b1bc316ba6bda39a1106
-DIST github.com%2Fbwesterb%2Fgo-ristretto%2F@v%2Fv1.2.0.mod 49 BLAKE2B 75dd41fc95c99c6e8ad6615869ae13352e5c37588aad4db602b30415022e4ec110b0e112d6609e5191b235080c1b6a371053fb104d31cb00e478aceb1fb736d2 SHA512 85bd5a37aa0327481441acccf9f9203a4329c7aa9e7fb1893407cd29eb6b3a3369a73d11db07424a3401fbd0e0710857c115f7d5ad3e6e2b1133066606f3a980
-DIST github.com%2Fbwesterb%2Fgo-ristretto%2F@v%2Fv1.2.1.mod 49 BLAKE2B 75dd41fc95c99c6e8ad6615869ae13352e5c37588aad4db602b30415022e4ec110b0e112d6609e5191b235080c1b6a371053fb104d31cb00e478aceb1fb736d2 SHA512 85bd5a37aa0327481441acccf9f9203a4329c7aa9e7fb1893407cd29eb6b3a3369a73d11db07424a3401fbd0e0710857c115f7d5ad3e6e2b1133066606f3a980
-DIST github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod 135 BLAKE2B 972a300b4bfdb286beb205187939882ea19895d492a2deee1529d8aeb390e6825c09fabb4d40f5ba12eecbba80d4663eb8a37c88a4c7fbb7d064f29ca6f52ed3 SHA512 b3b127f9b95a0b40135dd5891ccd0a07de9fcdb010ea8566619fea1096353258e65c6a0aef50e3cd9d199635aca014de1e2e396dcda14b38b9cdb1f8f5930876
-DIST github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip 10979 BLAKE2B 665bc1735901a3bbd3f86ca39d92ebaa9e06ed0a92fe944b402964aa8ad424b8d9fad8ae5578baad06ac6203b80b92abba260eeb19d372618feb7e91bb6c7cdb SHA512 7f1c646db51cc038a0f9ec285f3898d29255eefe0b4fdf33996a604599803b37f81f5c989e3bfd50d34485d95706777112b955bbbdb3c489bdbe12c0757bbbf7
-DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
-DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a
-DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.2.1.mod 40 BLAKE2B dcdee80a005fbc08146444fed824b2d1f62b5613bc0dc9c1716b8a1d44474bb5229d122f9df13bd95e87899516ce83210ab41cebb828e0edae82a0f1bd8f4c8d SHA512 620cb3d86ec60ec34b186f17045b8199ccf7d251e1835312d122b7eea06c4bbd41a812d43fa8738138323e396252ddd90813e3dd5d8b02f904789ebe8be133db
-DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.2.1.zip 6866 BLAKE2B 49ac736b9175e5558b5901cff3b159d17fad88352742eae893a3f8bc0fc08b93f0efa1cece5519baab161c7a264e8a566837fbd928b3b4a19b7bd7d2bdd7a2fb SHA512 8aa43a5bf61fb727cf4fde8a51c47a4e8f8883743e57eae81973cbfc86351a99c6dd0fe6561e0dcc5bfb8f3b139d615b0aa6fc0966308e6c5637a46d84d80eb0
-DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv1.5.1.mod 180 BLAKE2B 6d3fccddc567dc1fafc4a703901e3c7f869458f5148abc53574ea0b4532ab0a4aa9429d00d3df949fcfbedcd3eb4fc899c85ee7f83daaf4f3af49e2e68ad6359 SHA512 52e626ba5fc4576d1086640c36fc0a6e2be9e2d5fbc2a8e2dc8cf9652ac9ef552187acc020a21787ec96b3edb49057ea16f6662607c297e75f9810f0ba0b076a
-DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv1.5.1.zip 55151 BLAKE2B 998d1d5ee63498b8d5e6ac0d190acdc5fcfebbbe9b08b609f3e4b8a49d9d3adbeb9268b0d64c33055e09062cbf15198501dc5fefece26f5f3c854eefbc2ee594 SHA512 ce1d8caf45b453fd7d41de75df1f3fb46eb9cece96fee3245deebf19c560456af26e9658f964b281518a09591b1b2a854e068d6bff50a1f4d1eb0a3b42fe8d54
-DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv1.0.0.mod 79 BLAKE2B 09d6766a384c362f6c4fc8cba80594aa50e85ca5170dabaf1eb2ef062a35c775ceacc07b5a61d7267e1ce4b9341ca7bd4ffe82df9ba2e37b859f8b00f47da93c SHA512 5cabb3b689abd30235b1ac22a367e1817d872429ea909f34ac30da8c832bceffcd6ed3fac0630b7f586d2e6f0daef80be10231f6ea824a1a26502ad7797370a5
-DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv1.0.0.zip 5518 BLAKE2B 635c86c6e2bc3b98cb0164be307543468d7cf17c8f9362638016d06d2fdc4f1b0960256253acbd2e4f296923a72ef6bbf4a2960175d0b0099c90cffee95ad02f SHA512 0a7152d7f4bf548850e6f1bc51f4b19f9513ae8ceca194b27118ec17a3e4443666612b6f07972581e009d6c711f4c31cbbd208a75286e7413d4cdb58acae9117
-DIST github.com%2Fcloudflare%2Fcircl%2F@v%2Fv1.1.0.mod 207 BLAKE2B ffd396c9f6965a000a6738b2e79ba4a41648b924e8ea0495d9ad34655244c562da9687185bc2e4b40b95aeeef87aace10e25329e9cd9fc26b7578446a6d82542 SHA512 94335fa14f99a2a8cbb0f31d07001937c0ab89adc12586ee3fa4cffe98393d559c255fc5a11176500396eb30dace8435885efe50537c3da9e9df4236d79c1f37
-DIST github.com%2Fcloudflare%2Fcircl%2F@v%2Fv1.2.0.mod 207 BLAKE2B c0cc05f6929bf74ff735b0e66672e7b11cb845a40d527c65371a7cc20e8f9d13d854563c80fe325fdda75b3708acf5e9c944cc6b3ae593b52482665497ebd849 SHA512 e7e1a63211e8fb867970c31988c4c0335729ee817b32225f6ab5d027e2babd970f271ee2d02de949315bb2680a23c1215c4156989462affb5dbcfa20d8f5a2ac
-DIST github.com%2Fcloudflare%2Fcircl%2F@v%2Fv1.2.0.zip 4673424 BLAKE2B 75c9316441baa47d9e706d8862c64c070b4d7a8b675df9c054269db2a6d43756cbd79e6e57313458c732bfafcd021208beac4562c2c26ad70eb1e2e757465b64 SHA512 53e3227ece79266f31fc362f8da6c7d49e3e700c2914afd29b2f570cf2a190eca7f469ea59026d8b4e86ec07c8dc694e203fcd9176562c81b14e9c65be53d136
-DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.3-0.20220203105225-a9a7ef127534.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.2.mod 100 BLAKE2B f52c698746c9638de975bcac96fde4bf63f7f2e82d0767b28b4aa07e8900c41f508aedb0204b156cce3d12718b9c17ac1a0873189ed5ebed32282e77cc4b4adc SHA512 d39412bb14c058291d07276337f802547bfb1a682cc65199cb04334f8089b6ea5d4d73587c2765c518f9e27fa3421c276eaea616d7cfbe36a2a244326edf1cb5
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.2.zip 12539 BLAKE2B 37e9f910a2babd94c5de131a61f9f7c249818c1c89a2300011610eaab1dab1cbca5c27b2071b0fa82953e779f86601cc0eaf576e5b867e21822dd11716672e7a SHA512 311a471e5080d971d5dd3f353367d5e370a22e0e0c6134de8f5d5a4574e6e0be2e303d81fb3054d5298e695dfa8d15b973450ae71c8167fda8a7daffb01d4190
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
-DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.mod 126 BLAKE2B 994134e6d9b2ced5dccc884460b1e474a906c1fc27accd9481f0ae664d225eb57423f0820499b95157726a39dd69831aba944c443dafced0318af10cea46e53e SHA512 657d9220217da47372f647fee297258a13495d7c10bd75d0645a21e81c41443b7a71f8162178181396129983cb695241056f052412fc2d5c4fefb214a2a82587
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.zip 12921 BLAKE2B 9f4ddf0c3d4020892065746228c41e260abe78fb17f6ed87e664e8fd3e883f0851db52697eca0e6e52fa02d36509dca0092b516b5084a0cbb499e5f87a8e48b0 SHA512 64a2b414704a06e4b181984ea287a10db68e1a3af0df276da3fb8241ce7a2f5ec501dd1b8a0cb8ae093419378a6ef3b84b4ef197be66ba620ed296e9e99e68e6
-DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
-DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip 93044 BLAKE2B 2c3eb15f4f2792ae60e9712392db623ab2a662e1f2e319da7014c0e94b82452ce141a5c8d7656b02dce44d01cce06a58ac4d8b5bb29ab53a8e3b6d6c65c41582 SHA512 60dd4f9e8b60d72d65c7a35bea054ece6045a32dd033908daec3acbfcef17d6f85b6050c7bff53d49032eb08097e36588911e56622b81d3fb2ed2543187c3478
-DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
-DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod 35 BLAKE2B 8e6a890bcd1d25cab5f07d335454e2251dfe47b7eb40adb1c8479f93bc2134adaa53f7c594caa5e790c06e634ff9789ea0e438b2382baf416be76b335aeea1a9 SHA512 ab41dcf4805fae3baccc64c61ef13ea3e4dad8e92807ca77bb0a8300968b498d5f2b05a0b1aa3269d38fe37391bed80eb7de5c626b90714a8ba490ee05b67682
-DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip 13502 BLAKE2B 8423a01877ac7ebe40452e5e84551dc9e00a818051d5bcd5d0daa84a55939caaf2ecc130749d4664af62845820e429b8313559c6a78d79f83ad3728d17d9669d SHA512 893ecce9d3eff9ad6e845778a5499a5fa1c723afdcc4be16b323773cff61fe216624b1aeae62ef8c731edb68cfcc099a81297b261451496fe133156c6df133cd
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip 124156 BLAKE2B c1f55bccfb7f2cd10dc421b6d7246e2ceb0d6de6d5cffc8e5c13ef2368824839d449440b9b8729821b720170e17364b5e9080b8f81513a9045bacfbfb16655a7 SHA512 7fca057ab9ea3208388ab23d8102498fdb7eab796e8a20ef84a996e2074185c92f3b4c0d3558e4c63dccdcfbd3169d5a785025e848dfb50ffe76bdde21e459ad
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B 42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269 SHA512 6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.8.mod 41 BLAKE2B ecf265f8a46216730b3b7319366f3b3cec56a1db6c52a909fe51b70fdfd177fb1bfc292a0048c362b9947720df0e6664acd15afcf3cc0ee36f57cca441d151f2 SHA512 89e0014b0c3ffa2578ab38c237fee3d2280d6955e810c83e426d4924cec07cfc796adc45074fc237629c5ff88a93044dc406472febf1adf73deae82cb1b24b80
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.8.zip 131550 BLAKE2B ec450e5f992b24f57244d2b5e18157b534a1039e0fe99148caeba8ac7b5d7065f7325b8b013166cb174f2208eb46e2c778b3e477610b31f142f10e48ebec2686 SHA512 608936142ed0583ccd79d921f29cc039cd84c926ab4daa7f8ecb024ef27f0c9c685d9c97f259cce56dacabfaa86033c1b3b4b199fd051c47f20906e3bc278368
-DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
-DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
-DIST github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.mod 362 BLAKE2B df8bcb1ec2a89c95f9c6be6d13c130834aa54fb65d3a46678c886861ca2380b25bee37ef706827d2bb83891eda02a0ac058dbbb3f3eefccea0a0a3c3163d7b8c SHA512 3730fb221251367677890a98170487b1a17d948300e0f7f712bbbcda4813a755b5524c65066b2d2bab4551bb5192bdc7233466594a0fe295cd84e0e7ba503967
-DIST github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.zip 459801 BLAKE2B 020b83847e805b201143cf388269ea771d568fcff04544707360a41db56de905d822ce27e72cd06b57268c742dc7bf1355de20a43e42f611a55a815b393be374 SHA512 76df5a582009021bc29bd15a149700d244fcc4515b5dca3c7c23895f7f181a88bf7f8d557410783116ba5af0bf0807b3d7ae1e0d4f29b9d9a7029ba845678112
-DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
-DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.mod 90 BLAKE2B 08333c449398ded36447fe9695e6a525e0a762e692bdf605fcf21ef348e547a956474f9bd3d01dd260615f48e52dac834ce405688e5ea5113d2ae4dd2b4095cb SHA512 48b658163a17a5e9c68cc252289cdd444347feed4ea61a0b5c132f589d9e207d6fb350473f7e9c9d92ecaa3179863eadf4df3b19c8180ff728e23e38ffa081f4
-DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.zip 13092 BLAKE2B f5a3080614218408e5a9e5559186ca79ab214cc66ced0a3b82e9fc61b65470168c4267c4197a016a3d2ba9465654039319c95ab9fcc78c0b72349aae6e870727 SHA512 3fd2236abeaa0c4669d32e573fb444bbf2d4519cff9682f736a5d26e5f88e2d60b51108108aa4470e71e6e75c2f0b81959dc29c6e764ac26d5341ff6dd7c4db3
-DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
-DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
-DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip 9497 BLAKE2B 57ea3f82d59d1a6815a0f37a6175648f3be2bea0cd867c3cee1472f50e64097c9723462c4afb543b6eb7a64c687d2098cc1a1e03efece05d9bf89cd1a8174a60 SHA512 8065dc99eacbda55ab187ddcc5ff4792246c8b623b2c978df0bfbb2149c07966ca701dd6f36e7660074f47d082e1654eee0de01347fecd65bbd90f386346e110
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod 96 BLAKE2B e834b9619a59e85905dfd9a50233e959874706f35026892af8ab385b2fb78a8f876aa47695fd896fe241c72db5c306da0d7c24f49e3bfcad887ac9e2fe5deae8 SHA512 d44bb68b322c8512c135ca9689bbc603643a4a924dd59c168519761878fff14a394f365fe5d88114f5552a9ed1791f6f9e3f7cc44be08b412f0b3a5eb3efd67c
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip 19419 BLAKE2B e8e9f8e23c550256e8f31341e2a575675c4dc0b720a701023898ba9bd09f1be375d21c9843ce26767fe5b7e7bf6dedbd4807f58807c3497efa1a1d19544e07ae SHA512 054679ee890bfb4f268a614870a100525b996f53bd48dc914200f2f18a4dec30cda59e26c16478259d1e80c35864df6090901595b59fb80a209f30d909e9e9d7
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
-DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20220125093853-4d9895f5db73.mod 47 BLAKE2B 11641d23d05ce4c5edec8f8d5ab667c0558c19251826cf85f28b33cd3f7a28abd677b9b6518c3d79daf41869cbef5ba3603e48d746cc331c4a6fb457f98e112c SHA512 c57a3c0570c429a9d3231d7849bfe65efbf77ea009c73bf1e41884608c85e4c0bd1166ce4e6ba613cf4ae410aad423d39c6a7f916ca9901db24cabf31d7b420a
-DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20220125093853-4d9895f5db73.zip 10166 BLAKE2B f5f27808ff86fcfedfed0648a38a466ac44cf28534d5f977a6b07153e88dbdfdec93258642edf4b99189063b28ee3a7d8b6dd476eb54f3496c09e7ffdb272823 SHA512 df58bf142a99d1374566c4fa5f1adbc04eaeb81f2a615d51b5ca6164194d1ec6ee6363e9aa7d36c0fb39da0a9cdf48042a8991283609b371687b88fef226df0a
-DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
-DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.3.0.mod 117 BLAKE2B 9ccb63ff370cdbd49c1179367a9b5d234e4d58c530f57ab55857d55e90bec47c5ca2bc980dc2d925cab11cf3908cab0d006c873eba1e6100d7164fbf95f5c0ff SHA512 3a55a2d745e3f04e4554ec076885cc26add2f6a840799b8f884ec9074ab13985cc50b4bf9ce7c8c32e580b62b376138e5ae66cc4df6e541bca3ffaa930c94421
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.3.0.zip 13000 BLAKE2B 40fce1093c891f37b7937eded86461195963aeeb52c960e5723983f7861a63282b6c1486a836c202ca2908843a2af67fc94f77fb3a6dd841c134cbcccb949da8 SHA512 602353980e28baaaacfa3c739f4a6129d831eab4a600440051930ed02a7d000ea12a97d7094f4502ed88353702a2c6847fa842806955790cb76a1139e262f2b5
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
-DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.1.1.mod 273 BLAKE2B caa207a24dff2ada6755e3040be3e6ba6388d1aa9c2905a6f2138b30f4d898bc23763668b1f317aa0b37f1654e229ca293a614912b3aac0cde943c1a29490814 SHA512 e575eddbc73e11a88c6d41d08fe0b09453edb4f80f953646f146975b28227418ec50bbae1d79262735bda0c286261edcf72c0d8b3aa197bbf1d0cd74f2d22655
-DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.1.1.zip 93003 BLAKE2B 536f8cda208b53952487089d920728776d87eb124d1dd2911ed9cfc0cfcfcf192529fd5da1cf7461cc54cb79beff4447b9342753af97163f049c5efd80361a22 SHA512 c8276522a67a9d4f99477f7c3028cf00826ef05aa3062b70236886cb1e2cc768ab5c4d677dcbc18d32e6f758670d70e81079651ee2119193e23f3646865f955e
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.mod 160 BLAKE2B 63be9d239ea8c5ad48c5bdefaf634f1ef2e3913f9c1f1eb0c48ccf9185a2c14c1030d1542048acd9c7c42399ebb752a8c943e70ed7b11d199ed9067b6e906480 SHA512 f2fa86449f7da9a73f3f8781e6b3dc6ad6e7d491cb37854be0dfb5c3ee086c36f509646e6fa383b4f00c3cb96c535e581016b2a43aedbfd9fe5861bada2f7ce0
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.zip 13979 BLAKE2B ab26453c09251ffa89639f5fa0579a853b7b2ee8ca9f48eb8e8b2343acb5d6dbbb67479f21341e37b9cfd28bc4d1fd7facadb8a7ee20f02d0046e8df46baa4b9 SHA512 202a6349397e9f7b4a8252867f4928c694bbba813544b9bb8b8bc4851d18c074f688e3a1f01d7b65e899f492325048705d5250394613924b98bdaece8a2373c9
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.9.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip 8919 BLAKE2B fc84f4f16176d14f177f029cae5ecf0221a8f0ce716c499e8b5d49c8e1523673a2fbb600a769ac26be98b591b3cbc3730d447c412b2acd3eff7f878526c271a4 SHA512 c6401cf5af80ea2495cb63800ff39fb9490f212f3aae0ac1d86b3d37ce6734eb35aea00b35bd26532feab77ef80322e765925f302d77f664dd57163f67a8374e
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.4.mod 218 BLAKE2B 3e2fc9273b72ec21581b4ada056bdf5694c4bbcb4c75f0862687f38dd6c26b6bceb041374b6b6a8022090b3f467f530095ff322f917b0cdaac72c112ef849248 SHA512 1c5e1c07bd8db4c7b7344696acb2059a189229bb10a94cf676711fe715e7119ef7baca430c9057131d90b242b640c528c023a30ae44bb06be0a554f3acdd21d6
-DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.4.zip 11958 BLAKE2B 4b9537dcbd8517aeed336b0371a35402892576068f5db5742225aecff330665bffe03801ad367e59ec31772adf997ccfd2e195e7b45396e8a6b1882f3c15761f SHA512 9e045a2052c5c02044447ad73ea3219b1676c9093590dc667eeb5a98a4c2f7653dcb5d10e7b04b17c461e3e4172624e75880dded51bb1c84590a1f6db68f7812
-DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
-DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
-DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod 43 BLAKE2B b6996dd7e1e75268f4018828d23802d360e28d700e6be0c0fecc9a17fd4ba79e00e81aff04166b461295b95f7225f12a1fc22bc5462ffe6a0f7eeb35e58aee5c SHA512 eb0cee04d26b4a0acf1b45504ab73931c10f98ebd41a6d96788aad477178f8172da402757c1fb8853ac513fff0aadbe3a9a4f74134c88cf9e26928896af55785
-DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip 11977 BLAKE2B 885bab4a5c6632cb919fadde65d0c7257c15030e8c12e545705fdafa498a55a941154fb39d572e623db85a5672e85edd473d3411d24e5dbe64b4836d169da62d SHA512 046a755112a19a9fc80e25e5031185394d25da265b67a07fcc0eb3091168f47ed14c8c502b9ffd35d93d60056a6e2dc0d540e8149ddf402a5cc20d57776e312d
-DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod 112 BLAKE2B 50b4b6b4d07888fd6bbcc3d88b7f4b542bf2f3c61733319c918104f9f3a8cbbd9c8c2b724751ea2ee4bb09369dee4cf22dca0cd334733826ac882f270300f944 SHA512 bf10719acba9ec2fab1e504fc2a02f542b347cdc4b891237fb9cac81f5aa72882adc25bef2a4a9d43dc33c5d2dfe8f0398c698e65ba74352a8b498b7445e3aa6
-DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip 11581 BLAKE2B 6faf8c5d4368c6456db989791fa327e341a791b601e6a561ef3081ffababa7dd0a97190c1e96888f41b1d6af8b9231db09434adad8471737d54b25f515260e7f SHA512 3bf633884ff896d94b70815ad990806ebcb89ab69e297bb3f07b8b186697216053b886eb2029df3769910df7be6f7c99b590606b0a02e5fa46aa5e68281cefb1
-DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.mod 169 BLAKE2B 7f27ba33f8763028458020a4c1f35bf6ed7bb13cec2cd1ff14e035730fe5d8d281b94e7dc41a721cc36db9bdfcbece6a962d3fe90a7e267f8fd969c04b623669 SHA512 03c4f94700b1c56553e7e0203ed94a4840366fcf4cf9c877b4102fbbb8e54976e183d9b85d8fe6d09291c8e6b701f18f39f310b9229f8829d6e6d9bd0bdc04b7
-DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.zip 880937 BLAKE2B e553d54c0de0209b0a17e81e7f43fe2df6dc3ca103c095cbd4a33d242533aea4b79f173d8891ec3c1b787c08ebbbf46700012199bc1be080d4bd3465973aa727 SHA512 5117688873c985b262b5e5165eacdb927a41b8ea0622853d71f8e8a02d3979c13b5157e21bbbe6bf94afb4867fddc995e20cf640a283ab97e78c0c60ed20406b
-DIST github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.mod 36 BLAKE2B 6dca2b9e42788fa6d795f38bc9450cfb0399c88fd99b99244259a71517335de20af643cbc6c1bd3fe629557ec6ce9437112d68bd67f6a85bc55e1ed00299e565 SHA512 8b928ed342c4e92a9a3e36f1a1bb917ec38a145502d8192fd81ed78b4a9c24d1b24a2cb06b0c6cc5bf7a26bff4ea8354066f6b0456f1eafcde0921335afc3975
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Fpquerna%2Fotp%2F@v%2Fv1.3.0.mod 155 BLAKE2B 4e2a5664777c0bdc0a6d9d2d393adeabc98e5966c1066d7d4bcb2c5540327479f9a2d7ad3e0b6957fcf2c583ecbf74f34e9703bfcfb1b86d6e3d098d8ecb2bb1 SHA512 c5afe35fb3535cb648fb6d574de9364d71e1e829d38aee37d49e62d49d72f0adbab950323f6f0a3ead161b83a59a30da30a2f5af4e50d9f23a900339f3e79f52
-DIST github.com%2Fpquerna%2Fotp%2F@v%2Fv1.3.0.zip 21375 BLAKE2B 960ab979005abfa87b98d9401701664ab0d6107aa0abbf5033ec780059ae09b33a01c1bb4145f8c480ba39ba03fcd19deeed87ac1431e0d341a42b4083f0a86b SHA512 7540f933cc4b82fd83e865faad1e2afc69f2ea8d9e3fde968b76d3e45d6ecaae14baa10b548ba31fdd09d3ec2db673f4699016f6b912854d3f3b9c1d97861373
-DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.1.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
-DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.1-0.20210923151022-86f73c517451.mod 143 BLAKE2B 6e07546f988c4c0014b72cf9954bfdde8b20868c279e21c1bd13653507a5341da5728ee3863f5572b48c54286ef710ac946cdf0b39c8615aef8cca9684fa16bf SHA512 d65f9ec2ad49d19912429940f439621257ee6b5f630f835b132763f26bfa665ab875fcb1f951f1c2c60a30a1198bc92cbb4cc8cb007c852118615f1e103a3bc8
-DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.1-0.20210923151022-86f73c517451.zip 218496 BLAKE2B 8fd0502865d2fb06e3eef22d5d32fedb2d7e2c22f15be14bf4c1ac1e2755ec021e92b0d9c2ec17eb475390cdd89abe5fd488d1c85a16a7eec67bf9564011950f SHA512 2aac056787c9defae6d923658281f72112c1e942335316b3dbc8482f31311137b199b39069b55684737f4d9d61b3d4e86f2ae68e3f1b1cfb3e7dc60342f22484
-DIST github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod 34 BLAKE2B 191c36f7e2328b0192de2eabff29eaa04575c74260f00171ec29e97ce46dddb7e6fdc32bd50ab5904f4c35f535be2a9af45a1613c4f1ee77c07435eca44118ee SHA512 d47bf7f1012d6b846425ee3b7ba44c64cb51d80e258e4c39df4365a3730e5c55f8836e484d7d77777160c35ad4431ee48f8a4d042b638d5c7eef86de6ad4b943
-DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.27.0.mod 218 BLAKE2B 6da813bfc9b7a3e25bade234c801782dc719d8366d3b55eb7da3f56d5a9dafdb72a2f7a163e3131ddf9e817326e068a7975ff7eb35de7b6d598880e763fa1669 SHA512 23267ae2c5a6d7900001af2b0b0bee7dffc7e7b6eecb0351ada27c0bd75d80bfc73f7dea56d368c6997016a71d7857c483b718c6703bb57a7eb4b50c3699ced0
-DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.27.0.zip 189360 BLAKE2B bfc0c6d0b4eb504a875b1a647cd85aece14dad38f65a4c577a22a03eee158aea88450bf2a356d1429dbadb31729f382d199a4bef60539c7ac182a0751c614082 SHA512 528659d376b92d5021ca9c00592736da27a55062032d4a1f084e06200a40e43dd06d692af00ac6a43a2ed9270f5e46ae8c582053838d8ff39c377715ef0d33c1
-DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
-DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
-DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod 39 BLAKE2B 1fe1086bdd2304d771c53f56cb46df742a3e49d6bcd3dfb6f10fd81cd70ff372a34ac31088ef79e51a211068ee248437f5e6dfe4edd739a5719f783fed79b478 SHA512 3e1d6747fa7a97d9ee969060130b0e5bdcf162274f9c5faf66f1974cb7d34e59f569bfe1a2339a71047cc86db2422ce486aaf5d7d47feb61f89b5e6e429c8075
-DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip 636486 BLAKE2B 08c35fef4d5561ffa1bc3de75524f50fe1c791559b162aaff74cd6c7a0667ef2c5b8f53cc39a1cd7a3faec4c3137412b2f3b27d94af7b72d7f25fcf9ca32190e SHA512 99a05815aaceedf4eacb645b5180d6591a696d2b51f04d8848c0b3d03a10975a166d1492ee3611aea595f6588e4c48fbcf8de097ef0bad40b2e281c5312093c8
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.4.0.mod 137 BLAKE2B c2fff20a5632a39078dbc4e339e798deef51f679c27d047553dd21ebac5183c4bf5c2c94a27a479e4d5030bdb51536e8de7968aa684abe8ebdde1050d2333f87 SHA512 022706974a2aaaa604a814996d4307a0b0f4a408987ece5cb9d0fbd03d9a71bc9e5c4ae89877f9527858f4071829d85674732550a514562df1a406a95eed9d35
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.8.0.mod 188 BLAKE2B 73dda214fed2766b92231f8d90215de2a3b17c03b3e5fb06bdafe981c8e8741feff8cc11665ab0fe68c071d16a4ddf2bb63956cc7f46c6d1fd220fdf546b21de SHA512 62122d19530516ad5a84d98ccb77f299c79bd0ad4da58314ce31d07696076de1b3d1150e603cb296e4ad8e5e839a9fd2241f1e8981fc3356379444d5062e0d26
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.8.0.zip 113507 BLAKE2B b3619ae56d982eee57378fc48c370b68c855a89e40e56eee09ad90dc72855f99091f97e7f1fe467cc514f01a2581c5824a09b060ca8a583977c7a657852c19d8 SHA512 e377f172ae47db1740efabc985ea0201ab7ca6c5db9763d75318de41fcce472ae79e1aaa8b1a4a920c74a5f44027d4f34af5f398ac4e692b210ca4cedf47b206
-DIST github.com%2Ftwpayne%2Fgo-pinentry%2F@v%2Fv0.2.0.mod 401 BLAKE2B 37d3e7dba15cd7c0c88d68de8df106000964289f8aa6d59c36c22ddfa48f81c11bf79e13b0b43933a81bc106a17098e39d63041066318102d55d84db66274821 SHA512 7d0aecd06fb80f539c9b6d34a5cf0e6c284d6a69f8b8834f627f31b9b4da89eb2f863eb063f6c4577348c31aba420043b8aef5094502e11aad8325a058ab2649
-DIST github.com%2Ftwpayne%2Fgo-pinentry%2F@v%2Fv0.2.0.zip 15222 BLAKE2B 20ecfad0d4ecf8b6eb5f671cba9962ee797041dd75b49d478b9431cfc02c154b2ba03f2895067240baf62b110c0acd0c094580a58ca1d613a31cc3304f9cd7da SHA512 dec7b015f3fdc7ab11d393a26ba26a402f5cd26fb7a5b5e7f1939e537715b29ee6aedc5536f51aea6d2fc27364bcdd70df2f997e62e8b7b451b444a1590893ba
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.11.1.mod 306 BLAKE2B e675acea765291a695fe323cdffb60f2bfb841802539263dcdc40066ceecec197a11b57929eb272f4dcaa294aa7e0d333d558ec7e667ad14b1e3fead60d5f113 SHA512 ce3becb83823defd1cd34d5bf745391d7cebf274b1c3e8959c4598fa3ad5cec59962487f1a8e0b3d066211b43b549b75f2b098cf7a0c6808ff0379b2f772a7c2
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.11.1.zip 3517549 BLAKE2B 2c64f93baf1cce403859eba83c530351235f89520a36ac2ddd2b0d41ee0fd7a21cecababb2588c8771ac77594ab156d1cea08760678ad733fe916d1840a85483 SHA512 4f4e41b2b3539638a79c1f684a812cc36c3b7e93ea5c2a909f7587ed736c1327dafe17b310b6eb67ffac60a49023296926356cc7249b3c82e89bb1777f3dec41
-DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
-DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
-DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.zip 1826113 BLAKE2B 8986a78a5252539fc118400d4ba9dbdbe243c6d7868d5c1f91b673a0a279060f91b03e430ff8c7139a74188bfba6ac753e5c86f52fe32e6c45b6307005890a22 SHA512 fb375d6649128cc0485e449ccde0095f5cce862ba08701632fcf3680031ffa631897208c26605c00d8613cde157ee6b0dab47feae2724c405090f35f5819241f
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.9.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.9.0.zip 63866 BLAKE2B ee1a2e2435fb60c580eebf13b18688995f839766e63d494d9ac90efa04ac7c0b46132f6e723276c58217ac9c1a25ecedf87eb01350e9d4f0000091df581b6585 SHA512 d131ebe8ca70a134c7117410f990817c266ca49e0d87b95ee1b7cb1aad9f869c72c25da2e880cb70be2eefe3fad5009d37127dd3ee95d07ab2540aded1baf8ce
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.8.0.mod 178 BLAKE2B ccb41b805d264349ce64c3bf1293fb5e560416dc78c8dd9a7102855064a14a7576def3392fb86a3d874f8407499785f8229efbfaf8ae3ecb8df5cd823c916946 SHA512 da9af93e5b480a20e2d91d0e4d3d6763a938075a3f51ced10347e5d137e3b595b82c1abfc7d40874185c5fc012c52f949aab1398ced770eb006af3967385ce05
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.8.0.zip 21163 BLAKE2B 8cbefd8597b41084514370ef235b73e0e77dc6334d6e124ae8c3672688eddc52166df2b5cdf353342e30c7d89293639ec17d42c98b7dc5c43349a638c70204bf SHA512 365e314fe20ca677228496fb61e590993663f716a72344c78ceb23887c977de7fb55c618160f60665f6f2481932c7a0b99c57a3cda5574f60a240459708cbe71
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220315160706-3147a52a75dd.mod 255 BLAKE2B 1cd60cf9c3ad1ae263bb27aeb201922fe3d25e4ca9e894e479313837f5c8a09cb1559d361803c72f6de023037d6a473709a755c3ac64c4acee6736d2443100f4 SHA512 8b89bda14a8eea63c73e602efb4f90d9bd5ba816041b8c8eeb516a7edbb70578e2c594f4ac7168b5cef417075b295f6aab908514244cb9bb05f7bb13f1170bb3
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220722155217-630584e8d5aa.mod 255 BLAKE2B 1cd60cf9c3ad1ae263bb27aeb201922fe3d25e4ca9e894e479313837f5c8a09cb1559d361803c72f6de023037d6a473709a755c3ac64c4acee6736d2443100f4 SHA512 8b89bda14a8eea63c73e602efb4f90d9bd5ba816041b8c8eeb516a7edbb70578e2c594f4ac7168b5cef417075b295f6aab908514244cb9bb05f7bb13f1170bb3
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220722155217-630584e8d5aa.zip 1778170 BLAKE2B 109aa6fe8ad40942853e200d74a9737973f626d6d91ecd937e10980eccac1926b50b9ff4a826d6dbde3c59f6b270edcbaaad3a0174d7a820fdc0d78238260c1c SHA512 34ebc0ed28bd659a7820037bd8239fd5cfab8aba49b8a1172f54fb2205462bde654eb0d104f4aa1dec5c781acc92e0b37e4b71e85f69ea413fb7e66bf3fe8fd7
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20220722155223-a9213eeb770e.mod 325 BLAKE2B 5eb9386573c9cd84f568872126dadce42c94ca6ed50fc172194bf50ef5aa72ae9fb406f0f535b9024fff2d46c1e21c7e12ebfa51ea9e25a185355e82e1ce22c8 SHA512 542aeaf9c9269077f56f31281ebba0f20cea13a9816d5bb969ea4247ceb5439efd91a4a4b63ba3c05313c51f3a2148b2344ea47683d7a40a16af69cb11a74098
-DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20220722155223-a9213eeb770e.zip 365042 BLAKE2B 26d2625c5a6abc1b237d4161574837927467af01d7e7c3491af73716217919faaf1ebdd3767b56c3adc19a0666985199c76e8c5cb6a4a37ad6e81ff150102151 SHA512 5b1b3da59acc0b621c35b45577c2f00a19a3ee46714f8216a608683043e717b78a1838ce63805edcddf41586f102d17cdba0a9da0e74614bbc686612a0667f4c
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
-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-20211112202133-69e39bad7dc2.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220728211354-c7608f3a8462.mod 179 BLAKE2B c9f66a4faf0dd7fde4c28488ab838ffba13d800830ac4c9e3ecd8976a3bda308d187107c99d12618c171d3e83ef9843176c35af9df39e7dc58003d5671472125 SHA512 82d2179d157c9471b3263b122e74df745c8a3d7afcbafbf13eacb9be58f2ef0b3fef727f361dd185ca3299d1c7e1a42d93e0ebd7b152cb6f7b7755f2f25d8117
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220728211354-c7608f3a8462.zip 1575916 BLAKE2B 9f2d3e2d3073d8711f48c461ed4a1d7197a2224d3b03e93f45ce8732df56d033114b16803b68a9999d4495f60e52555fc12e68c55ff1f7d130c305dd61e4f398 SHA512 94212b0aa8d0ca09ca1cf77c7bb11e4c91f766be06a9cc7ce27c0669ca629101381862c1f9b1731e0c6b9ba74cee8ca41f4de1e971f6181793f694546dd98dc1
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20220722155238-128564f6959c.mod 315 BLAKE2B 931ab9b3e4824084eac927e8c892b7d905197a5627530b98dd3fbabf44f26fa9447cd71360a1fc9d85965c1737caa072723e23b942cd1992dc9ee776422eb0e8 SHA512 dba989a117f51647bc152577c7a260ea87de73bf35e638717af0dae23d8a858001b9dd0743f5b2250a8309a3ddebcf1cfbb6513eddcbac55805489904d23a4ea
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20220722155238-128564f6959c.zip 158839 BLAKE2B 30892dea080d2b8d0c5c6c81925ac4a7a7859e3baec6f5797e67bd61767f20a5a3c1017806ef38dd1f057566d167983fb2c68378c5292ee71b9a795b7a0b75d0 SHA512 f73aaaf80dc65068f65bf7f65275026aa4cfbdd29e8b70d99b5d0d83245ae135297ef6f5b0f04d2a9275f8249ba20c53615d5cd329ce501bc0866f3174a9bc88
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211007075335-d3039528d8ac.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220310020820-b874c991c1a5.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220315194320-039c03cc5b86.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220731174439-a90be440212d.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220731174439-a90be440212d.zip 1798785 BLAKE2B ee5362b65998db59172c86fdac2cb687c5db55331b201f7c748537c049a5bfd729a5f3c17ca9c7d86c9466a824a475b92a3fd305559bd957d23529c43363393c SHA512 f82786ce4955804f3c7576582f5ae5c008027db4a08e4b5f5264ab00425872c5317da9917ceac53d295ab1714ba5ade47c3c5ec5a2b4922915297c5bcc78e890
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20220722155259-a9ba230a4035.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20220722155259-a9ba230a4035.zip 20952 BLAKE2B 85b9c0d10dc306de97beb7d4064e62b5af4146e9512bdccf5584d0c927aa419e2a5c9adc1fffcafac14e62917830256477a26be26da26c5bda89029796cd2ec1 SHA512 0dff599a32e8abde924a81280447b6c7978ac91334a6cba87b1052513db5e40ac757c57df3ff469855316a100b2d7c5989773387806347e6a70b315e993dd6d8
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip 417823 BLAKE2B 3ba5afeec03711fd1e2ecb11739fcc4dd770d5f1c23489549c7b3697fd7bb8eb8471fa76569a73b7ad4a2b634a126a055e1d67ab654e399005398655f0bf8a31 SHA512 cb047087045fe995e28b96c1a3ea3cef8b46facfcca80fdc14707f4f09d1429daeca9cbc456ecd9bb2e3d32dde145b75929506b10ffd67d35b3604674dc27b01
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.28.1.mod 124 BLAKE2B a5348258c468348018cd2962ac2737ed58c89730ccd5d83fe54f1364a62e41c01dd3ec4a86d430fabf2da1fc8c35c8d6e683582c800539e32af2da15f0c0d2c1 SHA512 61be8d52e39d6db167252c8833a4c2d92b0f9cd7040d44df2a805bdfa3e48784a4f0a45fbe33a64ab65c436dc59c1c4232e84427b6a0b1bd7fb29a5940c1501d
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.28.1.zip 1574540 BLAKE2B 3d93abc809895c9eb1651263b82290dff5e9a228c7d27b8b00495fa870449bde17478763198d7f77a09fddb7a22507ef0ec053efd6479e272046a5359f36815d SHA512 964ccc7019a964baffecea1fe739925952391e272b8d307a1716b275354383886c82eab887595f655490d907fe2bbdee7923ce9e4d4822a9905f622a94003ca5
-DIST gopass-1.14.4.tar.gz 2246807 BLAKE2B ca9fc3f9b89c6f6fd71ad2a47f1ff20ebb5da986e71e8ba6abdf46ff42e521c47fa7aad72fa1ce8d1a127f3fbff0b5e550ab95fd86fedf275714947f225fa279 SHA512 f9bf3ff4d4cf842aeed8376eea440b646869d89158c4f2101a16359d217702845a2b1c5a807695fa9a5964640554e0995baf014c41cf95b4674f2296eb947a0d
 DIST gopass-1.15.3-deps.tar.xz 36970888 BLAKE2B e338ba7a6a248694d33116a68aefc3abbe3b6b3a9a86896b5a0c5286824bffb94bb2715c8e9c1fc6ad0715897fa39e8fd46c0734adaafe5318dcdbc0eb0ac4b2 SHA512 2a5a011b170cf2635ab33399dec5661bb7ce297508878a82f38a3b6090c4b75086592da59ff07b81873ee67786be345d3092c69730b7e3c4234b048df1898ae4
 DIST gopass-1.15.3.tar.gz 2293686 BLAKE2B f6a5191dbb6642f448103d0b5017d792be2d7ab7d1156ceeebe52dc7bdaf9b027bf417982f0eb7a189ad09a8df06eab1fc2a637c8219a72721d583542ab51372 SHA512 1638c681c4343ff42247d7de5c153e9f992d34fc46b97a5199047c38f2658d968e8bd81029447f7768b39bf432464eb2a24d25215a7cff228e108b3ca4536220
 DIST gopass-1.15.4-deps.tar.xz 34045072 BLAKE2B d8525a166df31c99b20a1a7262c2e287b7e429dcd010183585fbac7e58ae8ce4d5430fb936da0b9a85fd8a2f0ff08555d02140a649fddc07c818e11b3bcdb287 SHA512 0953101962d77116e788858652a98ffa3b8c0bd58137f59791da45d6e73cfd5fa39e40edd400c5d881cc549fc1b155b17dda48c6f59d9e06b6c000b259098d2a
 DIST gopass-1.15.4.tar.gz 2301976 BLAKE2B f947d0e7b7ba599743404a231d9b09380d0069489543e1cc306eb11a3dbf369368dc8c8a464abac04558907fa6c93982a56575b79b7920ee84a46c94beb815ae SHA512 c6cf67de3b3ace253822ea9890a50ecbd2829eb7b625d05327d1b3549ed3ff6b84d1155f71276fa94b6392012b0c87b4b9e488ca0d14915d40af77fc21325603
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.mod 71 BLAKE2B 0a639f084a90d74b70232aeeaf4be7b5bb421913a30b3b97d97186022dcd1d1dacfb07eb7681369fb408793b8c7233ccc92caa77451f24371c64ce81e7c0a8fd SHA512 a2f9fd465e2e0c735ca80e04f2002e31cad434c5a3771a3adcdc7f9502f0caa7b27a5f17ec2cd95bcb214e12ac1200a78139db063d4384b864bd290cb6815e87
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip 42835 BLAKE2B 84e1f37c859e0d7ec5adc4cbbd4561186446e6bb75dabbfa73e44f44f7d21c2b14e97daac56bf65d2acbfa9c8a338ef8c23d75bbfcf26e01bdd87c3880c4a6e9 SHA512 b69b95251b63b6fd0ed1953dae01edefa52126e2168246bc2cdf067879ae5f830df4e610da45f5ac5aa4789f70d79da8a9bfa7af5b3786ef8f1e665a8b397e02
-DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.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-20210107192922-496545a6307b.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.1.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.1.zip 104623 BLAKE2B 51d69616c21728779614f4455d23d2302a8f986b44344257b4bc2b5db011c7266432ee93d31d43344231b52527d1027eba3ef37a3365f9afe69f3ecc8613bccb SHA512 d57b0d42c71ad6503415e42979b51b0dc7f6344072c728ab2e3d4bab88da7b7d775e7f261868909f990f6b44aed6c533966c97bbe333a0acd65fc8bac9d1d4ff
-DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
-DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
-DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
-DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
diff --git a/app-admin/gopass/gopass-1.14.4.ebuild b/app-admin/gopass/gopass-1.14.4.ebuild
deleted file mode 100644
index 7da7b4493812..000000000000
--- a/app-admin/gopass/gopass-1.14.4.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module optfeature
-
-EGO_SUM=(
-	"bitbucket.org/creachadair/stringset v0.0.10"
-	"bitbucket.org/creachadair/stringset v0.0.10/go.mod"
-	"filippo.io/age v1.0.0"
-	"filippo.io/age v1.0.0/go.mod"
-	"filippo.io/edwards25519 v1.0.0"
-	"filippo.io/edwards25519 v1.0.0/go.mod"
-	"github.com/BurntSushi/toml v0.4.1/go.mod"
-	"github.com/ProtonMail/go-crypto v0.0.0-20220730123233-d6ffb7692adf"
-	"github.com/ProtonMail/go-crypto v0.0.0-20220730123233-d6ffb7692adf/go.mod"
-	"github.com/atotto/clipboard v0.1.4"
-	"github.com/atotto/clipboard v0.1.4/go.mod"
-	"github.com/blang/semver/v4 v4.0.0"
-	"github.com/blang/semver/v4 v4.0.0/go.mod"
-	"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc"
-	"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod"
-	"github.com/bwesterb/go-ristretto v1.2.0/go.mod"
-	"github.com/bwesterb/go-ristretto v1.2.1/go.mod"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/chzyer/logex v1.2.1"
-	"github.com/chzyer/logex v1.2.1/go.mod"
-	"github.com/chzyer/readline v1.5.1"
-	"github.com/chzyer/readline v1.5.1/go.mod"
-	"github.com/chzyer/test v1.0.0"
-	"github.com/chzyer/test v1.0.0/go.mod"
-	"github.com/cloudflare/circl v1.1.0/go.mod"
-	"github.com/cloudflare/circl v1.2.0"
-	"github.com/cloudflare/circl v1.2.0/go.mod"
-	"github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.2"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod"
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dustin/go-humanize v1.0.0"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/fatih/color v1.13.0"
-	"github.com/fatih/color v1.13.0/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
-	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
-	"github.com/gokyle/twofactor v1.0.1"
-	"github.com/gokyle/twofactor v1.0.1/go.mod"
-	"github.com/golang/mock v1.6.0"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.5.0/go.mod"
-	"github.com/golang/protobuf v1.5.2"
-	"github.com/golang/protobuf v1.5.2/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.5.2/go.mod"
-	"github.com/google/go-cmp v0.5.5/go.mod"
-	"github.com/google/go-cmp v0.5.8"
-	"github.com/google/go-cmp v0.5.8/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-github/v33 v33.0.0"
-	"github.com/google/go-github/v33 v33.0.0/go.mod"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/go-querystring v1.1.0"
-	"github.com/google/go-querystring v1.1.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/errwrap v1.1.0"
-	"github.com/hashicorp/errwrap v1.1.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.1"
-	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/jsimonetti/pwscheme v0.0.0-20220125093853-4d9895f5db73"
-	"github.com/jsimonetti/pwscheme v0.0.0-20220125093853-4d9895f5db73/go.mod"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.1/go.mod"
-	"github.com/kr/pretty v0.3.0"
-	"github.com/kr/pretty v0.3.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/martinhoefling/goxkcdpwgen v0.1.1"
-	"github.com/martinhoefling/goxkcdpwgen v0.1.1/go.mod"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.12"
-	"github.com/mattn/go-colorable v0.1.12/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.10/go.mod"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-isatty v0.0.14"
-	"github.com/mattn/go-isatty v0.0.14/go.mod"
-	"github.com/mattn/go-runewidth v0.0.7/go.mod"
-	"github.com/mattn/go-tty v0.0.4"
-	"github.com/mattn/go-tty v0.0.4/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-ps v1.0.0"
-	"github.com/mitchellh/go-ps v1.0.0/go.mod"
-	"github.com/muesli/crunchy v0.4.0"
-	"github.com/muesli/crunchy v0.4.0/go.mod"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod"
-	"github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/pquerna/otp v1.3.0"
-	"github.com/pquerna/otp v1.3.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.6.1/go.mod"
-	"github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451"
-	"github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451/go.mod"
-	"github.com/rs/xid v1.3.0/go.mod"
-	"github.com/rs/zerolog v1.27.0"
-	"github.com/rs/zerolog v1.27.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.1.0"
-	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.4.0/go.mod"
-	"github.com/stretchr/testify v1.1.4/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.7.0/go.mod"
-	"github.com/stretchr/testify v1.7.1/go.mod"
-	"github.com/stretchr/testify v1.8.0"
-	"github.com/stretchr/testify v1.8.0/go.mod"
-	"github.com/twpayne/go-pinentry v0.2.0"
-	"github.com/twpayne/go-pinentry v0.2.0/go.mod"
-	"github.com/urfave/cli/v2 v2.11.1"
-	"github.com/urfave/cli/v2 v2.11.1/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673"
-	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod"
-	"go.uber.org/atomic v1.7.0/go.mod"
-	"go.uber.org/atomic v1.9.0"
-	"go.uber.org/atomic v1.9.0/go.mod"
-	"go.uber.org/multierr v1.8.0"
-	"go.uber.org/multierr v1.8.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod"
-	"golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod"
-	"golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa"
-	"golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod"
-	"golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e"
-	"golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod"
-	"golang.org/x/net v0.0.0-20220728211354-c7608f3a8462"
-	"golang.org/x/net v0.0.0-20220728211354-c7608f3a8462/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c"
-	"golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
-	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
-	"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod"
-	"golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod"
-	"golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod"
-	"golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod"
-	"golang.org/x/sys v0.0.0-20220731174439-a90be440212d"
-	"golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/term v0.0.0-20220722155259-a9ba230a4035"
-	"golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/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.6/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.6.7"
-	"google.golang.org/appengine v1.6.7/go.mod"
-	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
-	"google.golang.org/protobuf v1.26.0/go.mod"
-	"google.golang.org/protobuf v1.28.1"
-	"google.golang.org/protobuf v1.28.1/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c"
-	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
-	"gopkg.in/yaml.v3 v3.0.1"
-	"gopkg.in/yaml.v3 v3.0.1/go.mod"
-	"gotest.tools/v3 v3.0.2"
-	"gotest.tools/v3 v3.0.2/go.mod"
-	"rsc.io/qr v0.2.0"
-	"rsc.io/qr v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-# These have the same raw content, just different paths in them upstream
-# The COMMIT file is still missing!
-RAW_SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RELEASE_SRC_URI="https://github.com/gopasspw/gopass/releases/download/v${PV}/${P}.tar.gz"
-COMMIT="4fdac8b"
-SRC_URI="${EGO_SUM_SRC_URI}"
-SRC_URI+=" ${RAW_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
-
-RESTRICT="strip test"
-
-QA_PRESTRIPPED="usr/bin/gopass"
-
-DEPEND=">=dev-lang/go-1.18"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_prepare() {
-	default
-	# If this file does not exist, the makefile will call Git, and then fail.
-	test -e "${S}/COMMIT" || echo "$COMMIT" >"${S}/COMMIT"
-}
-
-src_install() {
-	emake install DESTDIR="${ED}/usr"
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature "browser integration" app-admin/gopass-jsonapi
-	optfeature "git credentials helper" app-admin/git-credential-gopass
-	optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp
-	optfeature "summon secrets helper" app-admin/gopass-summon-provider
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2206.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.2206.0-r2.ebuild
index 49ac520c70fc..1b15762cfb81 100644
--- a/app-admin/rsyslog/rsyslog-8.2206.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2206.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools linux-info python-any-r1 systemd
 
diff --git a/app-admin/rsyslog/rsyslog-8.2208.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0-r2.ebuild
index 193c45daf34f..ad15bf7f10b5 100644
--- a/app-admin/rsyslog/rsyslog-8.2208.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2208.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools linux-info python-any-r1 systemd
 
diff --git a/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild
index 3c36f773fc9e..bad48a9477b4 100644
--- a/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools linux-info python-any-r1 systemd
 
diff --git a/app-admin/rsyslog/rsyslog-8.2212.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2212.0-r1.ebuild
index ac3fd9c44ca2..0d3d01886462 100644
--- a/app-admin/rsyslog/rsyslog-8.2212.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2212.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools linux-info python-any-r1 systemd
 
diff --git a/app-admin/rsyslog/rsyslog-8.2302.0.ebuild b/app-admin/rsyslog/rsyslog-8.2302.0.ebuild
index ac3fd9c44ca2..0d3d01886462 100644
--- a/app-admin/rsyslog/rsyslog-8.2302.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2302.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools linux-info python-any-r1 systemd
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a0cb3056f45b..2d12b8cb2247 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -8,3 +8,5 @@ DIST sudo-1.9.13.tar.gz 5093583 BLAKE2B a923879920ac5a3c71e6e898ecc9c1194f26ea5e
 DIST sudo-1.9.13.tar.gz.sig 566 BLAKE2B b6761e90025ccb78fe94e8152022fac74b8368b9975a4816ad1a60e9a3a5bb2a89915c55a570c1216e48ba4f1e00b08c86d84cf81e31000079d2e927c8ef5718 SHA512 045211021b12d3f7c3210be388c87a6a90391fe0b24aff567aa05b1d5431f03da852ce93e0eddc53fe3cabb5cafd46331be8f6d82efb367e5d51f46fb5017557
 DIST sudo-1.9.13p1.tar.gz 5096455 BLAKE2B e70545975c7570099100892121ae67686d6daa286d581a25cc0a574335c426e8cc3d5fe611525cb4d939a423cd9e7d836a27fb8d64aedcb79623ab9eb69488ec SHA512 4d19f06c4a592dac9a1a7feca6cc751093151af32313d9d579e2485fc6530a4340ec29cc2892b29dedf2a6aca3e91fb0bbf94bbfb6530f249c58430b83139044
 DIST sudo-1.9.13p1.tar.gz.sig 566 BLAKE2B 4176b56099394bbe78cfeb5846373614fa69d4bd84b446b714ef5d9a36307af71271df725379c3d013856fb077e7af55b377f6ea80e66b896f513a31ff633817 SHA512 df898199133082f4e9dd8e8f6c4c5b973e9d6920080ae72d6bf56247cdf2cb2c4d750b89535467e81d901ca1e09a806fa0618a7ae94ab137ba62f24257e0c4fb
+DIST sudo-1.9.13p2.tar.gz 5098083 BLAKE2B a96198e865c644c79b0879e1a39c9dcc5f9db2164d22fe25804805065a78424dd6ed6f9e0995cad2d0809a1a21957c6a059c6bdbd2ebdf26cfdf5488004d9cb4 SHA512 b3015a114fd518afd644c9934f2461046f1116506723217603af1a952bdb436689761b4d009dfe32b725bad2e0ebcaf19db72febfaa63895ba004256fea12bef
+DIST sudo-1.9.13p2.tar.gz.sig 566 BLAKE2B 60da89c9d76914965e0eb312b40b56a91b215feb880429916740ef89d0bcab38862a4332961e85aa0cf2ecc4af8f08b7f0f28ff736f2dab97a8d2b5d907aa876 SHA512 c42d9dcf7287df14e7aa6c12e5ea3a839058873859f6fdb3c5a743cd11c21d30f41958a807a0a503f8805b957dfcba57383f953b4c544334333dde5e1757a543
diff --git a/app-admin/sudo/sudo-1.9.13_p2.ebuild b/app-admin/sudo/sudo-1.9.13_p2.ebuild
new file mode 100644
index 000000000000..2d77e6863bd9
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.13_p2.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam libtool tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
+	inherit verify-sig
+
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="
+		https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+		verify-sig? (
+			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+		)
+	"
+
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	virtual/libcrypt:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1:=
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap:=[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sys-libs/libselinux )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? ( dev-libs/openssl:0= )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND+="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+set_secure_path() {
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# Then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# Finally, strip gcc paths, bug #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+	local SECURE_PATH
+
+	set_secure_path
+
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# - plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	local myeconfargs=(
+		# We set all of the relevant options by ourselves (patched
+		# into the toolchain) and setting these in the build system
+		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+		# (it'll downgrade to =2). So, this has no functional effect on
+		# the hardening for users. It's safe.
+		--disable-hardening
+
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP.md
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP.md for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins docs/schema.OpenLDAP sudo.schema
+	fi
+
+	if use pam ; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	# bug #652958
+	fperms 0711 /var/db/sudo
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	# bug #652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
index 1a2b2ae756f5..25e5456e09c0 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-single-r1
 
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index ae7af64fe452..29db1d436867 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1 +1,2 @@
 DIST yadm-3.2.1.tar.gz 109838 BLAKE2B 4e0b829ca6f74c1300b78831d64fd95250bcea7779cca672707751e38129a7e618e8a69b2f3862ac6e87cb086de09380e4e624d54c4672c125d16ea8cc3ea11c SHA512 8ce9bc66a33fc3841e47293e002b834fac5760dc771ede37adfc47a9e911ddade23c0ef5379cf8f00cf9b24853abbc1263198b8439ca4e8a3acd5787fbd935cb
+DIST yadm-3.2.2.tar.gz 111249 BLAKE2B 24dceda15f8bcb85df64fce987409feb4a94fac4dacb34f246ee11557e280ca1df3569f6b110fb2de02e6b756e82261a4da1896187b670df1c5e8edf123353cc SHA512 c61da3f644c2f587079fd717d4ef566861f20224f287906ef5b6d07169bc5f02aef7974afd8d4441267a92417a4fd0c7edda562b8f0cf2fc104c91fc0f5f85ff
diff --git a/app-admin/yadm/yadm-3.2.2.ebuild b/app-admin/yadm/yadm-3.2.2.ebuild
new file mode 100644
index 000000000000..84a40d3dccec
--- /dev/null
+++ b/app-admin/yadm/yadm-3.2.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit bash-completion-r1 python-any-r1
+
+DESCRIPTION="Git based tool for managing dotfiles"
+HOMEPAGE="https://github.com/TheLocehiliosan/yadm"
+SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/gnupg
+	app-shells/bash
+	dev-vcs/git
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+		dev-tcltk/expect
+	)
+"
+
+DOCS=( CHANGES README.md ${PN}.md )
+
+python_check_deps() {
+	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake "${PN}.md"
+}
+
+src_test() {
+	# prevent system config having influence on tests
+	local -x GIT_CONFIG_NOSYSTEM=1
+
+	# prevent git branch warning, it confuses tests
+	local -x GIT_CONFIG_GLOBAL="${HOME}/.gitconfig"
+	git config --global init.defaultBranch master || die "setting default branch name failed"
+
+	# un-hardcode path to tmp, otherwise encryption tests fail
+	sed -e "/^cache_dir/s@/tmp@${T}@" -i pytest.ini || die "cannot patch cache dir"
+
+	local EPYTEST_DESELECT=(
+		test/test_alt.py # requires envtpl, not packaged
+		test/test_compat_jinja.py # ditto
+		test/test_unit_template_j2.py # ditto
+		test/test_syntax.py # needs new yamllint, not packaged yet
+		test/test_upgrade.py::test_upgrade # needs old version of yadm
+		test/test_compat_alt.py # tests obsolete features, broken
+		test/test_unit_template_esh.py # requires esh, not packaged
+		test/test_encryption.py::test_symmetric_encrypt[clean-encrypt_exists-bad_phrase] # hangs in sandbox
+		test/test_encryption.py::test_symmetric_encrypt[overwrite-encrypt_exists-bad_phrase] # ditto
+	)
+
+	epytest
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "${PN}"
+	doman "${PN}.1"
+
+	dobashcomp completion/bash/yadm
+
+	insinto /usr/share/zsh/site-functions
+	doins completion/zsh/_${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completion/fish/${PN}.fish
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 9f4e1fb97b9c..d57e5338fe2a 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
index 98013595c225..38a8df5f833c 100644
--- a/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit multilib-minimal toolchain-funcs verify-sig
+
+inherit autotools multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="Multi-format archive and compression library"
 HOMEPAGE="https://www.libarchive.org/"
@@ -51,6 +52,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-CVE-2022-36227.patch
 )
 
+src_prepare() {
+	# regenerate configure script to fix implicit includes
+	# https://bugs.gentoo.org/898360
+	eautoconf
+	default
+}
+
 multilib_src_configure() {
 	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
 
diff --git a/app-arch/libarchive/libarchive-3.6.2-r1.ebuild b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..513c6d16e2f5
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.6.2-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="
+	https://www.libarchive.org/
+	https://github.com/libarchive/libarchive/
+"
+SRC_URI="
+	https://www.libarchive.de/downloads/${P}.tar.xz
+	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
+"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
+
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
+	)
+"
+BDEPEND="
+	verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
+"
+
+# false positives (checks for libc-defined hash functions)
+QA_CONFIG_IMPL_DECL_SKIP=(
+	SHA256_Init SHA256_Update SHA256_Final
+	SHA384_Init SHA384_Update SHA384_Final
+	SHA512_Init SHA512_Update SHA512_Final
+)
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		--with-zlib
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+	# https://github.com/libarchive/libarchive/issues/1766
+	sed -e '/Requires\.private/s:iconv::' \
+		-i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die
+}
diff --git a/app-arch/libarchive/libarchive-3.6.2.ebuild b/app-arch/libarchive/libarchive-3.6.2.ebuild
deleted file mode 100644
index 2f4b076f78df..000000000000
--- a/app-arch/libarchive/libarchive-3.6.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="
-	https://www.libarchive.de/downloads/${P}.tar.xz
-	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
-"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
-	)
-"
-BDEPEND="
-	verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
-"
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		--with-zlib
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
-			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 29b37f25e4d4..7bb0c1b7e7ed 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1 +1,2 @@
+DIST p7zip-17.05.tar.gz 6722048 BLAKE2B 3aa653b7875bb1b5ce96af7f7b8f4097860a9e5f0e172803fde6917ae4b7ef9c9e06d1daa31b7e33bb4ff91302972e8ece10f846bfa152fa6c783b234ac77ed3 SHA512 973fd906eaf376ca7d1d0738bb9aa137dcae3a6b17f974d3afc6bbb4efab4c7afa78e3dc9fbdf7b6d37630c9986ddaca7afc209ba18da1ed27944ee88a321a55
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
diff --git a/app-arch/p7zip/p7zip-17.05.ebuild b/app-arch/p7zip/p7zip-17.05.ebuild
new file mode 100644
index 000000000000..dc0b336a3d08
--- /dev/null
+++ b/app-arch/p7zip/p7zip-17.05.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit multilib toolchain-funcs wrapper wxwidgets xdg
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="https://github.com/p7zip-project/p7zip"
+SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+#S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/nasm )"
+
+src_prepare() {
+	default
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's|-m32 ||g' \
+		-e 's|-m64 ||g' \
+		-e 's|-pipe||g' \
+		-e "/[ALL|OPT]FLAGS/s|-s||;/OPTIMIZE/s|-s||" \
+		-e "/CFLAGS=/s|=|+=|" \
+		-e "/CXXFLAGS=/s|=|+=|" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -r CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine || die
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		setup-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" depend
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all3
+	if use kde || use wxwidgets; then
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -- 7zG
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# these wrappers cannot be symlinks, p7zip should be called with full path
+	make_wrapper 7zr /usr/$(get_libdir)/p7zip/7zr
+	make_wrapper 7za /usr/$(get_libdir)/p7zip/7za
+	make_wrapper 7z /usr/$(get_libdir)/p7zip/7z
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG /usr/$(get_libdir)/p7zip/7zG
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/p7zip
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/p7zip
+		doins -r GUI/Lang
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kservices5/ServiceMenus
+			doins GUI/kde4/*.desktop
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/p7zip
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/p7zip/Codecs
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+
+	dodoc ChangeLog README TODO
+	if use doc; then
+		dodoc DOC/*.txt
+		docinto html
+		dodoc -r DOC/MANUAL/.
+	fi
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 55b72f887d09..d0500f4f63cd 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index e9d91ab26b15..0cfdf2ea695c 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75 SHA512 1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68
-DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941 SHA512 acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1
-DIST bareos-21.1.5.tar.gz 11655244 BLAKE2B 18ef42669cfdd7a663910fa1ce9b46f12eab0aa3a2106e9877dc3d341e9a7b309c21bc1768d4873d626938fcbb2084884a85d6dcef0aa2834b117aef1034d28f SHA512 637c6c0500ff31bb2c87f27d87f908d49836191afb880de4b636432b9c20433ec6f32f5805aaa7fb57f2f99a0201c51802c8d213ee5573642698f74da4cb06b7
+DIST bareos-21.1.6.tar.gz 11654525 BLAKE2B 9b023a07e28098fd93aca57aead5b2bf993b85c52dc8f76870dc53ee88ec5995bcc908397173c7d3504c78214e37311442dd96bb563fa4382ae35904fef69e0a SHA512 e9ccafd379ea2a7ede2b6852fa544e7d4b63b23e9d91e8b747c1aecf5d764b06991a57f658842d48fbbe49335a92f29eea90e56b613a3123246a9cd9e8273f36
+DIST bareos-22.0.2.tar.gz 14442217 BLAKE2B 34b8a506b608765f803cb788a203b7556dda67ae8bdd2cb82e1c8ea1ea8a07759f381c33b25e743d296417bef1072ccfcfecf536096cc1babdf20c57767cc369 SHA512 924e07aafa44829730f367a29f0a17356d06d5e44bcbe511936ebfe582912439010d8376370530982dfdfe54d8a722ff257648634cea429cbfbd566d2c25e464
diff --git a/app-backup/bareos/bareos-21.1.2.ebuild b/app-backup/bareos/bareos-21.1.2.ebuild
deleted file mode 100644
index 7005e562111e..000000000000
--- a/app-backup/bareos/bareos-21.1.2.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-any-r1 systemd cmake tmpfiles
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-
-# some tests still fail propably due to missing bits in src_test -> TODO
-RESTRICT="mirror test"
-#RESTRICT="
-#	mirror
-#	!test? ( test )
-#"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
-	logwatch ndmp readline scsi-crypto
-	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-	!app-backup/bacula
-	acct-group/${PN}
-	!x86? (
-		ceph? ( sys-cluster/ceph )
-	)
-	glusterfs? ( sys-cluster/glusterfs )
-	lmdb? ( dev-db/lmdb )
-	dev-libs/gmp:0
-	!clientonly? (
-		acct-user/${PN}
-		dev-db/postgresql:*[threads]
-		director? (
-			virtual/mta
-		)
-	)
-	logwatch? ( sys-apps/logwatch )
-	ndmp? ( net-libs/rpcsvc-proto )
-	tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		dev-libs/jansson:=[static-libs]
-		dev-libs/lzo[static-libs]
-		dev-libs/openssl:0=[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-	)
-	!static? (
-		acl? ( virtual/acl )
-		dev-libs/jansson:=
-		dev-libs/lzo
-		dev-libs/openssl:0=
-		sys-libs/ncurses:=
-		sys-libs/zlib
-	)
-	"
-RDEPEND="${DEPEND}
-	!clientonly? (
-		storage-daemon? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		dev-cpp/gtest
-		dev-db/postgresql:*[server,threads]
-		dev-db/mariadb:*[server]
-	)
-"
-
-REQUIRED_USE="
-	static? ( clientonly )
-	x86? ( !ceph )
-"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-pkg_pretend() {
-	local active_removed_backend=""
-	if has_version "<app-backup/bareos-21[director,mysql]"; then
-		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
-			active_removed_backend=MySQL
-		fi
-	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
-		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
-			active_removed_backend=SQLite
-		fi
-	fi
-	if [[ -n $active_removed_backend ]]; then
-		ewarn
-		ewarn "You are currently using bareos with the $active_removed_backend"
-		ewarn "catalog backend."
-		ewarn
-		ewarn "THIS IS NOT SUPPORTED ANYMORE"
-		ewarn
-		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
-		ewarn "MySQL and SQLite catalog backends."
-		ewarn
-		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
-		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
-		ewarn "installation first."
-		ewarn
-		die "current catalog backend not supported anymore"
-	fi
-}
-
-src_test() {
-	# initialze catalog test database
-	initdb -D "${T}"/pgsql || die
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createuser -h "${T}" bareos || die
-	createdb -h "${T}" --owner bareos bareos || die
-	export PGHOST="${T}"
-
-	# initiale mariadb database for backup tests
-	# $USER must be set and != root
-	export USER=portage
-
-	default
-	cmake_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-	rm -rvf "${T}"/pgsql
-}
-
-src_prepare() {
-	# fix gentoo platform support
-	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
-	eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
-	eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-
-	# fix missing DESTDIR in symlink creation
-	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	cmake_comment_add_subdirectory webui
-
-	if use clientonly; then
-		mycmakeargs+=(
-			-Dclient-only=ON
-			-Dstatic-cons=$(usex static)
-			-Dstatic-fd=$(usex static)
-		)
-	fi
-
-	for useflag in acl ipv6 ndmp scsi-crypto \
-		systemd lmdb; do
-		mycmakeargs+=( -D$useflag=$(usex $useflag) )
-	done
-
-	mycmakeargs+=(
-		-DHAVE_PYTHON=0
-		-Darchivedir=/var/lib/bareos/storage
-		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
-		-Dbasename="`hostname -s`"
-		-Dbatch-insert=yes
-		-Dbsrdir=/var/lib/bareos/bsr
-		-Dconfdir=/etc/bareos
-		-Dcoverage=no
-		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-		-Ddir-group=bareos
-		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Ddir-user=bareos
-		-Ddocdir=/usr/share/doc/${PF}
-		-Ddynamic-cats-backends=yes
-		-Ddynamic-storage-backends=yes
-		-Dfd-group=bareos
-		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dfd-user=root
-		-Dhost=${CHOST}
-		-Dhostname="`hostname -s`"
-		-Dhtmldir=/usr/share/doc/${PF}/html
-		-Dlibdir=/usr/$(get_libdir)
-		-Dlogdir=/var/log/bareos
-		-Dmandir=/usr/share/man
-		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dopenssl=yes
-		-Dpiddir=/run/bareos
-		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
-		-Dsbin-perm=0755
-		-Dsbindir=/usr/sbin
-		-Dscriptdir=/usr/libexec/bareos
-		-Dsd-group=bareos
-		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
-		-Dsd-user=root
-		-Dsubsysdir=/run/lock/subsys
-		-Dsysconfdir=/etc
-		-Dworkingdir=/var/lib/bareos
-		-Dx=$(usex X)
-		)
-
-		# disable droplet support for now as it does not build with gcc 10
-		# ... and this is a bundled lib, which should have its own package
-		cd core && cmake_comment_add_subdirectory "src/droplet"
-
-		cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
-	rm -f "${D}"/usr/sbin/bareos
-
-	# remove upstream init scripts and systemd units
-	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
-
-	# remove misc stuff we do not need in production
-	rm -f "${D}"/etc/bareos/bareos-regress.conf
-	rm -f "${D}"/etc/logrotate.d/bareos-dir
-
-	# get rid of py2 stuff
-	rm -rf "$D"/usr/lib64/python2.7 || die
-	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
-	if ! use vmware; then
-		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
-	fi
-
-	# rename statically linked apps
-	if use clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bareos-fd bareos-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use clientonly; then
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/core/scripts/logrotate bareos
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
-
-			into /etc/log.d/scripts/services
-			dobin bareos
-
-			into /etc/log.d/scripts/shared
-			dobin applybareosdate
-
-			insinto /etc/log.d/conf/logfiles
-			newins logfile.bareos.conf bareos.conf
-
-			insinto /etc/log.d/conf/services
-			newins services.bareos.conf bareos.conf
-
-			popd >&/dev/null || die
-		fi
-	fi
-
-	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
-	if use clientonly || ! use director; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/share/man/man8/bwild.8*
-		rm -vf "${D}"/usr/share/man/man8/bregex.8*
-		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
-		rm -vf "${D}"/usr/libexec/bareos/create_*_database
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
-		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
-	fi
-	if use clientonly || ! use storage-daemon; then
-		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bareos/disk-changer
-		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
-		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
-		rm -vf "${D}"/etc/bareos/mtx-changer.conf
-	fi
-	if ! use scsi-crypto; then
-		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
-	fi
-
-	# documentation
-	dodoc README.md
-	dodoc core/README.configsubdirectories
-	use glusterfs dodoc core/README.glusterfs
-	use ndmp && dodoc core/README.NDMP
-	use scsi-crypto && dodoc core/README.scsicrypto
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins core/scripts/bareos.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins core/scripts/filetype.vim bareos_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bareos-fd"
-	if ! use clientonly; then
-		if use director; then
-			myscripts+=" bareos-dir"
-		fi
-		if use storage-daemon; then
-			myscripts+=" bareos-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# install init script and config
-		newinitd "${FILESDIR}/${script}-21".initd "${script}"
-		newconfd "${FILESDIR}/${script}-21".confd "${script}"
-	done
-
-	# install systemd unit files
-	if use systemd; then
-		if ! use clientonly; then
-			use director && systemd_dounit "${FILESDIR}"/bareos-dir.service
-			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
-		fi
-		systemd_dounit "${FILESDIR}"/bareos-fd.service
-	fi
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bareos
-	keepdir /var/lib/bareos/storage
-
-	diropts -m0755
-	keepdir /var/log/bareos
-
-	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
-
-	# make sure bareos group can execute bareos libexec scripts
-	fowners -R root:bareos /usr/libexec/bareos
-}
-
-pkg_postinst() {
-	tmpfiles_process bareos.conf
-
-	if use clientonly; then
-		fowners root:bareos /var/lib/bareos
-	else
-		fowners bareos:bareos /var/lib/bareos
-	fi
-
-	if ! use clientonly && use director; then
-		einfo
-		einfo "If this is a new install, you must create the database:"
-		einfo
-		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'"
-		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'"
-		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'"
-		einfo
-	fi
-}
diff --git a/app-backup/bareos/bareos-21.1.5-r2.ebuild b/app-backup/bareos/bareos-21.1.6.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-21.1.5-r2.ebuild
rename to app-backup/bareos/bareos-21.1.6.ebuild
diff --git a/app-backup/bareos/bareos-22.0.2.ebuild b/app-backup/bareos/bareos-22.0.2.ebuild
new file mode 100644
index 000000000000..4e4745015088
--- /dev/null
+++ b/app-backup/bareos/bareos-22.0.2.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#	mirror
+#	!test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+	logwatch ndmp readline scsi-crypto split-usr
+	static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+	!app-backup/bacula
+	acct-group/${PN}
+	!x86? (
+		ceph? ( sys-cluster/ceph )
+	)
+	glusterfs? ( sys-cluster/glusterfs )
+	lmdb? ( dev-db/lmdb )
+	dev-libs/gmp:0
+	!clientonly? (
+		acct-user/${PN}
+		dev-db/postgresql:*[threads]
+		director? (
+			virtual/mta
+		)
+	)
+	logwatch? ( sys-apps/logwatch )
+	ndmp? ( net-libs/rpcsvc-proto )
+	tcpd? ( sys-apps/tcp-wrappers )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		dev-libs/jansson:=[static-libs]
+		dev-libs/lzo[static-libs]
+		dev-libs/openssl:0=[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+	)
+	!static? (
+		acl? ( virtual/acl )
+		dev-libs/jansson:=
+		dev-libs/lzo
+		dev-libs/openssl:0=
+		sys-libs/ncurses:=
+		sys-libs/zlib
+	)
+	"
+RDEPEND="${DEPEND}
+	!clientonly? (
+		storage-daemon? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		dev-cpp/gtest
+		dev-db/postgresql:*[server,threads]
+		dev-db/mariadb:*[server]
+	)
+"
+
+REQUIRED_USE="
+	static? ( clientonly )
+	x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+	local active_removed_backend=""
+	if has_version "<app-backup/bareos-21[director,mysql]"; then
+		if grep -qhriE "dbdriver.*=.*mysql" /etc/bareos/; then
+			active_removed_backend=MySQL
+		fi
+	elif has_version "<app-backup/bareos-21[director,sqlite]"; then
+		if grep -qhriE "dbdriver.*=.*sqlite" /etc/bareos/; then
+			active_removed_backend=SQLite
+		fi
+	fi
+	if [[ -n $active_removed_backend ]]; then
+		ewarn
+		ewarn "You are currently using bareos with the $active_removed_backend"
+		ewarn "catalog backend."
+		ewarn
+		ewarn "THIS IS NOT SUPPORTED ANYMORE"
+		ewarn
+		ewarn "Beginning with version 21.0.0 bareos has dropped support for"
+		ewarn "MySQL and SQLite catalog backends."
+		ewarn
+		ewarn "To upgrade to bareos >=21.0.0 you need to migrate to PostgreSQL"
+		ewarn "catalog backend using the 'bareos-dbcopy' tool of your current"
+		ewarn "installation first."
+		ewarn
+		die "current catalog backend not supported anymore"
+	fi
+}
+
+src_test() {
+	# initialze catalog test database
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createuser -h "${T}" bareos || die
+	createdb -h "${T}" --owner bareos bareos || die
+	export PGHOST="${T}"
+
+	# initiale mariadb database for backup tests
+	# $USER must be set and != root
+	export USER=portage
+
+	default
+	cmake_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+	rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+	# fix gentoo platform support
+	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
+	eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+
+	# fix missing DESTDIR in symlink creation
+	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	cmake_comment_add_subdirectory webui
+
+	if use clientonly; then
+		mycmakeargs+=(
+			-Dclient-only=ON
+			-Dstatic-cons=$(usex static)
+			-Dstatic-fd=$(usex static)
+		)
+	fi
+
+	for useflag in acl ipv6 ndmp scsi-crypto \
+		systemd lmdb; do
+		mycmakeargs+=( -D$useflag=$(usex $useflag) )
+	done
+
+	mycmakeargs+=(
+		-DHAVE_PYTHON=0
+		-Darchivedir=/var/lib/bareos/storage
+		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
+		-Dbasename="`hostname -s`"
+		-Dbatch-insert=yes
+		-Dbsrdir=/var/lib/bareos/bsr
+		-Dconfdir=/etc/bareos
+		-Dcoverage=no
+		-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
+		-Ddir-group=bareos
+		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Ddir-user=bareos
+		-Ddocdir=/usr/share/doc/${PF}
+		-Ddynamic-cats-backends=yes
+		-Ddynamic-storage-backends=yes
+		-Dfd-group=bareos
+		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dfd-user=root
+		-Dhost=${CHOST}
+		-Dhostname="`hostname -s`"
+		-Dhtmldir=/usr/share/doc/${PF}/html
+		-Dlibdir=/usr/$(get_libdir)
+		-Dlogdir=/var/log/bareos
+		-Dmandir=/usr/share/man
+		-Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dopenssl=yes
+		-Dpiddir=/run/bareos
+		-Dplugindir=/usr/$(get_libdir)/${PN}/plugin
+		-Dsbin-perm=0755
+		-Dsbindir=/usr/sbin
+		-Dscriptdir=/usr/libexec/bareos
+		-Dsd-group=bareos
+		-Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
+		-Dsd-user=root
+		-Dsubsysdir=/run/lock/subsys
+		-Dsysconfdir=/etc
+		-Dworkingdir=/var/lib/bareos
+		-Dx=$(usex X)
+		)
+
+		# disable droplet support for now as it does not build with gcc 10
+		# ... and this is a bundled lib, which should have its own package
+		cd core && cmake_comment_add_subdirectory "src/droplet"
+
+		cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd}
+	rm -f "${D}"/usr/sbin/bareos
+
+	# remove upstream init scripts and systemd units
+	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
+
+	# remove misc stuff we do not need in production
+	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
+
+	# remove duplicate binaries being installed in /usr/sbin and replace
+	# them by symlinks to not break systems that still use split-usr
+	if use split-usr; then
+		for f in bwild bregex bsmtp bconsole; do
+			rm -f "${D}/usr/sbin/$f" || die
+			ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+		done
+	fi
+
+	# get rid of py2 stuff
+	rm -rf "$D"/usr/lib64/python2.7 || die
+	rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die
+	if ! use vmware; then
+		rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
+	fi
+
+	# rename statically linked apps
+	if use clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bareos-fd bareos-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use clientonly; then
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/core/scripts/logrotate bareos
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/core/scripts/logwatch >&/dev/null || die
+
+			into /etc/log.d/scripts/services
+			dobin bareos
+
+			into /etc/log.d/scripts/shared
+			dobin applybareosdate
+
+			insinto /etc/log.d/conf/logfiles
+			newins logfile.bareos.conf bareos.conf
+
+			insinto /etc/log.d/conf/services
+			newins services.bareos.conf bareos.conf
+
+			popd >&/dev/null || die
+		fi
+	fi
+
+	rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
+	if use clientonly || ! use director; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/share/man/man8/bwild.8*
+		rm -vf "${D}"/usr/share/man/man8/bregex.8*
+		rm -vf "${D}"/usr/share/man/man8/bpluginfo.8*
+		rm -vf "${D}"/usr/libexec/bareos/create_*_database
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_database
+		rm -vf "${D}"/usr/libexec/bareos/make_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/update_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
+	fi
+	if use clientonly || ! use storage-daemon; then
+		rm -vf "${D}"/usr/share/man/man8/bareos-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bareos/disk-changer
+		rm -vf "${D}"/usr/libexec/bareos/mtx-changer
+		rm -vf "${D}"/usr/libexec/bareos/dvd-handler
+		rm -vf "${D}"/etc/bareos/mtx-changer.conf
+	fi
+	if ! use scsi-crypto; then
+		rm -vf "${D}"/usr/share/man/man8/bscrypto.8*
+	fi
+
+	# documentation
+	dodoc README.md
+	dodoc core/README.configsubdirectories
+	use glusterfs dodoc core/README.glusterfs
+	use ndmp && dodoc core/README.NDMP
+	use scsi-crypto && dodoc core/README.scsicrypto
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins core/scripts/bareos.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins core/scripts/filetype.vim bareos_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bareos-fd"
+	if ! use clientonly; then
+		if use director; then
+			myscripts+=" bareos-dir"
+		fi
+		if use storage-daemon; then
+			myscripts+=" bareos-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# install init script and config
+		newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
+		newconfd "${FILESDIR}/${script}-21".confd "${script}"
+	done
+
+	# install systemd unit files
+	if use systemd; then
+		if ! use clientonly; then
+			use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service
+			use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service
+		fi
+		systemd_dounit "${FILESDIR}"/bareos-fd.service
+	fi
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bareos
+	keepdir /var/lib/bareos/storage
+
+	# set log directory ownership
+	if ! use clientonly; then
+		diropts -m0755 -o bareos -g bareos
+	fi
+	keepdir /var/log/bareos
+
+	newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
+	# make sure bareos group can execute bareos libexec scripts
+	fowners -R root:bareos /usr/libexec/bareos
+}
+
+pkg_postinst() {
+	tmpfiles_process bareos.conf
+
+	if use clientonly; then
+		fowners root:bareos /var/lib/bareos
+	else
+		fowners bareos:bareos /var/lib/bareos
+	fi
+
+	if ! use clientonly && use director; then
+		einfo
+		einfo "If this is a new install, you must create the database:"
+		einfo
+		einfo "  su postgres -c '/usr/libexec/bareos/create_bareos_database'"
+		einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables'"
+		einfo "  su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'"
+		einfo
+		einfo "or run"
+		einfo
+		einfo " emerge --config app-backup/bareos"
+		einfo
+		einfo "to do this"
+	fi
+}
+
+pkg_config() {
+	su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database"
+	su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables"
+	su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges"
+}
diff --git a/app-backup/bareos/files/bareos-22.0.2-werror.patch b/app-backup/bareos/files/bareos-22.0.2-werror.patch
new file mode 100644
index 000000000000..43f2aa5ad7d9
--- /dev/null
+++ b/app-backup/bareos/files/bareos-22.0.2-werror.patch
@@ -0,0 +1,23 @@
+diff -urN bareos-Release-22.0.2.orig/core/CMakeLists.txt bareos-Release-22.0.2/core/CMakeLists.txt
+--- bareos-Release-22.0.2.orig/core/CMakeLists.txt	2023-02-07 15:30:01.000000000 +0530
++++ bareos-Release-22.0.2/core/CMakeLists.txt	2023-03-01 23:06:39.577048453 +0530
+@@ -104,7 +104,7 @@
+     -Werror=format-security compiler_error_format_security
+   )
+   if(${compiler_error_format_security})
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security")
+   endif()
+ endif()
+ 
+@@ -394,8 +394,8 @@
+   add_definitions("-DDEVELOPER=1")
+ endif()
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+ 
+ include(BareosSetVariableDefaults)
+ option(ENABLE_BCONSOLE "Build bconsole binary" ON)
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 4a00feb04215..3543769c9595 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index 4777e551e272..f4de3c59d4f4 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -1,2 +1,3 @@
 DIST crun-1.4.4.tar.xz 877892 BLAKE2B 57e48c0a229db3f54212177cef3fdb3f59b4bb1d1cc865da956f026a35837d839489bd126f880d7a9ceb18f5cffbf0e32ac9ae59a4cd39c34e3aff5b32c0559a SHA512 1756dccf6509457a5dc114d43c4f4e99258a20c3437dfe06016d080989c5d3035f5735d62d18ab537b660ec36de04df369a2582745baf4ab680af367a19830fd
 DIST crun-1.4.5.tar.xz 879044 BLAKE2B c80cae28c23140086682493a7dddb40640491e3ea827f0a7376d9be12570111d056022f50b8d7c574ca07790753d20de2314db5b89463994c4fffbc7576c372d SHA512 9f288279615fdf587018c465047fc8793daae280ab864bf9046994983239129d50f2eb89cac9b092e5cdc49a10f3523ab403a3f0e7451f7536b79f651a355153
+DIST crun-1.8.1.tar.xz 692152 BLAKE2B b5dce1a454641221c591f50ac8519d4e9e9d892ea56232fa3fc9916934c19eba5853019238b1837cd5fb61f0dec5e0e6a11c02f628bece3b69c9c4f5750addae SHA512 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042
diff --git a/app-containers/crun/crun-1.8.1.ebuild b/app-containers/crun/crun-1.8.1.ebuild
new file mode 100644
index 000000000000..4f443f5c280e
--- /dev/null
+++ b/app-containers/crun/crun-1.8.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+# Can drop autotools/eautoreconf after next release & glibc patch gone
+inherit autotools python-any-r1
+
+DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
+HOMEPAGE="https://github.com/containers/crun"
+SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
+
+DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/yajl:=
+	sys-kernel/linux-headers
+	caps? ( sys-libs/libcap )
+	criu? ( >=sys-process/criu-3.15 )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-container )"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+# the crun test suite is comprehensive to the extent that tests will fail
+# within a sandbox environment, due to the nature of the privileges
+# required to create linux "containers".
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable bpf)
+		$(use_enable caps)
+		$(use_enable criu)
+		$(use_enable seccomp)
+		$(use_enable systemd)
+		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake git-version.h
+	emake -C libocispec
+	emake crun
+}
+
+src_install() {
+	emake "DESTDIR=${D}" install-exec
+	doman crun.1
+	einstalldocs
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 49cc1de8549f..e0aa6333d5e1 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-1.31.0.ebuild b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-1.31.0.ebuild
index 51cc80c71ab7..7f31f1629de6 100644
--- a/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-1.31.0.ebuild
+++ b/app-crypt/certbot-dns-dnsimple/certbot-dns-dnsimple-1.31.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10,11} )
 
 inherit distutils-r1
 
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
index 84bce023f9e2..5f91655fd8a0 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="+asn1 debug +libffi systemd +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/seahorse/files/seahorse-43.0-musl-stdout.patch b/app-crypt/seahorse/files/seahorse-43.0-musl-stdout.patch
new file mode 100644
index 000000000000..2a6873134e27
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-43.0-musl-stdout.patch
@@ -0,0 +1,85 @@
+https://gitlab.gnome.org/GNOME/seahorse/-/commit/6d673637d90066f4756568ce1b2f1f3c89a37c74
+
+From 6d673637d90066f4756568ce1b2f1f3c89a37c74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
+Date: Thu, 20 Oct 2022 18:35:33 +0200
+Subject: [PATCH] ssh: avoid stdout and stderr variable names
+
+In Alpine Linux, the compiler:
+
+C compiler for the host machine: gcc (gcc 12.2.1 "gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924")
+C linker for the host machine: gcc ld.bfd 2.39
+Vala compiler for the host machine: valac (valac 0.56.3)
+
+ended up including stdio.h into the C code generated from Vala.
+This produced the following (and similar) errors due to
+stderr and stdout being #define in stdio.h:
+
+ninja: job failed: gcc -Issh/libseahorse-ssh.a.p -Issh -I../ssh -Icommon -I../common -I. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/gcr-3 -I/usr/include/gck-1 -I/usr/include/p11-kit-1 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libhandy-1 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -w -O0 -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE -DSECRET_WITH_UNSTABLE -include config.h -Wno-unused-parameter -Wno-missing-field-initializers -Os -fomit-frame-pointer -Os -fomit-frame-pointer -fPIC -pthread -MD -MQ ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o -MF ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o.d -o ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o -c ssh/libseahorse-ssh.a.p/operation.c
+In file included from /usr/include/fortify/stdio.h:22,
+                 from /usr/include/pango-1.0/pango/pango-utils.h:25,
+                 from /usr/include/pango-1.0/pango/pango.h:51,
+                 from /usr/include/gtk-3.0/gdk/gdktypes.h:35,
+                 from /usr/include/gtk-3.0/gdk/gdkapplaunchcontext.h:30,
+                 from /usr/include/gtk-3.0/gdk/gdk.h:32,
+                 from /usr/include/gtk-3.0/gtk/gtk.h:30,
+                 from common/seahorse-common.h:11,
+                 from ssh/seahorse-ssh.h:6,
+                 from ssh/libseahorse-ssh.a.p/operation.c:25:
+ssh/libseahorse-ssh.a.p/operation.c: In function 'seahorse_ssh_operation_operation_async_co':
+ssh/libseahorse-ssh.a.p/operation.c:621:17: error: expected identifier before '(' token
+  621 |         _data_->stdout = NULL;
+      |                 ^~~~~~
+ssh/libseahorse-ssh.a.p/operation.c:622:17: error: expected identifier before '(' token
+  622 |         _data_->stderr = NULL;
+      |                 ^~~~~~
+
+Fix the problem by naming the variables std_out and std_err, as it
+was before commit e60e5fd4b1545053e99758b894e8ef981de08c3e
+
+Fixes e60e5fd4b1545053e99758b894e8ef981de08c3e
+
+Coauthored-by: psykose <alice@ayaya.dev>
+--- a/ssh/operation.vala
++++ b/ssh/operation.vala
+@@ -84,12 +84,12 @@ public abstract class Operation : GLib.Object {
+ 
+         // And off we go to run the program
+         var subprocess = launcher.spawnv(args);
+-        string? stdout = null, stderr = null;
++        string? std_out = null, std_err = null;
+         try {
+-            yield subprocess.communicate_utf8_async(input, cancellable, out stdout, out stderr);
+-            return stdout;
++            yield subprocess.communicate_utf8_async(input, cancellable, out std_out, out std_err);
++            return std_out;
+         } catch (GLib.Error e) {
+-            Seahorse.Util.show_error(null, this.prompt_title, stderr);
++            Seahorse.Util.show_error(null, this.prompt_title, std_err);
+             throw e;
+         }
+     }
+@@ -221,10 +221,10 @@ public class PrivateImportOperation : Operation {
+ 
+         // Start command to generate public key
+         string cmd = "%s -y -f '%s'".printf(Config.SSH_KEYGEN_PATH, file);
+-        string stdout = yield operation_async(cmd, null, cancellable);
++        string std_out = yield operation_async(cmd, null, cancellable);
+ 
+         // We'll build the key string from the output
+-        var key_str = new StringBuilder(stdout);
++        var key_str = new StringBuilder(std_out);
+ 
+         // Only use the first line of the output
+         int pos = int.max(key_str.str.index_of_char('\n'), key_str.str.index_of_char('\r'));
+@@ -232,7 +232,7 @@ public class PrivateImportOperation : Operation {
+             key_str.erase(pos);
+ 
+         // Parse the data so we can get the fingerprint
+-        KeyData? keydata = KeyData.parse_line(stdout);
++        KeyData? keydata = KeyData.parse_line(std_out);
+ 
+         // Add the comment to the output
+         if (data.comment != null) {
+-- 
+GitLab
diff --git a/app-crypt/seahorse/seahorse-43.0-r1.ebuild b/app-crypt/seahorse/seahorse-43.0-r1.ebuild
new file mode 100644
index 000000000000..496566b5b5de
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-43.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Manage your passwords and encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.66:2
+	>=app-crypt/gcr-3.38:0=
+	>=app-crypt/gpgme-1.14.0:=
+	>=x11-libs/gtk+-3.24.0:3
+	>=app-crypt/gnupg-2.2
+	>=gui-libs/libhandy-1.6.0:1
+	>=app-crypt/libsecret-0.16
+	dev-libs/libpwquality
+	net-misc/openssh
+	ldap? ( net-nds/openldap:= )
+	net-libs/libsoup:3.0
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	app-crypt/gcr:0[vala]
+	app-crypt/libsecret[vala]
+	gui-libs/libhandy:1[vala]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gnupg-2.4.patch
+	"${FILESDIR}"/${P}-musl-stdout.patch
+)
+
+src_prepare() {
+	default
+	vala_setup
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dhelp=true
+		-Dpgp-support=true
+		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
+		-Dpkcs11-support=true
+		-Dkeyservers-support=true
+		-Dhkp-support=true
+		$(meson_use ldap ldap-support)
+		$(meson_use zeroconf key-sharing)
+		-Dmanpage=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.8-r2.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.8-r2.ebuild
new file mode 100644
index 000000000000..084f83c06212
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ssl"
+
+# app-crypt/ccid required for
+# - 'ykman oath'
+# - 'ykman openpgp'
+# - 'ykman piv'
+RDEPEND="
+	app-crypt/ccid
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
+BDEPEND="test? (
+	dev-python/makefun[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/ykman.1
+}
diff --git a/app-crypt/yubioath-desktop/metadata.xml b/app-crypt/yubioath-desktop/metadata.xml
index 1fad7916d280..e3ffb2c669e2 100644
--- a/app-crypt/yubioath-desktop/metadata.xml
+++ b/app-crypt/yubioath-desktop/metadata.xml
@@ -9,4 +9,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Yubico/yubioath-desktop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild
index 0cf919d9712a..71795479f0b7 100644
--- a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild
+++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit desktop python-single-r1 qmake-utils xdg
 
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 6bcbc5c73b3b..cc41c24784d8 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/sword-2BabDict/Manifest b/app-dicts/sword-2BabDict/Manifest
deleted file mode 100644
index ae5336a3cb9a..000000000000
--- a/app-dicts/sword-2BabDict/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST 2BabDict-1.0.zip 16960 BLAKE2B b510222a9d1d4045c9e29512db34b7a10ec9206291cc1604e87e8d04603cb40444403096fef5678b4a2dc1a5dd7f1a8a5c02f328b580dfb69c5cda7c53173913 SHA512 e6a3bf16461f5bdfe422beae0b4c2acf1f6701ed25d6ad7e7ae568ef232c49511d16ad78b0390bc114e8fb084eefd782314066af80498d8ac640e3c4ae817280
diff --git a/app-dicts/sword-2BabDict/metadata.xml b/app-dicts/sword-2BabDict/metadata.xml
deleted file mode 100644
index f0cf9310f01d..000000000000
--- a/app-dicts/sword-2BabDict/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription>
-		Definitions and Symbols from The Two Babylons by Rev. Alexander Hissop. Electronic edition formatted for the Online Bible by Gary Gallant.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-2BabDict/sword-2BabDict-1.0.ebuild b/app-dicts/sword-2BabDict/sword-2BabDict-1.0.ebuild
deleted file mode 100644
index 5da67802ace1..000000000000
--- a/app-dicts/sword-2BabDict/sword-2BabDict-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Definitions and Symbols from The Two Babylons"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=2BabDict"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-AB/Manifest b/app-dicts/sword-AB/Manifest
deleted file mode 100644
index da0c7271b042..000000000000
--- a/app-dicts/sword-AB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AB-1.3.1.zip 1203747 BLAKE2B 9850d115e7f398375f72e8c350969e5d8aa3eb0cad6d8a1fc32f5c303dced090c70b60323bb16ade42cf7b2b78f62fc738cb34f04ef9bfbbfeddd167da80400f SHA512 11c27e2cfc162d4e12d1b2d9413d3417340c916d980f9591f27ae0d151e8e7832b4931e8421aab04ae89fcec91e8b09537aabf09464d07804f1e9399fe33528b
diff --git a/app-dicts/sword-AB/metadata.xml b/app-dicts/sword-AB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-AB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-AB/sword-AB-1.3.1.ebuild b/app-dicts/sword-AB/sword-AB-1.3.1.ebuild
deleted file mode 100644
index a048f31a9a25..000000000000
--- a/app-dicts/sword-AB/sword-AB-1.3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.8"
-
-inherit sword-module
-
-DESCRIPTION="The Apostles' Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AB"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ABP/Manifest b/app-dicts/sword-ABP/Manifest
deleted file mode 100644
index 9d2ea9dcc1f4..000000000000
--- a/app-dicts/sword-ABP/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ABP-1.2.zip 4666032 BLAKE2B b2fef12a4f2a5ae915c02962424a7deecf5be2af92082470a1103e34ce5ee9b9314c4d5a57c7d0cc93a6e040c2e40710c1b8220703250494659738f7bbd96995 SHA512 b91531fbbaf4dff73c624de745e4589b2380cf86dd4426076b37f8074b954422fb4ac03a5e0b91c90bf2045d7af412311821123e96706b942d7f9483bf2e489c
diff --git a/app-dicts/sword-ABP/metadata.xml b/app-dicts/sword-ABP/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ABP/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ABP/sword-ABP-1.2.ebuild b/app-dicts/sword-ABP/sword-ABP-1.2.ebuild
deleted file mode 100644
index 815cd433938c..000000000000
--- a/app-dicts/sword-ABP/sword-ABP-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Apostolic Bible Polyglot English Text"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABP"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ABPGRK/Manifest b/app-dicts/sword-ABPGRK/Manifest
deleted file mode 100644
index e0a452ce79f7..000000000000
--- a/app-dicts/sword-ABPGRK/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ABPGRK-1.2.zip 4377505 BLAKE2B d6418e60f3801c12141560f7a2d778f19de7fb5ffb1610fd52171d045dd57bb9dac4234c2146d21082c0de2cfda9bf01911d26dc1c2e0874c4e9f63216841119 SHA512 5cc5850f00131ee75fefb43c125c432ee23778464afe8b717e7c005f053dbf540195be1b2e74cf2b60c85c2f11fe1d3076988d4a4d0999cd4dce54970c54c894
diff --git a/app-dicts/sword-ABPGRK/metadata.xml b/app-dicts/sword-ABPGRK/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ABPGRK/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ABPGRK/sword-ABPGRK-1.2.ebuild b/app-dicts/sword-ABPGRK/sword-ABPGRK-1.2.ebuild
deleted file mode 100644
index bbc3d90f2ee5..000000000000
--- a/app-dicts/sword-ABPGRK/sword-ABPGRK-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Apostolic Bible Polyglot Greek Text"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABPGRK"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ABS_Essay_GoodSam_SWB/Manifest b/app-dicts/sword-ABS_Essay_GoodSam_SWB/Manifest
deleted file mode 100644
index 4ce99eb5490f..000000000000
--- a/app-dicts/sword-ABS_Essay_GoodSam_SWB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ABS_Essay_GoodSam_SWB-1.0.zip 9530 BLAKE2B 10f46b8b5690040ccedf12cdaf77d55742836ef2f296e18391ace6c71ebd3c0fd6855fd5dfdecba3ecedf998d50d033179fffdd8651f31eccd36861e0aac5477 SHA512 6a9d60fbb241dd5612ef3ca09714084e19a092dc50534811e42592578bbcb160153e724be487f2851d78e47148ecdf6483fff079d683027a6a65401ef6969983
diff --git a/app-dicts/sword-ABS_Essay_GoodSam_SWB/metadata.xml b/app-dicts/sword-ABS_Essay_GoodSam_SWB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ABS_Essay_GoodSam_SWB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ABS_Essay_GoodSam_SWB/sword-ABS_Essay_GoodSam_SWB-1.0.ebuild b/app-dicts/sword-ABS_Essay_GoodSam_SWB/sword-ABS_Essay_GoodSam_SWB-1.0.ebuild
deleted file mode 100644
index f0234f3e8eba..000000000000
--- a/app-dicts/sword-ABS_Essay_GoodSam_SWB/sword-ABS_Essay_GoodSam_SWB-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.3"
-
-inherit sword-module
-
-DESCRIPTION="Essays on The Good Samaritan: Violence on the Road, Social World of Bandits"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABS_Essay_GoodSam_SWB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ACV/Manifest b/app-dicts/sword-ACV/Manifest
deleted file mode 100644
index 98a5a9e69fea..000000000000
--- a/app-dicts/sword-ACV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ACV-2.0.zip 1396326 BLAKE2B 0aaf48548d4b6f7597b1d5339183d47ac35711a875dde8c42aeefe9345a2b7c19efa5ae58422f1feac93e98c521f4c4f09331f70f0e3d8f07b30fbb2c0ddf8a9 SHA512 913597446f8efda893bc27267a17c9de393d4dc6b6d865abc2d8c99f5b20f4bfc0b1107cd7d81a03c3c192bd8166ec5135d3e5eb9bfaf76998bc797eddf70dca
diff --git a/app-dicts/sword-ACV/metadata.xml b/app-dicts/sword-ACV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ACV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ACV/sword-ACV-2.0-r1.ebuild b/app-dicts/sword-ACV/sword-ACV-2.0-r1.ebuild
deleted file mode 100644
index fc9bdf0840c5..000000000000
--- a/app-dicts/sword-ACV/sword-ACV-2.0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="A Conservative Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-AKJV/Manifest b/app-dicts/sword-AKJV/Manifest
deleted file mode 100644
index d654a2ad70fa..000000000000
--- a/app-dicts/sword-AKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AKJV-1.4.zip 1402903 BLAKE2B 726e61e4fd3b9eace74627c5dfbd38424b0472e127c3ec762b6cd3f587bccfbd690330245b3a8b2ca12cdc47c9ccdaf6fc5d710bab9ff963d9fd9c5b3e641580 SHA512 6f9ac42e6b768d356520384dd063f4deef409e15380e7b17c94e0870717c4b37881e17b4fe5eef62a55b71092fd37507a4f0b3a42149757756896b3fb021612c
diff --git a/app-dicts/sword-AKJV/metadata.xml b/app-dicts/sword-AKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-AKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-AKJV/sword-AKJV-1.4-r1.ebuild b/app-dicts/sword-AKJV/sword-AKJV-1.4-r1.ebuild
deleted file mode 100644
index d88c6d601583..000000000000
--- a/app-dicts/sword-AKJV/sword-AKJV-1.4-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="American King James Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ASV/Manifest b/app-dicts/sword-ASV/Manifest
deleted file mode 100644
index 8d9be5e43850..000000000000
--- a/app-dicts/sword-ASV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ASV-2.0.zip 3285762 BLAKE2B 511be1fd95ca75fd013a65c344f49205588bbee02ccfcf8e17760096a3734e54de442dbf528083e08a11e2a8a7f5eb32a44f14cdeafc02332825976f981418cc SHA512 0566e21ee437d2f2f93d3b93f5ae466a91b44c9df62bb8cda169cf586dccbe461ef1fe039225219bce29bf155ede2d778518bf3faeeaf56fb677f9c42deb18a6
diff --git a/app-dicts/sword-ASV/metadata.xml b/app-dicts/sword-ASV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ASV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ASV/sword-ASV-2.0.ebuild b/app-dicts/sword-ASV/sword-ASV-2.0.ebuild
deleted file mode 100644
index cf72705fef1a..000000000000
--- a/app-dicts/sword-ASV/sword-ASV-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="American Standard Version (1901)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Abbott/Manifest b/app-dicts/sword-Abbott/Manifest
deleted file mode 100644
index 0336ef3bdfa1..000000000000
--- a/app-dicts/sword-Abbott/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Abbott-1.1.zip 435868 BLAKE2B 905e0a08b27a28f2de227738a3c2b48818c39cc4b5115c48ffaacdd817435ebd003cd71c0e011d18437a8a87277c2d352a4e344474b5b66de1d19133b975b9a4 SHA512 999fa69c552296140c6bb4309848b61c53e7cd96543b07d13b43bdf7250b55f33363961105058378fb4979a52e928fe2c1e0e6ff7655839fda0cd1fbc2a12fae
diff --git a/app-dicts/sword-Abbott/metadata.xml b/app-dicts/sword-Abbott/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Abbott/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Abbott/sword-Abbott-1.1-r1.ebuild b/app-dicts/sword-Abbott/sword-Abbott-1.1-r1.ebuild
deleted file mode 100644
index b1936fc40c8b..000000000000
--- a/app-dicts/sword-Abbott/sword-Abbott-1.1-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Illustrated New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-AbbottSmith/Manifest b/app-dicts/sword-AbbottSmith/Manifest
deleted file mode 100644
index d8e44480bdb9..000000000000
--- a/app-dicts/sword-AbbottSmith/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AbbottSmith-3.1.zip 1380078 BLAKE2B db5f850aec600f0f2547923b411c16230805785a0b02dd97a8acc1a64721dafdaa2a6b783f4d0c413986275211a5704c48c1a429630a7e97caef05bd0ca71d13 SHA512 37b3f7960f8018edd5ae3c68ffdc548cd84e522ca06d595c87178efb84f9a0eca26bb12324773b713c25b4e2dcfa1affa3ae19b6bd4d5bc34f9d3fd890784db5
diff --git a/app-dicts/sword-AbbottSmith/metadata.xml b/app-dicts/sword-AbbottSmith/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-AbbottSmith/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-AbbottSmith/sword-AbbottSmith-3.1.ebuild b/app-dicts/sword-AbbottSmith/sword-AbbottSmith-3.1.ebuild
deleted file mode 100644
index 58e2e294593a..000000000000
--- a/app-dicts/sword-AbbottSmith/sword-AbbottSmith-3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="G. Abbott-Smith's A Manual Greek Lexicon of the New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AbbottSmith"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-AbbottSmithStrongs/Manifest b/app-dicts/sword-AbbottSmithStrongs/Manifest
deleted file mode 100644
index c4b4299cdad2..000000000000
--- a/app-dicts/sword-AbbottSmithStrongs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AbbottSmithStrongs-3.1.zip 1359849 BLAKE2B 8f8eb28c0f89f8a75b06e449657619b8ef0d876330274036fe6853c50cf994d68952a0433505a1b84e012bd84196be17e6126a8349e49d7cdfdc9e2a325a6357 SHA512 2c1ad24cc50b8a40105fbb3dcb0cf9a6790e1eadbd1dd65b0410dca57943d77d290eeff904085a6b3f81d7f02b7dca5d8fbfb2ecae609ccfe71608a76b1fa16c
diff --git a/app-dicts/sword-AbbottSmithStrongs/metadata.xml b/app-dicts/sword-AbbottSmithStrongs/metadata.xml
deleted file mode 100644
index 96b044ceb92b..000000000000
--- a/app-dicts/sword-AbbottSmithStrongs/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Abbott-Smith is a project to mark up the G. Abbott-Smith's A Manual Greek Lexicon of the New Testament (New York: Scribner's, 1922) using TEI. 
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-AbbottSmithStrongs/sword-AbbottSmithStrongs-3.1.ebuild b/app-dicts/sword-AbbottSmithStrongs/sword-AbbottSmithStrongs-3.1.ebuild
deleted file mode 100644
index a7173e189b26..000000000000
--- a/app-dicts/sword-AbbottSmithStrongs/sword-AbbottSmithStrongs-3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="G. Abbott-Smith's A Manual Greek Lexicon of the New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AbbottSmithStrongs"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Afr1953/Manifest b/app-dicts/sword-Afr1953/Manifest
deleted file mode 100644
index 4fe90d900d20..000000000000
--- a/app-dicts/sword-Afr1953/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Afr1953-1.3.2.zip 1447108 BLAKE2B e392da75c2bde25ebed24c71e2a5cd0c210759fb7d2afa005a74f233aeecf34d18c78d5b8880a987d3d93d292f9f922acd516bc971102f7b6d48ad6cbfad29dc SHA512 804fb54ae9e33000f6bc8f960318a41948a93cf9178aa479a6369084298ce6cd20d73c0a80f5210c33fbdc0f5b2806f9a5f060bbb454f0ab40ba0bb1c84ccb90
diff --git a/app-dicts/sword-Afr1953/metadata.xml b/app-dicts/sword-Afr1953/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Afr1953/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Afr1953/sword-Afr1953-1.3.2.ebuild b/app-dicts/sword-Afr1953/sword-Afr1953-1.3.2.ebuild
deleted file mode 100644
index 9d6b36b48bf4..000000000000
--- a/app-dicts/sword-Afr1953/sword-Afr1953-1.3.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1933/1953 Afrikaans Bybel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953"
-LICENSE="crosswire free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Alb/Manifest b/app-dicts/sword-Alb/Manifest
deleted file mode 100644
index 394d7008e202..000000000000
--- a/app-dicts/sword-Alb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Alb-2.0.zip 1588203 BLAKE2B 26db7c2487f54dc810b99a4b0f5650f84724b52f6aa0d7b75091773f3dfc485d78791584cde18a1fb39b11e9a31b967a2be134388336e076b391258d0f1ea167 SHA512 7bd57c40e69c75f40a35d6601ff1a74827feefa13c8878ae60a046504c20b7eaf4cdca3573d31756cedd30951982f82b6c5950178c94eb81a1b7b50cb1a827e4
diff --git a/app-dicts/sword-Alb/metadata.xml b/app-dicts/sword-Alb/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Alb/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Alb/sword-Alb-2.0.ebuild b/app-dicts/sword-Alb/sword-Alb-2.0.ebuild
deleted file mode 100644
index f10e9c99c2ae..000000000000
--- a/app-dicts/sword-Alb/sword-Alb-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Albanian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Aleppo/Manifest b/app-dicts/sword-Aleppo/Manifest
deleted file mode 100644
index 21a3bbb5b2cb..000000000000
--- a/app-dicts/sword-Aleppo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Aleppo-2.0.zip 863221 BLAKE2B 939056461cf7ec9e5d5d574832b9513b827cb0181fbdee2d66ecde6da247d63dfc2ec108a0930f3e28b90145c57b726dfb1e1f34afd3ddb6f017beff69ca37d1 SHA512 1e9d9546fcb276ec191a863dc5750f954abeadd6c1f2e83fd58917d395cdbc34a5d268a581336a21ccc6d6c87f19e29b690d6329be823a2fe932b59e521ee061
diff --git a/app-dicts/sword-Aleppo/metadata.xml b/app-dicts/sword-Aleppo/metadata.xml
deleted file mode 100644
index 9279aef89290..000000000000
--- a/app-dicts/sword-Aleppo/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		The Aleppo Codex (i.e. Hebrew Bible) without Vowel Points or Punctuation.
-		Based on the electronic edition at http://www.mechon-mamre.org
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Aleppo/sword-Aleppo-2.0.ebuild b/app-dicts/sword-Aleppo/sword-Aleppo-2.0.ebuild
deleted file mode 100644
index 5593dc5558a4..000000000000
--- a/app-dicts/sword-Aleppo/sword-Aleppo-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Aleppo Codex"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-AmTract/Manifest b/app-dicts/sword-AmTract/Manifest
deleted file mode 100644
index 2c3e99030ce9..000000000000
--- a/app-dicts/sword-AmTract/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AmTract-1.1.zip 758636 BLAKE2B 51ee5834e2082cf9b904e67add17b6547060084a8bf8817143e11f5c0567d99344259ff3c578d6252cbd61bbb2fc1e01210e4fa4d267de627845ad6e3382ff92 SHA512 5575030e76ec32261da220618dbf157213e0b7c630479b2d9966d9eb992f863b777bd38e3ef3502c01cd62fa84df85a7b0e35a4854e2366cb4aa088425602641
diff --git a/app-dicts/sword-AmTract/metadata.xml b/app-dicts/sword-AmTract/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-AmTract/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-AmTract/sword-AmTract-1.1-r1.ebuild b/app-dicts/sword-AmTract/sword-AmTract-1.1-r1.ebuild
deleted file mode 100644
index 94d027aba85f..000000000000
--- a/app-dicts/sword-AmTract/sword-AmTract-1.1-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="American Tract Society Bible Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Anderson/Manifest b/app-dicts/sword-Anderson/Manifest
deleted file mode 100644
index 3a56bd1eb483..000000000000
--- a/app-dicts/sword-Anderson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Anderson-1.0.zip 392941 BLAKE2B 160cb5eeddda4bbdb973e08e302c787d1309e59bb0deb73ecedc4f80defe6ea9630b0adff3824d1143ebc27ef77ca230ca49c9789d0604cb74fa284d6a4fc403 SHA512 b97230082984488b54246d6fdb3fc751d201175faf51240d3d358fe415e99a1361666c4df2a6ae989d30a3d73b9cfed781a34c2717b5dab1eaf2cff1b43e22cf
diff --git a/app-dicts/sword-Anderson/metadata.xml b/app-dicts/sword-Anderson/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Anderson/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Anderson/sword-Anderson-1.0.ebuild b/app-dicts/sword-Anderson/sword-Anderson-1.0.ebuild
deleted file mode 100644
index fc6b68622ec2..000000000000
--- a/app-dicts/sword-Anderson/sword-Anderson-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Henry Tompkins Anderson's 1864 New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Anderson"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Antoniades/Manifest b/app-dicts/sword-Antoniades/Manifest
deleted file mode 100644
index 4acf62e07f1d..000000000000
--- a/app-dicts/sword-Antoniades/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Antoniades-1.4.zip 959315 BLAKE2B daa6b9889061d760bcfb3e48a90e49693bd5b26b78171db0f216cefc0ea16d941455ee4f7c7bab1e9efd953a31d0823be485a2347fe79bc549c6d22f1e0aa146 SHA512 27c9d536e9a3c252ac978a32cc590dd44b448aa4f1aad6c2367eeade9dff877f813e829143886da98d8c14c8bf9bcf2a7edf63fa25547303c1bbed2c77db65be
diff --git a/app-dicts/sword-Antoniades/metadata.xml b/app-dicts/sword-Antoniades/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Antoniades/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Antoniades/sword-Antoniades-1.4.ebuild b/app-dicts/sword-Antoniades/sword-Antoniades-1.4.ebuild
deleted file mode 100644
index dcb40ae32aea..000000000000
--- a/app-dicts/sword-Antoniades/sword-Antoniades-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Antoniades Patriarchal Edition (1904/1912)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Antoniades"
-LICENSE="CC-BY-NC-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-AraNAV/Manifest b/app-dicts/sword-AraNAV/Manifest
deleted file mode 100644
index 58b580f1392f..000000000000
--- a/app-dicts/sword-AraNAV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AraNAV-2.0.1.zip 2232255 BLAKE2B e98250de54490b6ee49aa5c1c81d88bb20ab9701890d0d594a6a87b35bfe64e0d555ad4b94788a291240532629de5d903be25d9e9cb44f46170fda7d300284d8 SHA512 119015ca269019439eb455eeb558e0ebc31b041cb961c61f127ecf5a92f6e0f151da6cd0de62d5e4a40aae1ed98db2e44bd697250dedf2215b69608b24d7be6f
diff --git a/app-dicts/sword-AraNAV/metadata.xml b/app-dicts/sword-AraNAV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-AraNAV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-AraNAV/sword-AraNAV-2.0.1.ebuild b/app-dicts/sword-AraNAV/sword-AraNAV-2.0.1.ebuild
deleted file mode 100644
index cfcaba117c6b..000000000000
--- a/app-dicts/sword-AraNAV/sword-AraNAV-2.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="New Arabic Version (Ketab El Hayat)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AraNAV"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-AraSVD/Manifest b/app-dicts/sword-AraSVD/Manifest
deleted file mode 100644
index 6198127ad847..000000000000
--- a/app-dicts/sword-AraSVD/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AraSVD-2.2.zip 1820699 BLAKE2B 53d1963a6ad0a345b44e94936778c3e873f28c929318bcd539cd0cd6aef6871ec5353d057981862c5dbf2588f2f6e1ba7af62da703fad693df77f93fed6d40ae SHA512 3c30798b785dda7667b3bc62f8fc2e25d566effbeae061f2834e0d3aefa2f2392c23461aad7b9b505d7974bb13185e91f0cbb36a5d855284fffda1bb479af3e0
diff --git a/app-dicts/sword-AraSVD/metadata.xml b/app-dicts/sword-AraSVD/metadata.xml
deleted file mode 100644
index 77595ef89094..000000000000
--- a/app-dicts/sword-AraSVD/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Al-Kitab al-Muqaddas (Arabic Bible)
-		Translated by Drs. Eli Smith &amp; Cornelius van Alen van Dyck, 1865.
-
-		Per kind permissions from:
-		Arabic Bible Outreach Ministry
-		P.O. 486
-		Dracut, MA 08126
-		USA
-
-		http://www.arabicbible.com/
-
-		This Bible module may be re-distributed in Sword format only. Conversion
-		to other formats is not permitted without express permission of the
-		copyright holder.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-AraSVD/sword-AraSVD-2.2.ebuild b/app-dicts/sword-AraSVD/sword-AraSVD-2.2.ebuild
deleted file mode 100644
index a196bef7aa14..000000000000
--- a/app-dicts/sword-AraSVD/sword-AraSVD-2.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ArmEastern/Manifest b/app-dicts/sword-ArmEastern/Manifest
deleted file mode 100644
index 987962434e8d..000000000000
--- a/app-dicts/sword-ArmEastern/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ArmEastern-1.1.zip 334965 BLAKE2B b193bfa9f3f3472f1fd390c3aba61f7299d5d1dcc1a70eb5f88b4eae3bff68adca7302cfb1834c6fb8b95086e38651faa512f085201ad56f486e2cc71738ab4a SHA512 fb481aae1c58e5a4327afdac3f8134678f4e55488dfafa2976d2f77960c742bc371d86575a3d14ce703dae65523392d854baf1c48f186b8dad22e4e6088db860
diff --git a/app-dicts/sword-ArmEastern/metadata.xml b/app-dicts/sword-ArmEastern/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ArmEastern/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ArmEastern/sword-ArmEastern-1.1-r1.ebuild b/app-dicts/sword-ArmEastern/sword-ArmEastern-1.1-r1.ebuild
deleted file mode 100644
index 120d74906129..000000000000
--- a/app-dicts/sword-ArmEastern/sword-ArmEastern-1.1-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Eastern Armenian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ArmWestern/Manifest b/app-dicts/sword-ArmWestern/Manifest
deleted file mode 100644
index ec0e1c5ce78a..000000000000
--- a/app-dicts/sword-ArmWestern/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ArmWestern-1.1.zip 428727 BLAKE2B c10066c0da1692b2b009f3b2e28c2445cbc949edb8c8c46c732a916118e5373f4070ec042b9c6db3911db2856d4b431fb15893dfc22fdc565d3a6c08259b984a SHA512 85fc4ba42c10da39103096afde9226ea206e52e69510ef3643acf54721233724c04e8185e32bd9663f62a33c8f1b70dc2a6d123f63f0679604aa58122db1fe46
diff --git a/app-dicts/sword-ArmWestern/metadata.xml b/app-dicts/sword-ArmWestern/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ArmWestern/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ArmWestern/sword-ArmWestern-1.1.ebuild b/app-dicts/sword-ArmWestern/sword-ArmWestern-1.1.ebuild
deleted file mode 100644
index 13af5478ea31..000000000000
--- a/app-dicts/sword-ArmWestern/sword-ArmWestern-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="ArmWestern"
-
-inherit sword-module
-
-DESCRIPTION="1853 Western Armenian NT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Azeri/Manifest b/app-dicts/sword-Azeri/Manifest
deleted file mode 100644
index b11fd5ecb64a..000000000000
--- a/app-dicts/sword-Azeri/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Azeri-2.5.1.zip 2131751 BLAKE2B d453f5cef2f68749d32dd82c6adfcb9705d8c31c207e9f96b2a4df4696cf18334e07cd9599a81ee7fe1db79ef5197d0c3339f38de696f2460e1fddfffb345f30 SHA512 6fb0f2a01490dd424348aa964520f37af53541fb9fc135d75563ca370d2dc7056f6e3384fccda4b13af247f8255aa69fd873afe1c2fc6983df1ebac5cb627151
diff --git a/app-dicts/sword-Azeri/metadata.xml b/app-dicts/sword-Azeri/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Azeri/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Azeri/sword-Azeri-2.5.1.ebuild b/app-dicts/sword-Azeri/sword-Azeri-2.5.1.ebuild
deleted file mode 100644
index f96618484dc0..000000000000
--- a/app-dicts/sword-Azeri/sword-Azeri-2.5.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Southern Azeri translation of the Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Azeri"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BBE/Manifest b/app-dicts/sword-BBE/Manifest
deleted file mode 100644
index 14a70cbd6616..000000000000
--- a/app-dicts/sword-BBE/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BBE-1.3.zip 1391875 BLAKE2B cb7eeffa00a47160fe929cfff000d942cd9062bd0bce26a928a9b7330ea2d18a3a3436c036b5b8f65f0a17eeb052e34ec10d5429b4f058aaf109c3b20a58ec19 SHA512 9df323ea99b5b116937c22e1ae5b2b863220c52a7d488096968d63dd8b937a99a60691462f5604f3d22133058ce5744bf227d35421501362791043f520f34b3b
diff --git a/app-dicts/sword-BBE/metadata.xml b/app-dicts/sword-BBE/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BBE/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BBE/sword-BBE-1.3.ebuild b/app-dicts/sword-BBE/sword-BBE-1.3.ebuild
deleted file mode 100644
index dc1e833946e4..000000000000
--- a/app-dicts/sword-BBE/sword-BBE-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="BBE"
-
-inherit sword-module
-
-DESCRIPTION="Bible in Basic English (1949/1964)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BDBGlosses_Strongs/Manifest b/app-dicts/sword-BDBGlosses_Strongs/Manifest
deleted file mode 100644
index 9d3ddaca4fd9..000000000000
--- a/app-dicts/sword-BDBGlosses_Strongs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BDBGlosses_Strongs-1.1.zip 488453 BLAKE2B 28ddc076343f212ca067e089b892a19886b859b6fba82815d3a756a43223b727e2edd522d2747f4510f6f3667fe6cc44f354c1f61a6ebf01355aaff161c712f9 SHA512 100608d12be5104e0fb4a092d94d69b9e6bf22c68b4554770d6341131428dc0e7a0bab2ff2746344daa6b658a66a392ebaa06a944d331f8c6c9020ba98937f3c
diff --git a/app-dicts/sword-BDBGlosses_Strongs/metadata.xml b/app-dicts/sword-BDBGlosses_Strongs/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BDBGlosses_Strongs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BDBGlosses_Strongs/sword-BDBGlosses_Strongs-1.1.ebuild b/app-dicts/sword-BDBGlosses_Strongs/sword-BDBGlosses_Strongs-1.1.ebuild
deleted file mode 100644
index b5c9b66bd814..000000000000
--- a/app-dicts/sword-BDBGlosses_Strongs/sword-BDBGlosses_Strongs-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="BDB Glosses keyed to Strong's numbers"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BDBGlosses_Strongs"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BWE/Manifest b/app-dicts/sword-BWE/Manifest
deleted file mode 100644
index 1ebc52ac0efb..000000000000
--- a/app-dicts/sword-BWE/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BWE-1.0.zip 368084 BLAKE2B 1c76b69f69f9a56585ba44b861d0ecaa3cabca041ef2ffe0fe9a6eb1f088dff3c995e2da6a0955640c349d5a068abee08f2468cbab0bd84b6bf23851e7a2ddae SHA512 7da5f8d91aa944d779e42c838120a2e8fc1087d1c284bd1ef74c53fe420a754544e8636f485561d27658da3998fa6ed319b679184bd10f9924fed9063ace54fd
diff --git a/app-dicts/sword-BWE/metadata.xml b/app-dicts/sword-BWE/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BWE/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BWE/sword-BWE-1.0.ebuild b/app-dicts/sword-BWE/sword-BWE-1.0.ebuild
deleted file mode 100644
index 60f5becac0be..000000000000
--- a/app-dicts/sword-BWE/sword-BWE-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Bible in Worldwide English"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BWE"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BaptistConfession1646/Manifest b/app-dicts/sword-BaptistConfession1646/Manifest
deleted file mode 100644
index e39dd1daf077..000000000000
--- a/app-dicts/sword-BaptistConfession1646/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BaptistConfession1646-1.1.zip 27847 BLAKE2B 4cd9adbea0ad775a2700df553d758558f430873b081aca29dce1747896a0b43bcf2b787e0b2a6d8ef4b4c2ebce13ef481e8856806b7411919d0e380160b3525b SHA512 c3dac4159fb358d0ed003088b7833d9ec18a922d2444270259d9b16c0e90535b967695958fea222e07b2c7630da1b024f311f42722aecfaa89b72918b9ccf032
diff --git a/app-dicts/sword-BaptistConfession1646/metadata.xml b/app-dicts/sword-BaptistConfession1646/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BaptistConfession1646/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BaptistConfession1646/sword-BaptistConfession1646-1.1.ebuild b/app-dicts/sword-BaptistConfession1646/sword-BaptistConfession1646-1.1.ebuild
deleted file mode 100644
index c87103422bc4..000000000000
--- a/app-dicts/sword-BaptistConfession1646/sword-BaptistConfession1646-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="First Baptist Confession of Faith, London 1646 Edition with an Addendum by B.Cox"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BaptistConfession1646"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BaptistConfession1689/Manifest b/app-dicts/sword-BaptistConfession1689/Manifest
deleted file mode 100644
index a4c0cbe13fdf..000000000000
--- a/app-dicts/sword-BaptistConfession1689/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BaptistConfession1689-1.0.2.zip 44250 BLAKE2B 6ac43e39167db983c480663e12eb1a4119351ff6e561a97883721575c74efeb1396842376c30faa7dae3d172fca657261d88742da4a4740d175c4db411913215 SHA512 2deb18f4d0d5faa43fcf701df55e925be49c54d0fb3481f0e451eacf5f1902343c4f9dc443649e2ac9bdced1987ec5214417667062220c1beb81469ccca1dea3
diff --git a/app-dicts/sword-BaptistConfession1689/metadata.xml b/app-dicts/sword-BaptistConfession1689/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BaptistConfession1689/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BaptistConfession1689/sword-BaptistConfession1689-1.0.2.ebuild b/app-dicts/sword-BaptistConfession1689/sword-BaptistConfession1689-1.0.2.ebuild
deleted file mode 100644
index 4eb46ddbb002..000000000000
--- a/app-dicts/sword-BaptistConfession1689/sword-BaptistConfession1689-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Baptist Confession of Faith of 1689"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BaptistConfession1689"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Barnes/Manifest b/app-dicts/sword-Barnes/Manifest
deleted file mode 100644
index 264afb44a208..000000000000
--- a/app-dicts/sword-Barnes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Barnes-1.1.zip 5812838 BLAKE2B d3fce355f092035d389552e3269c6de0ef90cd0a1f14d009c0291efdb1041f9826f086a4afa9e6ff40a7aac6246a30535e3ea74421516c68fda0351c08fc6606 SHA512 5b63b6bcfc8cbd2513cb79c0a77d61cad7f963184eeabc7d1beb9036aeae4c60d91c109e4632c1b54bd8acf84bbff8d5160d12ae29d618c2eb17b249d4d567d3
diff --git a/app-dicts/sword-Barnes/metadata.xml b/app-dicts/sword-Barnes/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Barnes/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Barnes/sword-Barnes-1.1.ebuild b/app-dicts/sword-Barnes/sword-Barnes-1.1.ebuild
deleted file mode 100644
index 8d83f2e13697..000000000000
--- a/app-dicts/sword-Barnes/sword-Barnes-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Barnes"
-
-inherit sword-module
-
-DESCRIPTION="Barnes' New Testament Notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BasHautin/Manifest b/app-dicts/sword-BasHautin/Manifest
deleted file mode 100644
index 34abec9fa15e..000000000000
--- a/app-dicts/sword-BasHautin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BasHautin-1.5.zip 426714 BLAKE2B 8248a2e8ed16f8eda784a590584bb1516bfcc4f24172b2cdf05a5464efd46f064cc5469dd01f5b879c39d9f534d190b82edc64f77c6204e402b0372057497cd0 SHA512 a0266465dfc0c945398075cea549fd17601ee8d38f4d319b035c6a8425e1222c4e6cca46ccc52d6769c368eb4aaa592cea4ba2b60279e2ebeb64c8f4b834e5ff
diff --git a/app-dicts/sword-BasHautin/metadata.xml b/app-dicts/sword-BasHautin/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BasHautin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BasHautin/sword-BasHautin-1.5.ebuild b/app-dicts/sword-BasHautin/sword-BasHautin-1.5.ebuild
deleted file mode 100644
index 0bb2e8f319ec..000000000000
--- a/app-dicts/sword-BasHautin/sword-BasHautin-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="BasHautin"
-
-inherit sword-module
-
-DESCRIPTION="1571 Navarro-Labourdin Basque NT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BeaMRK/Manifest b/app-dicts/sword-BeaMRK/Manifest
deleted file mode 100644
index 1b10509e7b2d..000000000000
--- a/app-dicts/sword-BeaMRK/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BeaMRK-1.0.1.zip 40436 BLAKE2B db878a5f6b9b0847faceb52ec026d28c564c51f5e1a7ee5c0609a234619c5620241fa8de03958a4d487fcf81cafa4c0e8dc0fd897e4921ed946b7b6cdf78bba1 SHA512 b4ec4dedb86bf7735a1700c812f95fb85f075d4d52105f162290af8f6584623df77e94717a4d769c48c71d12eb0a08add12116c1823dcded3d00e4c71b28884b
diff --git a/app-dicts/sword-BeaMRK/metadata.xml b/app-dicts/sword-BeaMRK/metadata.xml
deleted file mode 100644
index 42e006e0062d..000000000000
--- a/app-dicts/sword-BeaMRK/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		The Gospel of Mark in Beaver. Translated by A.C. Garrioch. Pub1ished 1886 in London by the  British and Foreign Bible Society. This text was transcribed by (http://dbs.org) The Digital Bible Society from a physical copy provided by (http://ualberta.ca) The University of Alberta
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-BeaMRK/sword-BeaMRK-1.0.1.ebuild b/app-dicts/sword-BeaMRK/sword-BeaMRK-1.0.1.ebuild
deleted file mode 100644
index cd689ae3e6e6..000000000000
--- a/app-dicts/sword-BeaMRK/sword-BeaMRK-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Gospel of Mark in Beaver (Danezaa)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BeaMRK"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Bela/Manifest b/app-dicts/sword-Bela/Manifest
deleted file mode 100644
index 09c381c6771d..000000000000
--- a/app-dicts/sword-Bela/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Bela-1.1.zip 1813005 BLAKE2B fd2c1bea03d20f53bc90b93c52698dc441a2d78becd8d7613f2593b51f3045068866831e3a58dc7b40043bcb35491201dd8d228996417c0556d6314743e2e975 SHA512 84989ce1677b2b4050ae0dc2af8c4ae1076e71c403b59595401319277af42ce963ef106bdd44f8e2a2a75af9efa203d4d7dfb901375ae4181182a73565adb1b2
diff --git a/app-dicts/sword-Bela/metadata.xml b/app-dicts/sword-Bela/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Bela/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Bela/sword-Bela-1.1.ebuild b/app-dicts/sword-Bela/sword-Bela-1.1.ebuild
deleted file mode 100644
index 28ed28348d9d..000000000000
--- a/app-dicts/sword-Bela/sword-Bela-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Belarusian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Bela"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BretonNT/Manifest b/app-dicts/sword-BretonNT/Manifest
deleted file mode 100644
index c81755a19add..000000000000
--- a/app-dicts/sword-BretonNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BretonNT-1.1.1.zip 392278 BLAKE2B 9a27b6a25f1e019ea7b7eb01fae038bd19a0dddd369c360690f583e3f4065eac6b028e0ae031738bedbe180d3908b04a3e9856e1a7c62e07b5521f5b5461888a SHA512 1d9c7b2a936ac9faef8003e272523780a810c0c98e59df0d912abc7114a320c903f8a21d7653a1af0b1775bb21d0e98ff4fe24ac05671594d69bda5e8caccd2a
diff --git a/app-dicts/sword-BretonNT/metadata.xml b/app-dicts/sword-BretonNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BretonNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BretonNT/sword-BretonNT-1.1.1.ebuild b/app-dicts/sword-BretonNT/sword-BretonNT-1.1.1.ebuild
deleted file mode 100644
index f414639271b3..000000000000
--- a/app-dicts/sword-BretonNT/sword-BretonNT-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Breton New Testament (Koad 21)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BretonNT"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BulCarigradNT/Manifest b/app-dicts/sword-BulCarigradNT/Manifest
deleted file mode 100644
index 38767c7d5127..000000000000
--- a/app-dicts/sword-BulCarigradNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BulCarigradNT-1.0.1.zip 456184 BLAKE2B 337fd96fca12907adbe67413f0352b18795d783b7a049411b963b29396d0fa81888d9b584bfcbc375a322ab170674a8c16910ba885d47e11faf857174cf4f7e7 SHA512 601e7953fbfa3e32edc64acdb3f9d4fd55e6b532a3ca8f8163ddf4eca50d97ffc9856c6715d9d632090af5832be353de1fa140cc29caf6976c45b48bebe6b915
diff --git a/app-dicts/sword-BulCarigradNT/metadata.xml b/app-dicts/sword-BulCarigradNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BulCarigradNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BulCarigradNT/sword-BulCarigradNT-1.0.1.ebuild b/app-dicts/sword-BulCarigradNT/sword-BulCarigradNT-1.0.1.ebuild
deleted file mode 100644
index 1b5cf86ec99a..000000000000
--- a/app-dicts/sword-BulCarigradNT/sword-BulCarigradNT-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.6"
-
-inherit sword-module
-
-DESCRIPTION="Bulgarian New Testament from 1914, known as 'Tsarigrad Edition'"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BulCarigradNT"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BulVeren/Manifest b/app-dicts/sword-BulVeren/Manifest
deleted file mode 100644
index 333e41311ed6..000000000000
--- a/app-dicts/sword-BulVeren/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BulVeren-1.1.zip 2531174 BLAKE2B 460759b723824fc9fc9afca62b6dd951c66a331fb95488f22eb20415ac01fbb411b61d19c7c4f3da020fb9876d5903a26e074d0f21d570150b3633f647dd3724 SHA512 938ca679ab272beedda93e0cf103a341e8367f3669f7c9a080bb646406ef1a71ad7b09967adfea6ad501a6a5420147ad8961506ff53621debd9ad4a680948c72
diff --git a/app-dicts/sword-BulVeren/metadata.xml b/app-dicts/sword-BulVeren/metadata.xml
deleted file mode 100644
index d63d8ec44c49..000000000000
--- a/app-dicts/sword-BulVeren/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This is an updated version of the Bible, published by Konstantin Fotinov,
-		Petko Slaveykov and Hristodul Sichan-Nikolov in 1871. This version is made
-		by Veren LTD. All texts are collated with the originals.
-
-		This module is part of the CDL Project. CDL Project aims to create an
-		electronic library Bulgarian of biblical texts, commentaries and researches.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-BulVeren/sword-BulVeren-1.1.ebuild b/app-dicts/sword-BulVeren/sword-BulVeren-1.1.ebuild
deleted file mode 100644
index 6040d3aba317..000000000000
--- a/app-dicts/sword-BulVeren/sword-BulVeren-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Veren's Contemporary Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BurCBCM/Manifest b/app-dicts/sword-BurCBCM/Manifest
deleted file mode 100644
index d8b350a44ac2..000000000000
--- a/app-dicts/sword-BurCBCM/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BurCBCM-1.2.zip 952623 BLAKE2B 954c0c7df1da86ee33976499306dd5d5a7bf982cf8d144af668764674b44ee9437ce8622897744f938b2a1fb758dda324448b2167d8dacddb8543022b8e592a2 SHA512 4018ce0ac935b33b1ae0e0b26ee456f749090bd8342a70e54c82b72da28caf061ee4d6493abe7f5df61d96d905660d539eebe612b3b5b3a9c1a6d4dc4a02127d
diff --git a/app-dicts/sword-BurCBCM/metadata.xml b/app-dicts/sword-BurCBCM/metadata.xml
deleted file mode 100644
index 6b80729226f7..000000000000
--- a/app-dicts/sword-BurCBCM/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Modern Burmese New Testament, Psalms and Proverbs Catholic Translation. This
-		translation of the Bible is provides by the Episcopal Commission for Biblical
-		Apostolate of the Catholic Bishops' Conference of Myanmar.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-BurCBCM/sword-BurCBCM-1.2.ebuild b/app-dicts/sword-BurCBCM/sword-BurCBCM-1.2.ebuild
deleted file mode 100644
index 245c0bd61fb6..000000000000
--- a/app-dicts/sword-BurCBCM/sword-BurCBCM-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Catholic Myanmar Bible (CBCM)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BurCBCM"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-BurJudson/Manifest b/app-dicts/sword-BurJudson/Manifest
deleted file mode 100644
index a97e315f9495..000000000000
--- a/app-dicts/sword-BurJudson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BurJudson-1.3.zip 2099482 BLAKE2B b1b59e27d9aefeca43744d3366cc4b128f02dcff5ee0e9fbb0befd4214ec018fbb90dad44de46b385c5f8d29419ba44b54d5dee89d1e0796a2979b61841321b4 SHA512 d244591cf0a7633d5cfa27bdbb54478d5ec4cb156ba68b3d59aabaad43e7ed96f050127750a9150edc4727862cbefa24cbfc0ce37785166eef81a705ccf0efd3
diff --git a/app-dicts/sword-BurJudson/metadata.xml b/app-dicts/sword-BurJudson/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-BurJudson/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-BurJudson/sword-BurJudson-1.3.ebuild b/app-dicts/sword-BurJudson/sword-BurJudson-1.3.ebuild
deleted file mode 100644
index f0fdccc8cbfd..000000000000
--- a/app-dicts/sword-BurJudson/sword-BurJudson-1.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1835 Judson Burmese Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-RDEPEND="media-fonts/sil-padauk"
diff --git a/app-dicts/sword-Burkitt/Manifest b/app-dicts/sword-Burkitt/Manifest
deleted file mode 100644
index e4db21639a61..000000000000
--- a/app-dicts/sword-Burkitt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Burkitt-1.0.zip 2693444 BLAKE2B 5fb3ba9b9c54a0ff992cc041662874a5899854fad1ca69742936a91ce2641c6193e8a4bc36e90dc39c9c31150bb4d66b3fcc55a53ec8ff2969d73f326962b40d SHA512 b4c1fc179b5d1e521b907684131d22b90b4d298497c21bf3b2ca6c4e6ba78a773072d64f0162d9c41deef83f8ae0a5c4ce70509466bb0e6dccff6182cc86d447
diff --git a/app-dicts/sword-Burkitt/metadata.xml b/app-dicts/sword-Burkitt/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Burkitt/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Burkitt/sword-Burkitt-1.0.ebuild b/app-dicts/sword-Burkitt/sword-Burkitt-1.0.ebuild
deleted file mode 100644
index 2b00d16c4c09..000000000000
--- a/app-dicts/sword-Burkitt/sword-Burkitt-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Burkitt's Expository Notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Burkitt"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Byz/Manifest b/app-dicts/sword-Byz/Manifest
deleted file mode 100644
index a38e459771df..000000000000
--- a/app-dicts/sword-Byz/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Byz-3.0.zip 967824 BLAKE2B 7aa27263a21c42ce618f075e706929741d8c587800b854418a051ad124b8fae66b9a3e9aaf22a775bf20c83348bf0fd6c11b88fc3f6f7eaf46e92486dcb22734 SHA512 3c561b3a38d64ebcd8cd1b5252b8e0c414d0f5cf565905169ac81d0621599a7c7019e25a70c83012c08d0a10d7801790365ca0ba745242509bb20d70b6bb39d1
diff --git a/app-dicts/sword-Byz/metadata.xml b/app-dicts/sword-Byz/metadata.xml
deleted file mode 100644
index 388068726171..000000000000
--- a/app-dicts/sword-Byz/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		The New Testament in the Original Greek: Byzantine Textform 2005, edited
-		by Maurice A. Robinson and William G. Pierpont. This is the edition by Pierpont
-		and Robinson of a Majority, or Byzantine, text of the NT. It is similar to an
-		earlier production of Hodges and Farstad in being based on von Soden's
-		apparatus, but without their stemmatic reconstruction of the Apocalypse and
-		the Pericope Adulterae.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Byz/sword-Byz-3.0.ebuild b/app-dicts/sword-Byz/sword-Byz-3.0.ebuild
deleted file mode 100644
index 8d32cc49ebe5..000000000000
--- a/app-dicts/sword-Byz/sword-Byz-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The New Testament in Original Greek: Byzantine Textform 2005"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz"
-LICENSE="CC-BY-NC-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CBC/Manifest b/app-dicts/sword-CBC/Manifest
deleted file mode 100644
index 7beb537d354b..000000000000
--- a/app-dicts/sword-CBC/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CBC-1.1.zip 133815 BLAKE2B 8c281751fdc2c4d82713c0e03c7c24127f81f378802b3c01ed4d715b6b180d4053cf1e8710c405012d2b4d2ac5044dd4fed1fd6834e99483b5748decd2fde512 SHA512 3990ca230a0d700e24b2639ab7fa4c97ccc6a382eb810f48c8c6334424384ae91bf97a299c00ba041db8daa82f5481c89cb425d34d84dd4fb298dc29e3f50b78
diff --git a/app-dicts/sword-CBC/metadata.xml b/app-dicts/sword-CBC/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CBC/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CBC/sword-CBC-1.1.ebuild b/app-dicts/sword-CBC/sword-CBC-1.1.ebuild
deleted file mode 100644
index 4af39fc4eab1..000000000000
--- a/app-dicts/sword-CBC/sword-CBC-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="CBC"
-
-inherit sword-module
-
-DESCRIPTION="Condensed Biblical Cyclopedia"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CPDV/Manifest b/app-dicts/sword-CPDV/Manifest
deleted file mode 100644
index c62cf8f5a50c..000000000000
--- a/app-dicts/sword-CPDV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CPDV-2.1.1.zip 2538062 BLAKE2B 0c13790d5f95f86ae98b756dd54eaa71dd88efb4224ae6a9ecdf9c18c44e43361dd93878f56f4a418fea950e4e273b1b53df736727b136d76b753b608c1a8eca SHA512 6491edccfb5d6ecc4b03151794f616add8aa18fc2a59fc6858bea93413df818bfd801de6df48c5b47370240500a099248b0060b8e5e930209d199ed674cceb5f
diff --git a/app-dicts/sword-CPDV/metadata.xml b/app-dicts/sword-CPDV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CPDV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CPDV/sword-CPDV-2.1.1.ebuild b/app-dicts/sword-CPDV/sword-CPDV-2.1.1.ebuild
deleted file mode 100644
index 49bf53fc227a..000000000000
--- a/app-dicts/sword-CPDV/sword-CPDV-2.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Catholic Public Domain Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CPDV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CSlElizabeth/Manifest b/app-dicts/sword-CSlElizabeth/Manifest
deleted file mode 100644
index 13584c84e85f..000000000000
--- a/app-dicts/sword-CSlElizabeth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CSlElizabeth-1.5.1.zip 1894182 BLAKE2B 735eca2bbe488d044b4f2ababce2bd92c4b9bb245ee32d8ce9b1b18ecc7f60f52a03dc889aca6e72b3ac825fb3bc53fa35b3380cbf0180ebb651d05e6055cf1d SHA512 edee5360340716b37cdbfebf08d7f4f746acd53374cc880aa696ee550237bb1f0ca72d9bdcff2c76aa3e205018b5d86e8d95495069f2dff5671bcb29a63fb623
diff --git a/app-dicts/sword-CSlElizabeth/metadata.xml b/app-dicts/sword-CSlElizabeth/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CSlElizabeth/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CSlElizabeth/sword-CSlElizabeth-1.5.1.ebuild b/app-dicts/sword-CSlElizabeth/sword-CSlElizabeth-1.5.1.ebuild
deleted file mode 100644
index 68458ed83af6..000000000000
--- a/app-dicts/sword-CSlElizabeth/sword-CSlElizabeth-1.5.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="1757 Church Slavonic Elizabeth Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CSlElizabeth"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Calo/Manifest b/app-dicts/sword-Calo/Manifest
deleted file mode 100644
index a2043958817a..000000000000
--- a/app-dicts/sword-Calo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Calo-1.0.zip 52819 BLAKE2B 8da61e76b7a43cbb1994a86a5b54929b2ce44719eb22fc8511d5df535ba6d2a61447bb8951673bf3e502f5f895112931b3a1fa4cedc58f30e789c781f678a1d1 SHA512 7886ead03baa809786292870d6f5b10336b82fdc8f39e42ee901c4b5a041f6b6b6c093442a90b29f571e552123bf3453fa46cf903e8ccab4f4d54daa60086901
diff --git a/app-dicts/sword-Calo/metadata.xml b/app-dicts/sword-Calo/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Calo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Calo/sword-Calo-1.0.ebuild b/app-dicts/sword-Calo/sword-Calo-1.0.ebuild
deleted file mode 100644
index 9073c63980d2..000000000000
--- a/app-dicts/sword-Calo/sword-Calo-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Gospel of Luke in the Caló language"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Calo"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Catena/Manifest b/app-dicts/sword-Catena/Manifest
deleted file mode 100644
index b154e411373b..000000000000
--- a/app-dicts/sword-Catena/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Catena-1.0.zip 2272355 BLAKE2B e1873314623c8fd122cdb20667c2afdc7ce6e07c9e5b9cf6e61290d53a2307a7b78b7abf6f6e91ad8d58c17ef9868a776f1ac045054df0ce738348f19d1b9f33 SHA512 b84ef7d2b3376d5ee631f52a43e263fea8032ec50f0a3cb5f254273bea0ca7f0d1ad6e746a96d2bd219936c570773f3295ce6d7461eeb2875db3b5854bab7e6e
diff --git a/app-dicts/sword-Catena/metadata.xml b/app-dicts/sword-Catena/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Catena/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Catena/sword-Catena-1.0.ebuild b/app-dicts/sword-Catena/sword-Catena-1.0.ebuild
deleted file mode 100644
index c7cdd1fa14f1..000000000000
--- a/app-dicts/sword-Catena/sword-Catena-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Catena Aurea (Thomas Aquinas)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Catena"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Cawdrey/Manifest b/app-dicts/sword-Cawdrey/Manifest
deleted file mode 100644
index 04c483c98cfb..000000000000
--- a/app-dicts/sword-Cawdrey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Cawdrey-1.0.zip 110761 BLAKE2B b044e697a98fe97265fa1ee3d3482fb35a2fb37a27e2488c57dbb8f12431dd994be419e46688a76d50ee2a9ba44ff7cb72859e5a7c89854c245e08bb1343a600 SHA512 14062a77b09eedefebb135a493d03f0736e0c33b9498d90102f491f3bc83992ae5e630ac97d7e321bf17c6bde841248235862f0c45f336933882e7da81b15059
diff --git a/app-dicts/sword-Cawdrey/metadata.xml b/app-dicts/sword-Cawdrey/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Cawdrey/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Cawdrey/sword-Cawdrey-1.0.ebuild b/app-dicts/sword-Cawdrey/sword-Cawdrey-1.0.ebuild
deleted file mode 100644
index c1b7b4480a5c..000000000000
--- a/app-dicts/sword-Cawdrey/sword-Cawdrey-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="A Table Alphabeticall by Robert Cawdrey (1604)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Cawdrey"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CebPinadayag/Manifest b/app-dicts/sword-CebPinadayag/Manifest
deleted file mode 100644
index c326738a118c..000000000000
--- a/app-dicts/sword-CebPinadayag/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CebPinadayag-1.0.1.zip 1586637 BLAKE2B 27de2390b09df1013c171bcedb5844616a1e98a22ec848f481aad23d8f967c109cf73691f602596b3858c2a6f1157a6223e3b7a3bcc161f08fc8557899d6ef6c SHA512 223eed98fcf6d5096575f62ca332e8c6c7d29b029b194cf6cdfcd4341f910350fa5f40c278fcb1ebb9ae48c95fbb2f8f169201260955a936643184048f26f781
diff --git a/app-dicts/sword-CebPinadayag/metadata.xml b/app-dicts/sword-CebPinadayag/metadata.xml
deleted file mode 100644
index e5c79022f4b5..000000000000
--- a/app-dicts/sword-CebPinadayag/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription>
-		Cebuano is the second most widely spoken native language of the Philippines. The complete Cebuano Bible was first published in 1917. This Bible is published today as the Ang Biblia, Cebuano by the Philippine Bible Society. Two separate versions are available: The 'Bugna' version contains the original New Testament from 1917. The 'Pinadayag' version contains a completely revised New Testament which follows a Critical Greek Text. Both versions share the same Old Testament text. The 'Pinadayag' designation is derived from the Cebuano name given to the book of Revelation.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CebPinadayag/sword-CebPinadayag-1.0.1.ebuild b/app-dicts/sword-CebPinadayag/sword-CebPinadayag-1.0.1.ebuild
deleted file mode 100644
index f647109478ab..000000000000
--- a/app-dicts/sword-CebPinadayag/sword-CebPinadayag-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Cebuano Pinadayag"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CebPinadayag"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Chamorro/Manifest b/app-dicts/sword-Chamorro/Manifest
deleted file mode 100644
index 51fb3b473f99..000000000000
--- a/app-dicts/sword-Chamorro/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Chamorro-2.7.2.zip 288021 BLAKE2B f9760b851caecb7bf5c0031e2326cbd17cb4d877e10bc8d8c7a14c9140f3a5c459ef3b590f83d2b7dae1784cb18e04c0dee5cc2da2fe1883a8d18a1c286e48a9 SHA512 0878458c87d250feece63f65bb930bc3d8b393fe1e431a316ccf085c47553512a1b040012d93b62d6d432c128656dd24781b6f19ac25fee33134a5b13705210a
diff --git a/app-dicts/sword-Chamorro/metadata.xml b/app-dicts/sword-Chamorro/metadata.xml
deleted file mode 100644
index 76fab11c6b43..000000000000
--- a/app-dicts/sword-Chamorro/metadata.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Chamorro: Y Santa Biblia: Y Cuatro Ebangelio Sija Yan Y Checho Y Apostoles Sija
-		Gui Testamento Nuebo Y Señotta Yan Y Satbadotta Si Jesucristo Yan Y Salmo Sija
-		(1908). The Chamorro language is the native and an official language of the US
-		Territory of Guam and the Commonwealth of the Northern Mariana Islands (in
-		political union with the United States of America).
-
-		Formally titled Chamorro and English Scriptures: Y Cuatro Ebangelio Sija Yan
-		Y Checho Y Apostoles Sija Gui Testamento Nuebo Y Señotta Yan Y Satbadotta Si
-		Jesucristo Yan Y Salmo Sija, the 1908 Chamorro Bible is composed of six books
-		in diglot format (Chamorro on the left page and English on the right page): San
-		Mateo, San Marcos, San Lucas, San Juan, Y Checho Y Apostoles Sija, and Y Salmo
-		Sija (Saint Matthew, Saint Mark, Saint Luke, Saint John, The Acts of the
-		Apostles, and The Psalms). In 1908, about 1000 copies were printed by the
-		American Bible Society. Outside of libraries, very few are known to exist (as
-		of this writing, one).
-
-		San Mateo, San Marcos, San Lucas, San Juan, Y Checho Y Apostoles Sija, and
-		Y Salmo Sija were translated in the early 1900's by Francis Marion Price,
-		missionary of the American Board of Commissioners for Foreign Missions (ABCFM),
-		assisted by five currently unidentified Chamorros in Guam. According to
-		Chamorro Scriptures for the Island of Guam (Bible Society Record, July 1908,
-		Volume 53, Number 7, American Bible Society, New York, New York, USA), the
-		"translations were made from the Westcott-Hort Greek Testament". Francis
-		Marion Price and his wife Sarah Jane Price (maiden name, Freeborn) were Guam's
-		first Protestant missionaries. Prior to their Guam assignment they worked in
-		China and Truk (Chuuk), Caroline Islands.
-
-		The 1908 Chamorro Bible is an important part of Chamorro history. Its
-		background, surprising discovery, and reemergence are documented at
-		http://ChamorroBible.org, the official home for the 2001-2002 Chamorro Bible
-		Project. On January 28th, 2004, the Chamorro Bible was officially and publicly
-		honored by I Mina'Bente Siete Na Liheslaturan Guåhan - The 27th Guam
-		Legislature (http://ChamorroBible.org/chamorrobibleproject/the-27th-guam-legislature)
-		with the presentation of three full legislative session (LS) resolutions:
-		Resolution No. 87(LS), Resolution No. 88(LS), and Resolution No. 89(LS). They
-		also acknowledge the translation team and others more recently involved with
-		the 1908 Chamorro Bible. You can read the text of each resolution at
-		http://ChamorroBible.org. The Internet site http://RleneLive.com is another
-		important source of Chamorro Bible research documented in articles,
-		photographs, and audio.
-
-		As part of the CrossWire Bible Society's SWORD distribution, the Chamorro
-		Bible is again making history: It is the first time these Scriptures are part
-		of a Bible study software package. The layout of each chapter or Psalm is
-		similar to the PDF, RTF, and HTML formats, including, retaining the paragraph
-		marks (¶) and the "Red Letter" markup (the words of Jesus Christ, Jesuscristo
-		in Chamorro, are colored red). ChamorroBible.org holds the latest and official
-		electronic texts, as well as the historic audio recordings of the 1908 Chamorro
-		Bible.
-
-		Jesuscristo says, "Aligao y tinigue sija sa y jinasonmiyo iya güiya nae inguaja
-		y linâlâ na taejinecog; ya sija todo ufanmannae testimonio nu guajo", "Todo
-		y ninasiña manaeyo, gui langet yan y tano. Fanjanao, ya fannaquilisyano todo
-		y nasion sija, tagpange sija pot y naan y Tata, yan y Lajiña, yan y Espiritu
-		Santo: Fanagüe sija, na ujaadaje todosija ni jutago jamyo; sa estagüe
-		jugagaegueja guiya jamyo todo y jaane, asta y jinecog y tano. Amen."
-		Juan 5:39; Mateo 28:1 8-20.
-
-		Editor, ChamorroBible.org Thursday, February 19, 2004 ChST (Chamorro Standard Time)
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Chamorro/sword-Chamorro-2.7.2.ebuild b/app-dicts/sword-Chamorro/sword-Chamorro-2.7.2.ebuild
deleted file mode 100644
index eb905eb37a7c..000000000000
--- a/app-dicts/sword-Chamorro/sword-Chamorro-2.7.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Chamorro: Y Santa Biblia (1908)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Che1860/Manifest b/app-dicts/sword-Che1860/Manifest
deleted file mode 100644
index 6fb158fb1c30..000000000000
--- a/app-dicts/sword-Che1860/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Che1860-2.0.zip 848919 BLAKE2B 7304045fc5ef6bd0161d82e54bfa9ba41d85acbeb45d7218f2c8a6408d83e1cbe03cfa9e23094c608891ded097ef5ec9e57c278b985e67aea0df2b2c58710201 SHA512 d74782a723ea36986d5d9cc629fffe8272655db6a15fc878a833477b94280a431b11e0cb83fbb20a22ad2689419943fa9d4fb9aff1fa84a473462483af1ba68a
diff --git a/app-dicts/sword-Che1860/metadata.xml b/app-dicts/sword-Che1860/metadata.xml
deleted file mode 100644
index 01f80a96f993..000000000000
--- a/app-dicts/sword-Che1860/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Cherokee New Testament, published in 1860 by the American Bible Society. This electronic edition is still undergoing proofreading and was produced by www.cherokeenewtestament.org. This module is based on the May 13, 2009 version. The text is also available in facsimile at http://books.google.com/books?id=v0MTAAAAYAAJ .
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Che1860/sword-Che1860-2.0.ebuild b/app-dicts/sword-Che1860/sword-Che1860-2.0.ebuild
deleted file mode 100644
index 15b931c60159..000000000000
--- a/app-dicts/sword-Che1860/sword-Che1860-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Cherokee New Testament (1860) with Sequoyah transliterated forms"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Che1860"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ChiNCVs/Manifest b/app-dicts/sword-ChiNCVs/Manifest
deleted file mode 100644
index b09a5e207979..000000000000
--- a/app-dicts/sword-ChiNCVs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ChiNCVs-1.1.zip 1651581 BLAKE2B f4b2b7bc008d0125cdcfed65f6faa0f6a935d1e0f9482159754300ee3efb42deeedcb1550e7233197d7e12f0616c880e0a4daa77a36f622d00b46a0e3d95891e SHA512 c7941e322d7059b1b341455cd0c34a9023e74abca86daca728364e5b569c36301f2f43cbab4dd956e299245391e17e82170e0d4bda5628f14c7515ffa592ca2b
diff --git a/app-dicts/sword-ChiNCVs/metadata.xml b/app-dicts/sword-ChiNCVs/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ChiNCVs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ChiNCVs/sword-ChiNCVs-1.1.ebuild b/app-dicts/sword-ChiNCVs/sword-ChiNCVs-1.1.ebuild
deleted file mode 100644
index b0b0ffd4515e..000000000000
--- a/app-dicts/sword-ChiNCVs/sword-ChiNCVs-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="New Chinese Version of the Bible, simplified script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVs"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ChiNCVt/Manifest b/app-dicts/sword-ChiNCVt/Manifest
deleted file mode 100644
index ba18784ba57a..000000000000
--- a/app-dicts/sword-ChiNCVt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ChiNCVt-1.1.zip 1657319 BLAKE2B 9b6a99a9ebf14e64440a169110b04c2a275526546fde41b9e6e113a4af1adbf8aac5870c6f8d7dad5c204dd5f091e2b94ca886ac9649346657f6f216a6993e9f SHA512 6a4594e112bd7673522a9715f6b0a1167769a028ca7549c946970944bb9a561244ce7b99d3d169baeada4c73279877343190336a113ed27c97ddbc1884a48b73
diff --git a/app-dicts/sword-ChiNCVt/metadata.xml b/app-dicts/sword-ChiNCVt/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ChiNCVt/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ChiNCVt/sword-ChiNCVt-1.1.ebuild b/app-dicts/sword-ChiNCVt/sword-ChiNCVt-1.1.ebuild
deleted file mode 100644
index 7c23fced9410..000000000000
--- a/app-dicts/sword-ChiNCVt/sword-ChiNCVt-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="New Chinese Version of the Bible, traditional script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVt"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ChiSB/Manifest b/app-dicts/sword-ChiSB/Manifest
deleted file mode 100644
index 88d0298a335e..000000000000
--- a/app-dicts/sword-ChiSB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ChiSB-1.0.zip 1833918 BLAKE2B 51aa1d4b44746e84484b68a3c25b55586a553ece6164edd96d6ec14f30e657adf791fe8eef8e93247c8b5a4634f7b3682476340a7c7aa4b702a90083b6d52502 SHA512 fd29b24ae12ba15837a0cf80f5bd37c37cd25467fa02fb715ed40090207d3cf1341be79516da2ad02cb7610ae8d08d8f995ceaa072d2cbb14423528dac6adb2f
diff --git a/app-dicts/sword-ChiSB/metadata.xml b/app-dicts/sword-ChiSB/metadata.xml
deleted file mode 100644
index 623c09ad8d24..000000000000
--- a/app-dicts/sword-ChiSB/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="en">
-		The Studium Biblicum Version (Sigao Ben) is the predominant Chinese language translation of the Bible used by Chinese Catholics. It is considered by many to be _the_ Chinese Catholic Bible.
-
-		The Studium Biblicum Version was translated by the Studium Biblicum Franciscanum in Hong Kong (a bible society not affiliated with the United Bible Societies),
-	</longdescription>
-	<longdescription lang="zh-Hant">
-		思高漢譯聖經的編纂 這部聖經的翻譯編纂，為義大利方濟會士雷永明司鐸（Fr. Giovanni S. Allegra, 1907-1976）實屬功臣。他於1931年來華，獲悉中國教會僅有聖經節譯本，立志將「天主的聖言」全部譯為漢文。1935年任小修院院長，每日3小時從希伯來文和亞拉美文聖經譯為中文。1944年譯妥「聖經初稿」，成立聖經學會，邀集方濟會數位精英神職，重譯舊約，期望編纂出一部高水準的聖經。1948年聖經學會遷到香港繼續翻譯工作。 1954年聖經學會完成「舊約」翻譯，1956-1960年再從事「新約」翻譯。
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ChiSB/sword-ChiSB-1.0.ebuild b/app-dicts/sword-ChiSB/sword-ChiSB-1.0.ebuild
deleted file mode 100644
index 84f39e65afd7..000000000000
--- a/app-dicts/sword-ChiSB/sword-ChiSB-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="The Studium Biblicum Version in traditional Chinese"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiSB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ChiUn/Manifest b/app-dicts/sword-ChiUn/Manifest
deleted file mode 100644
index 9213b929aa76..000000000000
--- a/app-dicts/sword-ChiUn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ChiUn-3.0.zip 3041500 BLAKE2B 8f16c8046f8e8d22aa315904b15e52f090a4e23d3c0ad9083131a17d3040989d95c1727d6dc2833e7605c5a24edbb3fe1786944784fcf226ce35d7108558cd46 SHA512 eb0ebb77e462532bdf450a0e9fb26a1a5744dbbcc6505b3c196283944870f27bcb8acf3b14c80567f3e23c905ec0600dd749ff55863ca5e56fa490f1cd623bb8
diff --git a/app-dicts/sword-ChiUn/metadata.xml b/app-dicts/sword-ChiUn/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ChiUn/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ChiUn/sword-ChiUn-3.0.ebuild b/app-dicts/sword-ChiUn/sword-ChiUn-3.0.ebuild
deleted file mode 100644
index b06382474627..000000000000
--- a/app-dicts/sword-ChiUn/sword-ChiUn-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Chinese Union Version of the Bible, traditional script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUn"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ChiUnL/Manifest b/app-dicts/sword-ChiUnL/Manifest
deleted file mode 100644
index 3ace535a73c3..000000000000
--- a/app-dicts/sword-ChiUnL/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ChiUnL-1.0.zip 1076943 BLAKE2B f98ac1ac5851416629c75a8c7d30ff1f0abfc909b8d17416ee4710973ef3e57fe5d5afe3d8202687b0ee928c2d69f799eb70a1a59e15f13e96b539cc17355a8f SHA512 fae13e795248d2de91253db9bb2eca5e961d5f781188ba2e1bc0d55aab354de66a48355f5d1f5021379ec6a7353db326fe688f241a4b2b8b10867beaf62ef2d8
diff --git a/app-dicts/sword-ChiUnL/metadata.xml b/app-dicts/sword-ChiUnL/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ChiUnL/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ChiUnL/sword-ChiUnL-1.0.ebuild b/app-dicts/sword-ChiUnL/sword-ChiUnL-1.0.ebuild
deleted file mode 100644
index b1f76ecf3e55..000000000000
--- a/app-dicts/sword-ChiUnL/sword-ChiUnL-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Chinese Union Version of the Bible, classical (literary) script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUnL"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ChiUns/Manifest b/app-dicts/sword-ChiUns/Manifest
deleted file mode 100644
index f601a89fe42f..000000000000
--- a/app-dicts/sword-ChiUns/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ChiUns-3.0.zip 3045548 BLAKE2B 1643f7aac737fd5727d4a3244d605819cab7042b8f8b1eb556bd366b272de909a0b9d6273daff17d976ae4afef6f20456d257bc2f6cfa7808ab9177576c0656f SHA512 1184d9da002d345cc5b0275f948001bf4e03af31afb326a0b661db80d52bfc154c0ec4392e8844f9a1788adf9ee4c24d7327f6747d3aa7631bfdd54ec00403f3
diff --git a/app-dicts/sword-ChiUns/metadata.xml b/app-dicts/sword-ChiUns/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ChiUns/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ChiUns/sword-ChiUns-3.0.ebuild b/app-dicts/sword-ChiUns/sword-ChiUns-3.0.ebuild
deleted file mode 100644
index ed6b5866804f..000000000000
--- a/app-dicts/sword-ChiUns/sword-ChiUns-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Chinese Union Version of the Bible, simplified script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUns"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Clarke/Manifest b/app-dicts/sword-Clarke/Manifest
deleted file mode 100644
index 0a682c2225a3..000000000000
--- a/app-dicts/sword-Clarke/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Clarke-2.0.zip 8627265 BLAKE2B 9cb78adec813ce24ece7ff84be3092d2ccb0975305336f9dbccc597b08e31e8775a020223fa3aa92c56ba6df1d00f6ef706e143fa1c45a7fb0ec024c0c69d1e6 SHA512 60b64e8fd3cb071d0e8981dde5c5f1dad8923e9d50962bbc6fbc6ad4284e71b6a54283b38505e6862b5b74efa269d08d8f7f2d2b50e5e7070caaaf3b71492832
diff --git a/app-dicts/sword-Clarke/metadata.xml b/app-dicts/sword-Clarke/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Clarke/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Clarke/sword-Clarke-2.0.ebuild b/app-dicts/sword-Clarke/sword-Clarke-2.0.ebuild
deleted file mode 100644
index ded3eac62b86..000000000000
--- a/app-dicts/sword-Clarke/sword-Clarke-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Adam Clarke's Commentary and critical notes on the Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Common/Manifest b/app-dicts/sword-Common/Manifest
deleted file mode 100644
index 3a9cbc4afd7c..000000000000
--- a/app-dicts/sword-Common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Common-1.3.zip 357456 BLAKE2B f96fc2ae120775c90d3b9fb7347fdf99770cce37fc8561f494c2b2d7da614a88c09f807d4b24a8f2e81645eb967660e2251e38bd5978ce1d660dc77d2b165e84 SHA512 b92d4c346883ca45d703208c5e3b70390a6a012e5d62fadc3fe937dd00b90e56eac4b0d7f845c008054d2ca3f7fafa12e90742b774633d0c0f951eed09960cc7
diff --git a/app-dicts/sword-Common/metadata.xml b/app-dicts/sword-Common/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Common/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Common/sword-Common-1.3.ebuild b/app-dicts/sword-Common/sword-Common-1.3.ebuild
deleted file mode 100644
index 7a170e824e07..000000000000
--- a/app-dicts/sword-Common/sword-Common-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Common"
-
-inherit sword-module
-
-DESCRIPTION="The Common Edition: New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Common"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Concord/Manifest b/app-dicts/sword-Concord/Manifest
deleted file mode 100644
index 750c436d8a73..000000000000
--- a/app-dicts/sword-Concord/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Concord-2.4.1.zip 795728 BLAKE2B 2795be45f82fe2f30e50219b036053dfc4f2c8258d24dc9c406d76683b9e6773573267e422f9658e62a2b64fe612f2e20dc91a9327a1b44d28645e556ff0d34f SHA512 05fceb6bfba96bd70993bb6218e3bc50f9829e5d34c506254954525f42f7d70d123fcc4bf80674938fa057bcb19f192fad7881c75e34c3d185e463a39817f076
diff --git a/app-dicts/sword-Concord/metadata.xml b/app-dicts/sword-Concord/metadata.xml
deleted file mode 100644
index 59465a1f74ca..000000000000
--- a/app-dicts/sword-Concord/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		From the German text, printed in: Triglot Concordia: The Symbolical Books of the Ev. Lutheran Church. St. Louis: Concordia Publishing House, 1921. Converted to Sword module format by Brian Dumont, (bdumont at ameritech dot net)
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Concord/sword-Concord-2.4.1.ebuild b/app-dicts/sword-Concord/sword-Concord-2.4.1.ebuild
deleted file mode 100644
index 3f90b7dc4c46..000000000000
--- a/app-dicts/sword-Concord/sword-Concord-2.4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Book of Concord: The Symbolical Books of the Ev. Lutheran Church"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Concord"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CopNT/Manifest b/app-dicts/sword-CopNT/Manifest
deleted file mode 100644
index 0a9dbee449e4..000000000000
--- a/app-dicts/sword-CopNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CopNT-1.0.1.zip 469161 BLAKE2B 502b5792c9df9efca5899f56132a87b250ca5573f056b9ead9d3e7753da2afc2242fc06837f9d0c5fb729f5a305c5f029c8883ba97f448093234b7f1ca844853 SHA512 4bd777ba0a4e4ae38c604cbaaeceefc6e1b852328a9e8a8d331376e849cd7a89107417de20dcbae0d27b59f36a44b745b992ffffa1b58bf59cd9d8279f6446b5
diff --git a/app-dicts/sword-CopNT/metadata.xml b/app-dicts/sword-CopNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CopNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CopNT/sword-CopNT-1.0.1.ebuild b/app-dicts/sword-CopNT/sword-CopNT-1.0.1.ebuild
deleted file mode 100644
index cec10b53d58e..000000000000
--- a/app-dicts/sword-CopNT/sword-CopNT-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Coptic New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopNT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CopSahBible2/Manifest b/app-dicts/sword-CopSahBible2/Manifest
deleted file mode 100644
index 2d6fa3f23099..000000000000
--- a/app-dicts/sword-CopSahBible2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CopSahBible2-1.3.zip 4646696 BLAKE2B f295188876c82cf4ab5479722ec8535fe5e07130b2f6119dafa5451d7f53211b8ee435c936ebfadbc10d50108b4d58864d21056d99b9404179e1dd05e03991ff SHA512 08af9e18340ae14b72e1232fbde2c42d7ab3ca590ae692723566e9de791cea4a4fa7d1ba8ace6c2c7a4a1ec04fc0cb14396ad23a9cea149d964e13c90ae0ed23
diff --git a/app-dicts/sword-CopSahBible2/metadata.xml b/app-dicts/sword-CopSahBible2/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CopSahBible2/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CopSahBible2/sword-CopSahBible2-1.3.ebuild b/app-dicts/sword-CopSahBible2/sword-CopSahBible2-1.3.ebuild
deleted file mode 100644
index bed10896ab11..000000000000
--- a/app-dicts/sword-CopSahBible2/sword-CopSahBible2-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Sahidic Bible 2"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahBible2"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CopSahHorner/Manifest b/app-dicts/sword-CopSahHorner/Manifest
deleted file mode 100644
index 7e7e2e3a356b..000000000000
--- a/app-dicts/sword-CopSahHorner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CopSahHorner-1.5.zip 439256 BLAKE2B cb0d18f38d4dd1fbe1e2f91adbffd20bf06bed58a3a1d1dd86414bc9a196dd5e8119535ec250170667ac3d06294e9183117dc6890db755248adaee7edf75e2dc SHA512 6f17d79cd0b26722dc417ed874fce617150aa08ad0f7f9cc9dbb7cb0aeebd615d38b60a1c187e52b8214b85cc67e8bfc68d97995952f1a6fc796870e647d1cd7
diff --git a/app-dicts/sword-CopSahHorner/metadata.xml b/app-dicts/sword-CopSahHorner/metadata.xml
deleted file mode 100644
index 335f6915fa6c..000000000000
--- a/app-dicts/sword-CopSahHorner/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		The Coptic version of the New Testament in the Southern dialect, otherwise called Sahidic and Thebaic, published in 1911, edited by George William Horner (1849-1930).
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-CopSahHorner/sword-CopSahHorner-1.5.ebuild b/app-dicts/sword-CopSahHorner/sword-CopSahHorner-1.5.ebuild
deleted file mode 100644
index 7b673483b8ad..000000000000
--- a/app-dicts/sword-CopSahHorner/sword-CopSahHorner-1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Sahidic Coptic New Testament, ed. by G. W. Horner"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahHorner"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CopSahidicMSS/Manifest b/app-dicts/sword-CopSahidicMSS/Manifest
deleted file mode 100644
index 24afae6d61a8..000000000000
--- a/app-dicts/sword-CopSahidicMSS/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CopSahidicMSS-1.0.zip 423026 BLAKE2B 88c40b13f3ae1ea04ccf9bbb75c06575fb2a892f87a6c024d467f99e9a3467f9876013e5cfc6ecf3722579e26c5a60e0d7c512030e53727b2cc78e30295a57fd SHA512 dee17e6e52875d871311f95276bbdbec7a121630229b78d954da3b1389aeb47f7163095d4f1fd2f55e1e89ac5f82ea430a9429fee0c4631d94e7554bb7f873e3
diff --git a/app-dicts/sword-CopSahidicMSS/metadata.xml b/app-dicts/sword-CopSahidicMSS/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CopSahidicMSS/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CopSahidicMSS/sword-CopSahidicMSS-1.0.ebuild b/app-dicts/sword-CopSahidicMSS/sword-CopSahidicMSS-1.0.ebuild
deleted file mode 100644
index 933dc17f849a..000000000000
--- a/app-dicts/sword-CopSahidicMSS/sword-CopSahidicMSS-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Sahidica Manuscripts"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahidicMSS"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CopSahidica/Manifest b/app-dicts/sword-CopSahidica/Manifest
deleted file mode 100644
index 06d220bbfe22..000000000000
--- a/app-dicts/sword-CopSahidica/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CopSahidica-1.0.zip 469990 BLAKE2B 9aff0b72ea697e503eace9d97521a2afea7e7a0a727387ba8822818f7a9dc267f9dffbd3b2344bdf7a5652a031a1f8eba3634f0a69ecd2fc3332da500e627be5 SHA512 fc5044fd65e69ce0f7e7d6bd70da8d88b62701e15444bbc82e3577f729433f4e49fc9380ade08cb1c887e8f4f47cfa9eb40db21218a55b9fcf805bde2ec5637e
diff --git a/app-dicts/sword-CopSahidica/metadata.xml b/app-dicts/sword-CopSahidica/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CopSahidica/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CopSahidica/sword-CopSahidica-1.0.ebuild b/app-dicts/sword-CopSahidica/sword-CopSahidica-1.0.ebuild
deleted file mode 100644
index 8b096197e149..000000000000
--- a/app-dicts/sword-CopSahidica/sword-CopSahidica-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Sahidica - A New Edition of the New Testament in Sahidic Coptic"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahidica"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CroSaric/Manifest b/app-dicts/sword-CroSaric/Manifest
deleted file mode 100644
index dfeee5aa729e..000000000000
--- a/app-dicts/sword-CroSaric/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CroSaric-2.0.zip 1694794 BLAKE2B 996d390c5a86b91ddae231104d9ceccce64ba7344b438c6a454da2ab430d9edf878db358a8be64299cfaeaed3127bfef093965d687e94e22930bcc9ce1ddbca1 SHA512 571cef27b4c7e908f02573eb13ed072d068326942429c8ee3df458a4c8cadcc2c57f2891624fcab36ab16842d2d1bc6faa22181db50bd2caeafcb1f669ed3442
diff --git a/app-dicts/sword-CroSaric/metadata.xml b/app-dicts/sword-CroSaric/metadata.xml
deleted file mode 100644
index 1cd8adc6f1f5..000000000000
--- a/app-dicts/sword-CroSaric/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="hr">
-		Hrvatska Biblija Ivana Šarića (Šarićeva Biblija)
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-CroSaric/sword-CroSaric-2.0.ebuild b/app-dicts/sword-CroSaric/sword-CroSaric-2.0.ebuild
deleted file mode 100644
index c0fbb15f89c3..000000000000
--- a/app-dicts/sword-CroSaric/sword-CroSaric-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Croatian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CroSaric"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CzeB21/Manifest b/app-dicts/sword-CzeB21/Manifest
deleted file mode 100644
index 68c708a58898..000000000000
--- a/app-dicts/sword-CzeB21/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CzeB21-1.5.zip 3106051 BLAKE2B 0cf2dba121120c36cf83b06f81d58fcb6e6561371cf58454d1cf287a22c63792d66d3b954ed86cddf728a88f69c3da5cf74f601985da06fd6d0619e74a6a2c54 SHA512 dd8d276e82882252c9c7d9cfc4f53ac6ba0a41bf49914231e5dc988f482987253a9ff7e7b592d2b4b84f284703fca965004ec7e61baa4d2633e1e34b473261cf
diff --git a/app-dicts/sword-CzeB21/metadata.xml b/app-dicts/sword-CzeB21/metadata.xml
deleted file mode 100644
index 1118a68a39bc..000000000000
--- a/app-dicts/sword-CzeB21/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="cs">
-		Bible, Překlad 21. století vedoucí projektu Alexandr Flek odborná spolupráce Jiří Hedánek, Pavel Hoffman, Zdeněk Sýkora Přeloženo z hebrejštiny, aramejštiny, řečtiny Vydání první (c) 2009 Biblion, o. s. www.bible21.org www.bible21.cz
-		Překlad 21. století přináší nadčasové poselství Bible v současné, čtivé češtině. Usiluje o maximální věrnost původním hebrejským, aramejským a řeckým textům, zároveň však chce oslovit dnešní čtenáře, ať už jsou zvyklí čerpat z této knihy inspiraci pro každý den, anebo ji otevírají poprvé.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-CzeB21/sword-CzeB21-1.5.ebuild b/app-dicts/sword-CzeB21/sword-CzeB21-1.5.ebuild
deleted file mode 100644
index a3b16e5bc713..000000000000
--- a/app-dicts/sword-CzeB21/sword-CzeB21-1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Czech Bible, Překlad 21. století včetně deuterokanonických knih"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeB21"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CzeBKR/Manifest b/app-dicts/sword-CzeBKR/Manifest
deleted file mode 100644
index 07b9fa1ed48f..000000000000
--- a/app-dicts/sword-CzeBKR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CzeBKR-1.3.1.zip 2010388 BLAKE2B f55df53afba0bce36d699c4e86208244a7e00e90dbdedeb84f096abf4028b8a316853e7800ca99d871546c3c8bdcb06a5ce88ba5908ee80960daf2d9784d66f4 SHA512 b577670643993cfd59ec7a05a18a021ca05ae05c9521d8b66908b25a0f67982452cfb97ec8135cbd70b39b5ec00a054e9a58147e632f10026672f02f0719ab33
diff --git a/app-dicts/sword-CzeBKR/metadata.xml b/app-dicts/sword-CzeBKR/metadata.xml
deleted file mode 100644
index ba2e0511b116..000000000000
--- a/app-dicts/sword-CzeBKR/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="cs">
-		Czech Bible Kralicka: Bible svata aneb vsecka svata pisma Stareho i Noveho
-		Zakona podle posledniho vydani kralickeho z roku 1613.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-CzeBKR/sword-CzeBKR-1.3.1.ebuild b/app-dicts/sword-CzeBKR/sword-CzeBKR-1.3.1.ebuild
deleted file mode 100644
index 45c798bd6ff0..000000000000
--- a/app-dicts/sword-CzeBKR/sword-CzeBKR-1.3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Czech Bible Kralicka"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeBKR"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CzeCEP/Manifest b/app-dicts/sword-CzeCEP/Manifest
deleted file mode 100644
index 239515a6e622..000000000000
--- a/app-dicts/sword-CzeCEP/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CzeCEP-1.8.zip 1550656 BLAKE2B ef6fc91626ec72dfa4d9ce97a9f29eab768eb4f038daf52daa9ac45ed291972d85e1e57ee7cffefdccc9e187ae417eed2e30e245dca13244da72c6927b382da7 SHA512 bdfc5d199aa51b4b7f5689e194eabe7ec3d3280905a406119c767f61bbdc9d8757dee0b936bf43d4313877f40bcb8f20e89b343a6ddc61fb01f15d6dc9857f09
diff --git a/app-dicts/sword-CzeCEP/metadata.xml b/app-dicts/sword-CzeCEP/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CzeCEP/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CzeCEP/sword-CzeCEP-1.8.ebuild b/app-dicts/sword-CzeCEP/sword-CzeCEP-1.8.ebuild
deleted file mode 100644
index 8c2376ceb0e4..000000000000
--- a/app-dicts/sword-CzeCEP/sword-CzeCEP-1.8.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Czech Ekumenicky Cesky preklad"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCEP"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-CzeCSP/Manifest b/app-dicts/sword-CzeCSP/Manifest
deleted file mode 100644
index 5ffa262ff98d..000000000000
--- a/app-dicts/sword-CzeCSP/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CzeCSP-1.4.zip 4219688 BLAKE2B 65472384cf1e9979aa4c20813d750ed40e54553f1479929486c860605289ee65427c19ec2389af6974a5032329ed4da46d37cea1ba3e12b8d85c6046d0b27d99 SHA512 38f0244d226cdd595b7630fde21a5a6da70c17e7063b60821e4fa9b89735cd7aca03e688d422ee554cd49871d12b956166cd7b8d7a0172b3a1e2799d77fc8cf1
diff --git a/app-dicts/sword-CzeCSP/metadata.xml b/app-dicts/sword-CzeCSP/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-CzeCSP/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-CzeCSP/sword-CzeCSP-1.4.ebuild b/app-dicts/sword-CzeCSP/sword-CzeCSP-1.4.ebuild
deleted file mode 100644
index a1228fffcac9..000000000000
--- a/app-dicts/sword-CzeCSP/sword-CzeCSP-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Czech Český studijní překlad"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCSP"
-LICENSE="CC-BY-NC-ND-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DBD/Manifest b/app-dicts/sword-DBD/Manifest
deleted file mode 100644
index 873973542615..000000000000
--- a/app-dicts/sword-DBD/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DBD-1.4.zip 412728 BLAKE2B 3b167c78e62af9bfe5348d3c3ebf4346b56da39d69ba1e8f24e50e7364ddda04e7f7b5514af80290d590d62e3f24526fa239e87fc512f4ec1a0d72c2b0bf9038 SHA512 21f74df81ccf806dfc0cf802461d59f92c98fcc35d9525b791be62d3b8182b5185aea1ef85544d4d36817cd154fed19bd1cbf38bab21d52b17e7ee48eeeceff5
diff --git a/app-dicts/sword-DBD/metadata.xml b/app-dicts/sword-DBD/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-DBD/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-DBD/sword-DBD-1.4.ebuild b/app-dicts/sword-DBD/sword-DBD-1.4.ebuild
deleted file mode 100644
index 8a911af9b63f..000000000000
--- a/app-dicts/sword-DBD/sword-DBD-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Day By Day By Grace - Bob Hoekstra"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DBD"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DRC/Manifest b/app-dicts/sword-DRC/Manifest
deleted file mode 100644
index de6e4d264220..000000000000
--- a/app-dicts/sword-DRC/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DRC-2.0.zip 1679446 BLAKE2B b5a1c0dbc274ce0c24ba262eca734ee48e205d476b20b4901761c685ed425bdab3990e6bc09e0277a2b8caf6c16cf8c617b35b935e24e4bb758a35365cd66245 SHA512 7fa1e1ef1a2986eb76d21429750ce5944aa4e75a7e42eb0d4421afb2418838cdc0c2bc7ad9fafee7f246b7d7bc74e3ab596826bef925262c0f44b933e037bf2b
diff --git a/app-dicts/sword-DRC/metadata.xml b/app-dicts/sword-DRC/metadata.xml
deleted file mode 100644
index cf4ecfa4807f..000000000000
--- a/app-dicts/sword-DRC/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		THE HOLY BIBLE
-		TRANSLATED FROM THE LATIN VULGATE
-		DILIGENTLY COMPARED WITH THE HEBREW, GREEK, AND OTHER EDITIONS IN DIVERS LANGUAGES
-		THE OLD TESTAMENT
-		FIRST PUBLISHED BY THE ENGLISH COLLEGE AT DOUAY, A.D. 1609
-		AND
-		THE NEW TESTAMENT
-		FIRST PUBLISHED BY THE ENGLISH COLLEGE AT RHEIMS, A.D. 1582
-		WITH ANNOTATIONS, REFERENCES, AND AN HISTORICAL AND CHRONOLOGICAL INDEX
-
-		THE WHOLE REVISED AND DILIGENTLY COMPARED WITH THE LATIN VULGATE BY BISHOP
-		RICHARD CHALLONER, A.D. 1749-1752
-		PUBLISHED WITH THE APPROBATION OF HIS EMINENCE JAMES CARDINAL GIBBONS
-		ARCHBISHOP OF BALTIMORE
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-DRC/sword-DRC-2.0.ebuild b/app-dicts/sword-DRC/sword-DRC-2.0.ebuild
deleted file mode 100644
index 917fd7671511..000000000000
--- a/app-dicts/sword-DRC/sword-DRC-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Douay-Rheims Bible, Challoner Revision"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DRC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DTN/Manifest b/app-dicts/sword-DTN/Manifest
deleted file mode 100644
index a3d711652a3f..000000000000
--- a/app-dicts/sword-DTN/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DTN-1.0.zip 332136 BLAKE2B de4b3b2c16ec4465d434d3525a23983e583b89167b2406459c83fb7ca94dc2ea52f42822a79e36c82692264be03666d9525a96fe4f089856f8c4a23baa32a75b SHA512 589dc962404483f366ab293c00cb8f7a6144db222b16ebe3df24e87e553ed607b74d14150f44dfacf4798732633c3580c8b73a68c9642d689acedb856019d491
diff --git a/app-dicts/sword-DTN/metadata.xml b/app-dicts/sword-DTN/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-DTN/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-DTN/sword-DTN-1.0.ebuild b/app-dicts/sword-DTN/sword-DTN-1.0.ebuild
deleted file mode 100644
index c97aa501f584..000000000000
--- a/app-dicts/sword-DTN/sword-DTN-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="DTN"
-
-inherit sword-module
-
-DESCRIPTION="Darby Translation Notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DTN"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DaNT1819/Manifest b/app-dicts/sword-DaNT1819/Manifest
deleted file mode 100644
index 81dc1a68d391..000000000000
--- a/app-dicts/sword-DaNT1819/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DaNT1819-1.0.1.zip 390326 BLAKE2B f3070790aebe2dec63d7cc9d9a977b23afdac5a7be51e2e3c8c22aba45d954e805d8c1061cfa8845398e09a1fba981d9f2c1f8ffe0d225710a4b41cff8e04c34 SHA512 5c19c86a28a6d4db268df160670c86a894bb6ef7c3afc624b49892cc37cb0ff41179196b07e77a73b71e25bc310fa571ca4598c552a33183bc4919ef92384cba
diff --git a/app-dicts/sword-DaNT1819/metadata.xml b/app-dicts/sword-DaNT1819/metadata.xml
deleted file mode 100644
index b5434964bc3f..000000000000
--- a/app-dicts/sword-DaNT1819/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		New Testament in Danish, authorized by King Frederik the 7th in 1819 and published by the Danish Bible Society in the same year.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-DaNT1819/sword-DaNT1819-1.0.1.ebuild b/app-dicts/sword-DaNT1819/sword-DaNT1819-1.0.1.ebuild
deleted file mode 100644
index a99868d30faf..000000000000
--- a/app-dicts/sword-DaNT1819/sword-DaNT1819-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Danish New Testament from 1819 with original orthography"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaNT1819"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DaOT1871NT1907/Manifest b/app-dicts/sword-DaOT1871NT1907/Manifest
deleted file mode 100644
index 9fcf556b707d..000000000000
--- a/app-dicts/sword-DaOT1871NT1907/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DaOT1871NT1907-1.0.zip 1762253 BLAKE2B d12a6a16a1d55e7347e133b98a84108c5844531d6a590c89a38000d85392f2d92237e6c270d3e96d12ace6023fa04b6df17ff1cd24ac072785791db571b036bd SHA512 aa8e6b64e61045e882a870d830d5504d2a7bd383b4cf554e75abb5e55a157e43ad4a5e766fa8477172a11854a01ee7c8906d212cebabf0ac5b4ac4ea273e7aaa
diff --git a/app-dicts/sword-DaOT1871NT1907/metadata.xml b/app-dicts/sword-DaOT1871NT1907/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-DaOT1871NT1907/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-DaOT1871NT1907/sword-DaOT1871NT1907-1.0.ebuild b/app-dicts/sword-DaOT1871NT1907/sword-DaOT1871NT1907-1.0.ebuild
deleted file mode 100644
index 129fdcc1e8c1..000000000000
--- a/app-dicts/sword-DaOT1871NT1907/sword-DaOT1871NT1907-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Danish OT1871 + NT1907 with original orthography"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaOT1871NT1907"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DaOT1931NT1907/Manifest b/app-dicts/sword-DaOT1931NT1907/Manifest
deleted file mode 100644
index cc8beafc9372..000000000000
--- a/app-dicts/sword-DaOT1931NT1907/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DaOT1931NT1907-1.01.zip 1627168 BLAKE2B a44789ed2159905941e1f130546fc6cf4d4e705d318b81ddd01d436acb2f2017a22a95962dfd0deda899bee309572f309162584c0c9a2ec5068af8f5a52b78cf SHA512 43a6e673f0c483c86e61517f1af170ba500762eea8fcaf0f206098b088ecac4017c9afb6db5c36defb0af26b81edb2a7deaee6f86b0028fa7ef5275ae2f59846
diff --git a/app-dicts/sword-DaOT1931NT1907/metadata.xml b/app-dicts/sword-DaOT1931NT1907/metadata.xml
deleted file mode 100644
index 5826887fffef..000000000000
--- a/app-dicts/sword-DaOT1931NT1907/metadata.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="da">
-		Dansk GT1931 + NT1907 med oprindelig retskrivning
-		Dansk autoriseret oversættelse af GT fra 1931 med den autoriserede
-		oversættelse af NT fra 1907.
-		NT-delen er baseret på en ny OCR-scanning af en udgave med latinske bogstaver
-		(ikke gotiske). Efterfølgende er NT-delen blevet gennemgribende
-		korrekturlæst og korrigeret, og fodnoter samt indholdsfortegnelser for hvert
-		kapitel er blevet tilføjet.
-		GT-delen er baseret på en OCR-scanning fra sidst-1980'erne af et typografisk
-		fejlbehæftet eksemplar fra 1933. Derefter blev teksten hånd-korrigeret af
-		et ægtepar med hjerte for mediemission. Søren Horn lagde udgaven på
-		Internettet tidligt i 1990'erne. Projekt Runeberg ved Linköping Universitet
-		tog denne tekst til sig og tilføjede afsnitsformattering inklusive noget korrektur.
-		Ulrik Sandborg-Petersen tog teksten til sig i midten af 00'erne, og har siden
-		da hånd-korrigeret tusindvis af OCR-genkendendelsesfejl og fejl i afsnitsgrænser.
-		Både NT-delen og GT-delen bibeholder den oprindelige retskrivning.
-		Fejlrapporter og -rettelser bedes sendt til Ulrik Sandborg-Petersen via:
-		https://github.com/emg/
-	</longdescription>
-	<longdescription lang="en">
-		Danish translation of the Old Testament authorized in 1931 by the Danish King,
-		with the New Testment being the authorized Danish version from 1907. The NT is
-		based on an entirely new OCR-scanning of an edition with Latin typographic (not
-		Fraktur). The NT has subsequently been thoroughly proof-read and hand-corrected,
-		and footnotes as well as tables of contents for each chapter have been added.
-		The OT is based on an OCR-scan from the late 1980s, scanned from a
-		typographically deficient edition from 1933. OCR-scanning done and proof-read
-		by a Danish pioneering couple with a heart for media-missions. It was placed
-		n the Internet by Søren Horn in the early 1990s, from where it was picked up
-		by Projekt Runeberg at Linköping University. Ulrik Sandborg-Petersen picked up
-		the text in the mid-2000's, and has since then hand-corrected literally
-		thousands of OCR mistakes and paragraphing issues. Both the OT and the NT
-		retain the original orthography.
-		Errors and corrections should be sent to Ulrik Sandborg-Petersen via:
-		https://github.com/emg/
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-DaOT1931NT1907/sword-DaOT1931NT1907-1.01.ebuild b/app-dicts/sword-DaOT1931NT1907/sword-DaOT1931NT1907-1.01.ebuild
deleted file mode 100644
index 2e3387645236..000000000000
--- a/app-dicts/sword-DaOT1931NT1907/sword-DaOT1931NT1907-1.01.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Danish OT1931 + NT1907 with original orthography"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaOT1931NT1907"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Daily/Manifest b/app-dicts/sword-Daily/Manifest
deleted file mode 100644
index 82955e209f6d..000000000000
--- a/app-dicts/sword-Daily/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Daily-1.0.zip 312387 BLAKE2B 46977f7d270031620447d833e2f20ea8af93c678c77bb3bd570b321f0430219d55423c7163286413ed8e10d90ef1ccca8e99a5c90fd79bcfe70da2e684860e22 SHA512 ab11a1e8918796d34ffadc90b4b0782c5ef021535de135817eae05b32f1271430d2bef02465e96c6def5926c67c0cca5e8f009591e33a2a718a10b7a9ce4983d
diff --git a/app-dicts/sword-Daily/metadata.xml b/app-dicts/sword-Daily/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Daily/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Daily/sword-Daily-1.0.ebuild b/app-dicts/sword-Daily/sword-Daily-1.0.ebuild
deleted file mode 100644
index 7e3fbff0201e..000000000000
--- a/app-dicts/sword-Daily/sword-Daily-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Daily"
-
-inherit sword-module
-
-DESCRIPTION="Jonathan Bagster's Daily Light on the Daily Path"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Daily"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Darby/Manifest b/app-dicts/sword-Darby/Manifest
deleted file mode 100644
index b8db6acaecdf..000000000000
--- a/app-dicts/sword-Darby/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Darby-2.0.zip 3095627 BLAKE2B d54e671442c5527a578ccb3d57bc466d2b026f7b469369b48f5622e490c683866493cb770d9704eabb8acb34cd9b8629258410394201499eb569e32f4544114b SHA512 6385a1d946417783c86c9e8ab73623cfea70509c5431b93815ba3ea0c18005bd5d3a0aeab16ca88f1228bdd99791ece1a1b3f279ac04508717552027766d1ba2
diff --git a/app-dicts/sword-Darby/metadata.xml b/app-dicts/sword-Darby/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Darby/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Darby/sword-Darby-2.0.ebuild b/app-dicts/sword-Darby/sword-Darby-2.0.ebuild
deleted file mode 100644
index 02418b8f94ba..000000000000
--- a/app-dicts/sword-Darby/sword-Darby-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Darby Bible (1889)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Darby"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Dari/Manifest b/app-dicts/sword-Dari/Manifest
deleted file mode 100644
index 54338c40c060..000000000000
--- a/app-dicts/sword-Dari/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Dari-1.0.2.zip 1820090 BLAKE2B 4397efbc81e33fc5f1b0ebdf6f14fa55ff45671327518daf66423a768fc140f7924407707415556fec4768fe81f4927beab5cb293cf339c19e33c716d5ba004a SHA512 9921de2c8f9ccdbc1442695d2214eb1c2274e2a5be5fe641377c42ceeb214f78d1c48bc0b3fcfa778f3c0151cca9fde036d18258c9e2a790a792589d11e093c3
diff --git a/app-dicts/sword-Dari/metadata.xml b/app-dicts/sword-Dari/metadata.xml
deleted file mode 100644
index b70c08649ffa..000000000000
--- a/app-dicts/sword-Dari/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Farsi (Dari) Translation for Afghanistan. This module may be distributed for God's glory without any alteration to format or content. 
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Dari/sword-Dari-1.0.2.ebuild b/app-dicts/sword-Dari/sword-Dari-1.0.2.ebuild
deleted file mode 100644
index f29f4ebbac3c..000000000000
--- a/app-dicts/sword-Dari/sword-Dari-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Dari Translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Dari"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DarkNightOfTheSoul/Manifest b/app-dicts/sword-DarkNightOfTheSoul/Manifest
deleted file mode 100644
index 46a17152ffc1..000000000000
--- a/app-dicts/sword-DarkNightOfTheSoul/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DarkNightOfTheSoul-1.0.zip 111519 BLAKE2B 83f068f7c9716dc0c9cddcbba1e63a71869623a2106c3a8e48d7576c22e7897d3f281d963499cd0a907ac16de14691e86f2f5e7a89373a4e56793b0ffcbd5cf7 SHA512 d02f97af19f0c3e9a80835c580cca79a5462cd89758948e420e8d62537626df384bf446670875857e8565988ef4a472cffee2f4115e4b7aee962edbc7b0e8668
diff --git a/app-dicts/sword-DarkNightOfTheSoul/metadata.xml b/app-dicts/sword-DarkNightOfTheSoul/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-DarkNightOfTheSoul/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-DarkNightOfTheSoul/sword-DarkNightOfTheSoul-1.0.ebuild b/app-dicts/sword-DarkNightOfTheSoul/sword-DarkNightOfTheSoul-1.0.ebuild
deleted file mode 100644
index 2b5b26c1c87a..000000000000
--- a/app-dicts/sword-DarkNightOfTheSoul/sword-DarkNightOfTheSoul-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="'The Dark Night of the Soul' by St. John of the Cross"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DarkNightOfTheSoul"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Diaglott/Manifest b/app-dicts/sword-Diaglott/Manifest
deleted file mode 100644
index 50d69adfe04d..000000000000
--- a/app-dicts/sword-Diaglott/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Diaglott-1.1.zip 364870 BLAKE2B e932e6f77d437e05fadabc2d1c9f53a3de03d0d3f57e1fc734a08d4c2a13ea8e0b994f91cf2c0d74c5e5b9881f7aef79b465bdf428be5551fa66776bf872e793 SHA512 f992bcc200b1bb86e03fd0bf209cbca70466a2bd1001df3063048d3dbb38c16cf70a5657ca6146664e21fa09bc383255ee1923de2287207116797554fa484c34
diff --git a/app-dicts/sword-Diaglott/metadata.xml b/app-dicts/sword-Diaglott/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Diaglott/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Diaglott/sword-Diaglott-1.1.ebuild b/app-dicts/sword-Diaglott/sword-Diaglott-1.1.ebuild
deleted file mode 100644
index 4d8fb257fd16..000000000000
--- a/app-dicts/sword-Diaglott/sword-Diaglott-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Diaglott"
-
-inherit sword-module
-
-DESCRIPTION="The Emphatic Diaglott"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Diaglott"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Dodson/Manifest b/app-dicts/sword-Dodson/Manifest
deleted file mode 100644
index 98754151499c..000000000000
--- a/app-dicts/sword-Dodson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Dodson-1.0.zip 234157 BLAKE2B 1b316794e7940f0aca8e60e5cee4f71df608b482c1dd0ecba267042f71650bb3ef939fcd1a322ba7d66b78fa41b0cc7fd032a64e3945636837ed057d9aca236e SHA512 b57cb105cebd957f2dcae0ba9bff70e3b7eb8c47168131d298244137c60e2b36cc7d73b5b1181a5788afefd02532bbbbd9239f0da02e3b0dbbb6030ace954c5c
diff --git a/app-dicts/sword-Dodson/metadata.xml b/app-dicts/sword-Dodson/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Dodson/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Dodson/sword-Dodson-1.0.ebuild b/app-dicts/sword-Dodson/sword-Dodson-1.0.ebuild
deleted file mode 100644
index 1260c2229620..000000000000
--- a/app-dicts/sword-Dodson/sword-Dodson-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Dodson Greek-English Lexicon"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Dodson"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DutKant/Manifest b/app-dicts/sword-DutKant/Manifest
deleted file mode 100644
index d8f1804184ee..000000000000
--- a/app-dicts/sword-DutKant/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DutKant-1.1.zip 4741315 BLAKE2B 1902d1e83d5c99620e1de25741b8a1e00c29f91fb50007470c48123939f0dd58b81caa918017dc4de699c2acfb7925187e17cbe3c9202ed000acbcef2e6521f7 SHA512 9a9076939aa9c14af2e1f9c3d98acc2225444465b3c2323c8d3930e02e21c80e573d8d874e3e51878125436411d0ae580f1cb1784166e9ae50d5ff2d81a9a830
diff --git a/app-dicts/sword-DutKant/metadata.xml b/app-dicts/sword-DutKant/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-DutKant/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-DutKant/sword-DutKant-1.1.ebuild b/app-dicts/sword-DutKant/sword-DutKant-1.1.ebuild
deleted file mode 100644
index f0bfe2c851a1..000000000000
--- a/app-dicts/sword-DutKant/sword-DutKant-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="DutKant"
-
-inherit sword-module
-
-DESCRIPTION="Kanttekeningen Statenvertaling"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKant"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DutKingComm/Manifest b/app-dicts/sword-DutKingComm/Manifest
deleted file mode 100644
index 1d42b4d0ec6e..000000000000
--- a/app-dicts/sword-DutKingComm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DutKingComm-1.0.zip 9610923 BLAKE2B 7709b7064539260e5008edb8853fb96e4d3aad14bde21ffe48f2a48542b210f5c8d26f6714d4dbfb2a604a8d7344fab0f00d1c23b2bd650fdff6ea5ed8d69816 SHA512 01c037ba0333761c68e56fdc16f579e2d998679337020ec4ae04a589ea1dcc514a7ee51e891bc58b8b895711775a91a3726371703cfdf4f864911da076d1a58d
diff --git a/app-dicts/sword-DutKingComm/metadata.xml b/app-dicts/sword-DutKingComm/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-DutKingComm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-DutKingComm/sword-DutKingComm-1.0.ebuild b/app-dicts/sword-DutKingComm/sword-DutKingComm-1.0.ebuild
deleted file mode 100644
index 09c8119a8cba..000000000000
--- a/app-dicts/sword-DutKingComm/sword-DutKingComm-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Kingcomments-NL, Commentaar op de hele Bijbel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKingComm"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DutSVV/Manifest b/app-dicts/sword-DutSVV/Manifest
deleted file mode 100644
index bf398aa06309..000000000000
--- a/app-dicts/sword-DutSVV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DutSVV-2.1.zip 1605769 BLAKE2B 00e5502d69da2248f7befa8922fa24c810074cd4d822a777937b5031a3012d060f5cec136bc7a47ba576d242aff2012030658aab7dd28f3ef73f8f4b08fcf21f SHA512 4b1f30154bc4f7223abeaaf5e49ae61dbfe23beb03ea3e2187feb6085ecfb0f73b7ea2465bc3dffbe6add19f5fd2ef7389a671fedb85159097aca0ef081ccc29
diff --git a/app-dicts/sword-DutSVV/metadata.xml b/app-dicts/sword-DutSVV/metadata.xml
deleted file mode 100644
index 317271b9d545..000000000000
--- a/app-dicts/sword-DutSVV/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="nl">
-		DAT IS DE GANSE HEILIGE SCHRIFT
-		BEVATTENDE AL DE KANONIEKE BOEKEN VAN HET
-		OUDE EN NIEUWE TESTAMENT
-
-		DOOR LAST VAN DE HOOG-MOGENDE HEREN STATEN-GENERAAL DER VERENIGDE NEDERLANDEN
-		EN VOLGENS HET BESLUIT VAN DE SYNODE NATIONAAL GEHOUDEN TE DORDRECHT IN DE
-		JAREN 1618 EN 1619 UIT DE OORSPRONKELIJKE TALEN IN ONZE NEDERLANDSE TAAL
-		GETROUWELIJK OVERGEZET.
-
-		Based on electronic edition from Statenvertaling online.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-DutSVV/sword-DutSVV-2.1.ebuild b/app-dicts/sword-DutSVV/sword-DutSVV-2.1.ebuild
deleted file mode 100644
index b3e60cb1e55b..000000000000
--- a/app-dicts/sword-DutSVV/sword-DutSVV-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Dutch Statenvertaling Bijbel, including footnotes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-DutSVVA/Manifest b/app-dicts/sword-DutSVVA/Manifest
deleted file mode 100644
index 67d70a647d9e..000000000000
--- a/app-dicts/sword-DutSVVA/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DutSVVA-1.0.zip 6988478 BLAKE2B 3becbb0e69f08b5a00542887242f612af52677c1ce2f4a12788f83b4e6ff9f33e1bf6d4c11def04bba56fd6f68400227243f7cdcae2f42807bac99446830e821 SHA512 3b03e06623433ae43dc4cd56f9177b28843c4daf60d04ee367497693f433ee96ff71096d63f4e1975ca407e547533a0b7879700bd6bcc81c3fb7977b6078f2aa
diff --git a/app-dicts/sword-DutSVVA/metadata.xml b/app-dicts/sword-DutSVVA/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-DutSVVA/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-DutSVVA/sword-DutSVVA-1.0.ebuild b/app-dicts/sword-DutSVVA/sword-DutSVVA-1.0.ebuild
deleted file mode 100644
index 4e7437138e3b..000000000000
--- a/app-dicts/sword-DutSVVA/sword-DutSVVA-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Dutch Statenvertaling Bijbel including deuterocanonical books"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVVA"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-EMBReality/Manifest b/app-dicts/sword-EMBReality/Manifest
deleted file mode 100644
index 5f5c0f8efc5e..000000000000
--- a/app-dicts/sword-EMBReality/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST EMBReality-0.5.zip 70415 BLAKE2B 66ca4427c1b2e04a8b17a36d6f8302b03b689ffdd2d5212c834c7a1f9f75951a9d727fa70dcad87300ec669f0209277a95680862201cd14791aa31f889d167ca SHA512 17b1a3a9e3b0e25fe0b68ecaa236eb83fd847c4e1cbb25f8f8985e68878f90c16f0722faa4daed4b33e91029cdec1bb1c6fa4c6f59f987fd29d1c212d5221a70
diff --git a/app-dicts/sword-EMBReality/metadata.xml b/app-dicts/sword-EMBReality/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-EMBReality/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-EMBReality/sword-EMBReality-0.5.ebuild b/app-dicts/sword-EMBReality/sword-EMBReality-0.5.ebuild
deleted file mode 100644
index 9d4806c2c465..000000000000
--- a/app-dicts/sword-EMBReality/sword-EMBReality-0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The Reality of Prayer by E.M. Bounds"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=EMBReality"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-EMTV/Manifest b/app-dicts/sword-EMTV/Manifest
deleted file mode 100644
index 5091c0fef158..000000000000
--- a/app-dicts/sword-EMTV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST EMTV-2.2.zip 469923 BLAKE2B 16e0139fd384aae53e10023f4b125f5ca4d9c9d9e96488fc78ef78964e73b5e620c5e92ea3d1d3646edb73d7c33639db289a46451180915387481313f56d726b SHA512 4abd88a6c8ba5cbe1136923c57ab3f758b8d991d041f06b7eb309843c795a9ca62b3569e02dec069d9ea583d712b090d1eed45cd89763b3cbdfc3136881bca74
diff --git a/app-dicts/sword-EMTV/metadata.xml b/app-dicts/sword-EMTV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-EMTV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-EMTV/sword-EMTV-2.2.ebuild b/app-dicts/sword-EMTV/sword-EMTV-2.2.ebuild
deleted file mode 100644
index 491ce707a3eb..000000000000
--- a/app-dicts/sword-EMTV/sword-EMTV-2.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="English Majority Text Version, 2012 Edition with Greek Explanatory Notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=EMTV"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Easton/Manifest b/app-dicts/sword-Easton/Manifest
deleted file mode 100644
index 6815724b9aff..000000000000
--- a/app-dicts/sword-Easton/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Easton-2.0.zip 1437244 BLAKE2B 353501b9ddd98c44c436eb053fbcdf669c7983ebd8103286d4ea820eb938bed3d60e48c397c5bc9128525c35a295cbc488d8ee835b4f216b790c894f9897632c SHA512 1b9d590dfd018053f3e180d4b9ffed5bde32a1c6e60dee73df8cab81ddff876e64dfce5530d179d88fe74db72492dee563f065bce8a145b2c6543c43df6954de
diff --git a/app-dicts/sword-Easton/metadata.xml b/app-dicts/sword-Easton/metadata.xml
deleted file mode 100644
index e3abf682b867..000000000000
--- a/app-dicts/sword-Easton/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		These Dictionary topics are from M.G. Easton M.A., D.D., Illustrated Bible
-		Dictionary, Third Edition, published by Thomas Nelson, 1897. Due to the
-		nature of etext, the illustrated portions of the Dictionary have not been
-		included.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Easton/sword-Easton-2.0.ebuild b/app-dicts/sword-Easton/sword-Easton-2.0.ebuild
deleted file mode 100644
index caf6e26e7384..000000000000
--- a/app-dicts/sword-Easton/sword-Easton-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Easton's Bible Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Easton"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Elzevir/Manifest b/app-dicts/sword-Elzevir/Manifest
deleted file mode 100644
index 46a974b907b4..000000000000
--- a/app-dicts/sword-Elzevir/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Elzevir-1.3.zip 958909 BLAKE2B e906844677ca6266871a98c9109046e8f74f62e9dbe65e21e39c21ca113d54e91d958f91538f3dd38fb654465b347a7430d42e8fb8c746fd6b110666fd4ed944 SHA512 e9cde56a479c7362f059bf3ecc8614290f335b0a54d7eea8fc78713ea616e812b92835ce7b41c2827f702be54fd0602c3c3744e927a77085914f1382819fa2b8
diff --git a/app-dicts/sword-Elzevir/metadata.xml b/app-dicts/sword-Elzevir/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Elzevir/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Elzevir/sword-Elzevir-1.3.ebuild b/app-dicts/sword-Elzevir/sword-Elzevir-1.3.ebuild
deleted file mode 100644
index c1c5b2a0ba63..000000000000
--- a/app-dicts/sword-Elzevir/sword-Elzevir-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Elzevir Textus Receptus (1624)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Elzevir"
-LICENSE="CC-BY-NC-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Esperanto/Manifest b/app-dicts/sword-Esperanto/Manifest
deleted file mode 100644
index c3008cb81435..000000000000
--- a/app-dicts/sword-Esperanto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Esperanto-2.1.zip 1480284 BLAKE2B bf07295cfd9db64d1a10817cb282a8366318c00bb0b74b82a0880bfc974dec0a495c4dfc7a013261ba0251f34e6e84681b962cb4d7dcd8728c509d8b7e017d9b SHA512 b2acd4e8de6bffd5435a8d580873e5bdcaeaab367d22cccbf4ab572dac7271556188db34d838b0aef36ec8ffdf400d02840c8ed9d14add547312f7a618c20c32
diff --git a/app-dicts/sword-Esperanto/metadata.xml b/app-dicts/sword-Esperanto/metadata.xml
deleted file mode 100644
index c42a4cfe2eeb..000000000000
--- a/app-dicts/sword-Esperanto/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		1926 Londona Biblio in Esperanto. Old Testament by Ludvic Lazarus Zamenhof
-		(1910). Full text published in 1926 by the British &amp; Foreign Bible Society.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Esperanto/sword-Esperanto-2.1.ebuild b/app-dicts/sword-Esperanto/sword-Esperanto-2.1.ebuild
deleted file mode 100644
index 907416cf0aa2..000000000000
--- a/app-dicts/sword-Esperanto/sword-Esperanto-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Esperanto Londona Biblio"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Esperanto"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Est/Manifest b/app-dicts/sword-Est/Manifest
deleted file mode 100644
index efcd296d8ae5..000000000000
--- a/app-dicts/sword-Est/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Est-1.1.zip 432887 BLAKE2B 2ef8a0e8d1087239104056955601cc4c841d7739bb76bd04165f6e3d78b9677ca7d981c8367e880d41d7cec6d1340e611fd8f6283c2fb3d932574c415d503546 SHA512 851aaf208daa245caf9aad5624afe29fd89f41abbe4d2b08182a7d3ac9289533fc9dae3a556782516e6fd9ce68e87cfbd52d96ca3b110798c1d9753f82d082fd
diff --git a/app-dicts/sword-Est/metadata.xml b/app-dicts/sword-Est/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Est/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Est/sword-Est-1.1.ebuild b/app-dicts/sword-Est/sword-Est-1.1.ebuild
deleted file mode 100644
index 7adfdbe5bedf..000000000000
--- a/app-dicts/sword-Est/sword-Est-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.2"
-
-inherit sword-module
-
-DESCRIPTION="Estonian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Est"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Etheridge/Manifest b/app-dicts/sword-Etheridge/Manifest
deleted file mode 100644
index 53edc0e0caa3..000000000000
--- a/app-dicts/sword-Etheridge/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Etheridge-1.1.zip 379244 BLAKE2B ffc6092de76c828b19e091adb99df742f949ac3110061d2ce94f5d98e8f0f5dfd11de9d6c41cff965ae571265131f07c9b63e9cf32d32684f899eeb6874c4acd SHA512 b7ea32dad0ad3cc33c772444e3dae95472f9c2e8e4e35e753cd85b637e8661d7ddcc4ff75bd659c2595c4ccd7b99d8cb01845db757919ffd00af4d9500e2dba6
diff --git a/app-dicts/sword-Etheridge/metadata.xml b/app-dicts/sword-Etheridge/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Etheridge/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Etheridge/sword-Etheridge-1.1.ebuild b/app-dicts/sword-Etheridge/sword-Etheridge-1.1.ebuild
deleted file mode 100644
index 5a85d5933164..000000000000
--- a/app-dicts/sword-Etheridge/sword-Etheridge-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The Peschito Syriac New Testament: Translated into English"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Etheridge"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Eusebian_num/Manifest b/app-dicts/sword-Eusebian_num/Manifest
deleted file mode 100644
index 499d229e7efd..000000000000
--- a/app-dicts/sword-Eusebian_num/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Eusebian_num-1.1.zip 35235 BLAKE2B 59ab37967bf4b33eb96a16746b6b4327488e10f35869d059dacb3fa59da13833d17206d5720851527bd55dfa87e32e772423fecd839e88e411ab22dca1c6c809 SHA512 ff8729bbe7e9af1f0358046000489d150aaa60e6d55027bd7870a821bfb59b1618ba5e307e3c3e9e5fa00500caa3fe4def9e6c902939b19952f0275793bebdf8
diff --git a/app-dicts/sword-Eusebian_num/metadata.xml b/app-dicts/sword-Eusebian_num/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Eusebian_num/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Eusebian_num/sword-Eusebian_num-1.1.ebuild b/app-dicts/sword-Eusebian_num/sword-Eusebian_num-1.1.ebuild
deleted file mode 100644
index e3a390c3890a..000000000000
--- a/app-dicts/sword-Eusebian_num/sword-Eusebian_num-1.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Eusebian Numbers"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Eusebian_num"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-RDEPEND="!app-dicts/sword-Eusebian_vs"
diff --git a/app-dicts/sword-Eusebian_vs/Manifest b/app-dicts/sword-Eusebian_vs/Manifest
deleted file mode 100644
index f8065671638c..000000000000
--- a/app-dicts/sword-Eusebian_vs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Eusebian_vs-1.1.zip 35235 BLAKE2B 36db62c3e880bac566776a705948aa00fbb62f0e555186bfaa69790fbbc50a503bdd264f5b68677b4feaff070729af9c3d71833729c5f76ba463883ec8bafa77 SHA512 65a76880e5e844637cc6b328c9c15347fa82afa55298eca7563faab34dd889eab3dc3e2ccc2fd717f595c604e106f910060c93c3ecd584a230341b5de19e210b
diff --git a/app-dicts/sword-Eusebian_vs/metadata.xml b/app-dicts/sword-Eusebian_vs/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Eusebian_vs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Eusebian_vs/sword-Eusebian_vs-1.1.ebuild b/app-dicts/sword-Eusebian_vs/sword-Eusebian_vs-1.1.ebuild
deleted file mode 100644
index d7c9a47242a3..000000000000
--- a/app-dicts/sword-Eusebian_vs/sword-Eusebian_vs-1.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Eusebian Numbers By Verse"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Eusebian_vs"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-RDEPEND="!app-dicts/sword-Eusebian_num"
diff --git a/app-dicts/sword-FVDPVietAnh/Manifest b/app-dicts/sword-FVDPVietAnh/Manifest
deleted file mode 100644
index ad9e6a7d5dba..000000000000
--- a/app-dicts/sword-FVDPVietAnh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FVDPVietAnh-1.1.1.zip 1683189 BLAKE2B 5acecdd1ce5c0ff3bdbb19cc7a563650a6cea26f649096c98bb87752d3f6a43bd8183b2524faa0712c205c0e6aa4d96ad61be1c84fe8f3d67bb0b58be122a6b0 SHA512 a2c539cbce9bb6cf936227fb5ee38992be6659c7e7d799e98fabdf7db1588eee871983734191d555eec6ef8898c3208198264678a5805f85db01af3b38453f1b
diff --git a/app-dicts/sword-FVDPVietAnh/metadata.xml b/app-dicts/sword-FVDPVietAnh/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FVDPVietAnh/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FVDPVietAnh/sword-FVDPVietAnh-1.1.1.ebuild b/app-dicts/sword-FVDPVietAnh/sword-FVDPVietAnh-1.1.1.ebuild
deleted file mode 100644
index f37f15bdb430..000000000000
--- a/app-dicts/sword-FVDPVietAnh/sword-FVDPVietAnh-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="FVDP Vietnamese-English Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FVDPVietAnh"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Family/Manifest b/app-dicts/sword-Family/Manifest
deleted file mode 100644
index 4a064e8e21a4..000000000000
--- a/app-dicts/sword-Family/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Family-1.1.zip 561686 BLAKE2B 0c7325b5cc52352f162743745138e63dc69ce607521849d473730ea91d94881cf793453aaaf505ecf135b122159ecc4e1a15cc3021d498ef6e671516d44ee448 SHA512 8fcf5a6d2ac24459fe239039443f502f076bb6ea85182f1f95914b8d1178108c384f909095083dd2863ee8917479a8c2fee4b9ce3d597346ffb4b759905f9e55
diff --git a/app-dicts/sword-Family/metadata.xml b/app-dicts/sword-Family/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Family/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Family/sword-Family-1.1.ebuild b/app-dicts/sword-Family/sword-Family-1.1.ebuild
deleted file mode 100644
index cf2c4bbbe0bd..000000000000
--- a/app-dicts/sword-Family/sword-Family-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Family Bible Notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Family"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FarHezareNoh/Manifest b/app-dicts/sword-FarHezareNoh/Manifest
deleted file mode 100644
index 79994f388c4a..000000000000
--- a/app-dicts/sword-FarHezareNoh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FarHezareNoh-1.0.2.zip 489370 BLAKE2B 87576a9c70a58cb1f459002c39c94fdbe236a47734b2d8039c59b4f5f633a010b34f818cfe51de782117d4c01571432d65273cbc7bb607f3db6ecc499273d59c SHA512 9605ee3fd8e4157810934e8b56430328ae633321248215aa06fa2c0826c49bd72c1e935ddbc3333a824f76bc1d3a03bf38859f82e93683383f697fa740210fbc
diff --git a/app-dicts/sword-FarHezareNoh/metadata.xml b/app-dicts/sword-FarHezareNoh/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FarHezareNoh/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FarHezareNoh/sword-FarHezareNoh-1.0.2.ebuild b/app-dicts/sword-FarHezareNoh/sword-FarHezareNoh-1.0.2.ebuild
deleted file mode 100644
index 4f44c0f3d115..000000000000
--- a/app-dicts/sword-FarHezareNoh/sword-FarHezareNoh-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.10"
-
-inherit sword-module
-
-DESCRIPTION="Tarjumeh-ye Hezare Noh"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarHezareNoh"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FarOPV/Manifest b/app-dicts/sword-FarOPV/Manifest
deleted file mode 100644
index b8c6b5adc274..000000000000
--- a/app-dicts/sword-FarOPV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FarOPV-1.5.1.zip 1648106 BLAKE2B cf7223ace8962336118af9d768ccee20e2933ace2ad9a43dfd358212a98f093c43a31c4cf0cbe578366fc60fb0e817ff8cc18b6e097ee16164367b7ab6496f33 SHA512 331933ff9355effc7641e3974e7b0057090484220c1e3e2379e573c388f3e011a4135107cff862d4fa7a394a220b2abb29c4bc855008ad532e0db2144e958cdb
diff --git a/app-dicts/sword-FarOPV/metadata.xml b/app-dicts/sword-FarOPV/metadata.xml
deleted file mode 100644
index e0cabc40d457..000000000000
--- a/app-dicts/sword-FarOPV/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This translation of the Holy Bible is originally based upon Henry Martyn's
-		translation of the Bible in Persian. After repeated updates it was finally
-		published in the current form in 1896 and again, with new headlines in 1996
-		and subsequently by Elam Ministries with new headings and cross references.
-		These headlines are not included in this version. It is currently in use
-		within most Iranian and Afghani churches under the name "Tarjumeh-ye Ghadeem"
-		or "Old Translation". It is famous for its literary quality and faithfulness
-		to the original texts. Its original copyright holder, the Iranian Bible
-		Society, was dissolved by force by the Iranian post-revolutionary government
-		in 1990. In all likelihood this text is now public domain simply due to its
-		age, but users are asked to respect the International Bible Society's request
-		to use this text only in non-commercial ways until full clarity on its legal
-		status has been obtained.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-FarOPV/sword-FarOPV-1.5.1.ebuild b/app-dicts/sword-FarOPV/sword-FarOPV-1.5.1.ebuild
deleted file mode 100644
index 33bb7fa4cb78..000000000000
--- a/app-dicts/sword-FarOPV/sword-FarOPV-1.5.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Persian Holy Bible (Tarjumeh-ye Ghadeem)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarOPV"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FarTPV/Manifest b/app-dicts/sword-FarTPV/Manifest
deleted file mode 100644
index 98eed30775c2..000000000000
--- a/app-dicts/sword-FarTPV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FarTPV-1.1.2.zip 1980307 BLAKE2B d5f6261e8c70a3d7d29feb1d9d188394b1427cfada5d2d55cf802c4a6e3beadad23670e5934f68dce7f6a42fb5d24300a523735bbf2816c86f1c2219001153f6 SHA512 bd5235b4a85132ecbed2abc588c8a648af91b9e26d1bf5aca0f058bfde8859a2410b70ad4f08cfe389d928c73d88bb40090e1d55ebcf9a966b6365741498b008
diff --git a/app-dicts/sword-FarTPV/metadata.xml b/app-dicts/sword-FarTPV/metadata.xml
deleted file mode 100644
index 8936132d30d7..000000000000
--- a/app-dicts/sword-FarTPV/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Today's Persian Version. In Persian it is called "Mojdeh Baraye Asre Jadid" (Good News for A New Age). This new translation of the Bible into Persian (Farsi) has the aim to communicate the written Word of God in a way that will be easy for all people to understand. While being faithful to the original Hebrew and Greek texts of the Bible, the emphasis has been on clarity and simplicity. This translation follows the model of the wide accepted "Injil Sharif" translation of the New Testament and has been long-awaited and prayed for. May God bless all its readers richly.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-FarTPV/sword-FarTPV-1.1.2.ebuild b/app-dicts/sword-FarTPV/sword-FarTPV-1.1.2.ebuild
deleted file mode 100644
index b0596be7608e..000000000000
--- a/app-dicts/sword-FarTPV/sword-FarTPV-1.1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Today's Persian Version (Mojdeh Baraye Asre Jadid)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarTPV"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FinBiblia/Manifest b/app-dicts/sword-FinBiblia/Manifest
deleted file mode 100644
index 2205972e98da..000000000000
--- a/app-dicts/sword-FinBiblia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FinBiblia-2.1.zip 1885389 BLAKE2B d9c76d284e47a57ef1c5250ad0d7f313e6ff15ed4b3c48ef4c3036b1cb7def9d7c2a06207415afbfdd2573feadc9d85fcea6af1588e977f2df45212bb720ee32 SHA512 3afcca02b608317010f8b96dda486185cf27c59f8b1deef19ae26256c41bf9e1e44cddfaa0923d9633174a04ded5320a9ca98c57b64518fd975f65dc40a70cfa
diff --git a/app-dicts/sword-FinBiblia/metadata.xml b/app-dicts/sword-FinBiblia/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FinBiblia/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FinBiblia/sword-FinBiblia-2.1.ebuild b/app-dicts/sword-FinBiblia/sword-FinBiblia-2.1.ebuild
deleted file mode 100644
index 8ca6fa9b15a5..000000000000
--- a/app-dicts/sword-FinBiblia/sword-FinBiblia-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Finnish Biblia (1776)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinBiblia"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FinPR/Manifest b/app-dicts/sword-FinPR/Manifest
deleted file mode 100644
index df5e0b81873f..000000000000
--- a/app-dicts/sword-FinPR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FinPR-1.2.2.zip 1514653 BLAKE2B 7fd6f786bf4512851306093f90fc26ee16d3e307e8809353e3fb2e86c2db19098054555a5b60efa4933488929a3d75f0d71d2e94c4ad999d1497ea1cc8bfb838 SHA512 e3796c39cb2a500c2e94c53979c1bab11ba7a60104e67440a2a6b2458775677cdc319198ced5af4b5398fb3e97fd503b372389e687eeffcc2ad23e90ffaa3227
diff --git a/app-dicts/sword-FinPR/metadata.xml b/app-dicts/sword-FinPR/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FinPR/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FinPR/sword-FinPR-1.2.2.ebuild b/app-dicts/sword-FinPR/sword-FinPR-1.2.2.ebuild
deleted file mode 100644
index 0202e977f96f..000000000000
--- a/app-dicts/sword-FinPR/sword-FinPR-1.2.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.2"
-
-inherit sword-module
-
-DESCRIPTION="Finnish Pyhä Raamattu (1933/1938)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FinPR92/Manifest b/app-dicts/sword-FinPR92/Manifest
deleted file mode 100644
index 31fab8ca3178..000000000000
--- a/app-dicts/sword-FinPR92/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FinPR92-1.1.1.zip 1581254 BLAKE2B 0a6858e3867e4fc68f9016dd1414958f4cb1c63e419be2debe1008764e6d8f746f520c0254165dd4916c927823f5c0c3e1d9e9028d2aaacbcdde970124fecb93 SHA512 2040e20595905847fac2c409b1f7cb83b812fdd945d84aa08574c9d14bff9c5ebc7921d815492724841fc1ba73994d017839d27867d747997845b6f140167a21
diff --git a/app-dicts/sword-FinPR92/metadata.xml b/app-dicts/sword-FinPR92/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FinPR92/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FinPR92/sword-FinPR92-1.1.1.ebuild b/app-dicts/sword-FinPR92/sword-FinPR92-1.1.1.ebuild
deleted file mode 100644
index 6fd119f4c6dd..000000000000
--- a/app-dicts/sword-FinPR92/sword-FinPR92-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Finnish Pyhä Raamattu (1992)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR92"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FinRK/Manifest b/app-dicts/sword-FinRK/Manifest
deleted file mode 100644
index 773b8be85ec4..000000000000
--- a/app-dicts/sword-FinRK/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FinRK-1.8.3.zip 2111637 BLAKE2B 1bdf7726fd37debb5eef2d4c916ca3b30e6c4b5520fcac152db2643d42b7a33383d1d011de3d602d09dc999c2a627b0cf7de003e642220851039e4fafd8b4438 SHA512 391b6f2f8de92f98395ae01985a50a4e725b104b0bd4abbe08908279410a117e40ecc7e1cc5f61e8fe532fca1bfc8e97df3fd8f154eb6c67660792b8a2112e0c
diff --git a/app-dicts/sword-FinRK/metadata.xml b/app-dicts/sword-FinRK/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FinRK/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FinRK/sword-FinRK-1.8.3.ebuild b/app-dicts/sword-FinRK/sword-FinRK-1.8.3.ebuild
deleted file mode 100644
index 4cec26377fda..000000000000
--- a/app-dicts/sword-FinRK/sword-FinRK-1.8.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Raamattu Kansalle (2012)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinRK"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FinSTLK2017/Manifest b/app-dicts/sword-FinSTLK2017/Manifest
deleted file mode 100644
index bd379533c0e8..000000000000
--- a/app-dicts/sword-FinSTLK2017/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FinSTLK2017-1.3.zip 1786407 BLAKE2B f1b4c2b45c34be2bc56b9da1d8ce07745749da7bf086faa5bcec777096d345741831ce107ac92eedd672834083e2015f01bc615824405190cab2317a143d2dbb SHA512 f0972e2b48f7de85527d117424c570e33bafc6c60101a8a7d319f3003379c8c279331edbd3659050e13e87386012a5ef4c6b55faf6402e287aa4ea9f580b7302
diff --git a/app-dicts/sword-FinSTLK2017/metadata.xml b/app-dicts/sword-FinSTLK2017/metadata.xml
deleted file mode 100644
index 74479f4dd763..000000000000
--- a/app-dicts/sword-FinSTLK2017/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		The Confessional Lutheran Church of Finland has published this Finnish Bible translation for the quincentennial celebration of the Reformation. Translated from Hebrew, Aramaic and Greek by Th.D. h.c. Markku Särelä.
-	</longdescription>
-	<longdescription lang="fi">
-		Tänä luterilaisen uskonpuhdistuksen viisisataavuotisjuhlavuotena Suomen Tunnustuksellinen Luterilainen Kirkko (STLK) julkaisee uuden mahdollisimman tarkasti alkukieliin perustuvan raamatunkäännöksen. Siinä on käytetty heprean ja aramean tekstien osalta tekstijulkaisua Biblia Hebraica Stuttgartensia, Uuden testamentin osalta taas julkaisua Scrivenerin vuoden 1894 editio. Tällöin käännöksessä näkyvät myös vuoden 1938 Raamatusta poistetut sanat ja osat.
-
-		Tässä käännöksessä tuodaan otsikoissa näkyviin Kristus-lupauksia, niin että alusta lähtien lukijalle tulee selväksi Vapahtajan messiaaninen sukulinja ja luvattu Messiaan toimittama syntien sovitus ja Messias-usko. Näin olemme palanneet mm. Mikael Agricolaan ja Antti Lizeliukseen. Agricola julkaisi Uuden testamentin käännöksen suomeksi vuonna 1542 sekä myös osia Vanhasta testamentista. Koko Raamattu ilmestyi suomeksi ensi kerran vuonna 1642. Lizeliuksen käännös ilmestyi 1776. Se tunnetaan nimellä Biblia ja sitä käytetään yhä konservatiiveissa piireissä. Se kääntää oikein useita kohtia, joissa vuoden 1938 Raamattu on mennyt harhaan.
-
-		Persoonapronomineja on alkukieliä seuraten pantu näkyviin vain silloin, kun ne ovat painollisia, jos suomi ei muuta vaadi. Alaviitteissä on heprean ja kreikan sanat kursiivilla ja niiden pitkiä vokaaleja sekä klusiileja ei ole merkitty, kuten ei myöskään aakkosrunojen aakkosissa.
-
-		Käännöstyössä on hyödynnetty vuoden 1938 raamatunkäännöstä, jossa käännösvirheistä, kielen vanhentumisesta ja ylimääräisistä sanoista huolimatta on paljon käyttökelpoista ja kieleen vakiintunutta.
-
-		Palaute- ja oikolukuryhmään kuuluivat STLK:n suomenkieliset pastorit, teologian maisterit Mika Bergman, Vesa Hautala, Markus Mäkinen-Taina, Kimmo Närhi ja Dani Puolimatka sekä useita johtavia maallikkoja. Heiltä tuli monia hyviä huomioita. Lisäksi usea muu on auttanut oikoluvussa. Työn aikana DI Ilpo Rouhu auttoi tietokoneongelmissa. Graafikko Kimmo Pälikkö teki kirjan lopussa olevat graafiset liitteet. Varsinaisen käännöstyön teki pastori, TTh.c. Markku Särelä. Kaiken tämän nämä kaikki tekivät korvauksetta talkootyönä. Suuri kiitos kaikille työssä mukana olleille tästä merkittävästä ja rakentavasta panoksesta.
-
-		Kirjojen lyhyet johdannot, väliotsikot ja alaviitteet ovat kääntäjän laatimia. Perinteisiin rinnakkaispaikkaviitteisiin on tehty lisäyksiä. Hakasulkeissa olevat lisäykset ovat alkutekstin tarkoituksen selventämiseksi.
-
-		Hepreassa on kaksi eri sanaa, jotka molemmat on käännetty sanalla Herra. Näistä toinen, tetragrammi JHVH, on kirjoitettu kapiteeleilla, mutta toinen, Adonaj, tavallisin kirjaimin. Myös Jeesuksen itsestään käyttämä Jumalan nimi Minä olen on kirjoitettu kapiteeleilla.
-
-		Uskonpuhdistaja Martti Lutherin käännöksestä on ollut paljon hyötyä siitä huolimatta, että hänen käännöksensä on saksaksi. Toivomme käännöksemme tekevän osaltaan kunniaa Jumalan antamalle uskonpuhdistukselle ja koituvan hänelle kiitokseksi.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-FinSTLK2017/sword-FinSTLK2017-1.3.ebuild b/app-dicts/sword-FinSTLK2017/sword-FinSTLK2017-1.3.ebuild
deleted file mode 100644
index 63b0ad409416..000000000000
--- a/app-dicts/sword-FinSTLK2017/sword-FinSTLK2017-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Pyhä Raamattu (STLK 2017)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinSTLK2017"
-LICENSE="CC-BY-NC-ND-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Finney/Manifest b/app-dicts/sword-Finney/Manifest
deleted file mode 100644
index e536af1c0b34..000000000000
--- a/app-dicts/sword-Finney/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Finney-1.1.zip 277924 BLAKE2B 0f1193447f566a200a601205472e37c6979d241e2fc1de0c470efb9a391925ef7003c2532c7e0b5ff50d41eff923e5a430e837a1b085e84c61ab84310d3277a4 SHA512 a2bc30067f5f5d157d3fbd27cb7e9f02dbe8ed6cac4a59006afbda77dbd1c77104f7561b39f5de0dbffed29b3e9eebc3f3adc43e5f7e7a332f4d2615b965567b
diff --git a/app-dicts/sword-Finney/metadata.xml b/app-dicts/sword-Finney/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Finney/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Finney/sword-Finney-1.1.ebuild b/app-dicts/sword-Finney/sword-Finney-1.1.ebuild
deleted file mode 100644
index 1b12dee7d4b7..000000000000
--- a/app-dicts/sword-Finney/sword-Finney-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Finney"
-
-inherit sword-module
-
-DESCRIPTION="Sermons on Gospel Themes by Charles G. Finney (1792-1875)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Finney"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreAug/Manifest b/app-dicts/sword-FreAug/Manifest
deleted file mode 100644
index fe5517012ca4..000000000000
--- a/app-dicts/sword-FreAug/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreAug-1.0.zip 4363367 BLAKE2B 6c22021f73cfb7c0c3cae3604b1b5a5f6ad3b4ba24951388058533514bedb04478263e8b1e05d701f26aaed77015d89990b171331b896c32d196e4ca64edec7b SHA512 6aef468979bdcb44f3a0b5f94838e42e8f7cdf6dfeacbdbe75aa65a5e91f41ae285e35ada6ae4e3c8e684b14f5e61c262e2a6bb7100d3f7f9c7b75234f0fa980
diff --git a/app-dicts/sword-FreAug/metadata.xml b/app-dicts/sword-FreAug/metadata.xml
deleted file mode 100644
index 9d5e53bfcc6b..000000000000
--- a/app-dicts/sword-FreAug/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="fr">
-		Ce Module rassemble les différents commentaires de la Bible par Saint Augustin issue des œuvres de St Augustin traduites pour la première fois, sous la direction de M. Poujoulat et de M. l'abbé Raulx,  Bar-le-Duc, 1864-1872.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreAug/sword-FreAug-1.0.ebuild b/app-dicts/sword-FreAug/sword-FreAug-1.0.ebuild
deleted file mode 100644
index 67a1df171045..000000000000
--- a/app-dicts/sword-FreAug/sword-FreAug-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Commentaires de la Bible par Saint Augustin"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreAug"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreBBB/Manifest b/app-dicts/sword-FreBBB/Manifest
deleted file mode 100644
index 30f84f0dabfa..000000000000
--- a/app-dicts/sword-FreBBB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreBBB-1.3.zip 1578363 BLAKE2B 5175ac1cf66fda314b3e01d72717e35d16f9476315f5f37afcf074734412d4f5a6b71f9154496b1cca410c725af9aead97f10575b1f10823383c3f1ab565d0ae SHA512 71f947a6e78a1edbfc3e59cd045ec06b50767fde5a55d1868d0a3619d7d0506c23aaad9d69586f4327e3793fb02c615ecd29005d416c8b262aceff331ba0447c
diff --git a/app-dicts/sword-FreBBB/metadata.xml b/app-dicts/sword-FreBBB/metadata.xml
deleted file mode 100644
index ab4b28ff38d0..000000000000
--- a/app-dicts/sword-FreBBB/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		This Sword Bible module provides the french translation of the OT by Félix Bovet (1824-1903), and of the NT by Louis Bonnet (1805-1892). They both are extracted from a well known commentary in France and Switzerland, still very appreciated today : "La Bible annotée".
-		For practical reasons the verses reference have been modified to match the KJV one.
-	</longdescription>
-	<longdescription lang="fr">
-		Ce module Sword FreBBB est composé de la traduction française de Félix Bovet (1824-1903)  pour l'Ancien Testament,  et de Louis Bonnet pour le Nouveau. Elles sont extraites de l'ouvrage bien connu : "La Bible annotée". Toutes les deux réunissent des qualités d'exactitude et d'expression qui les rendent agréables à lire par elles-mêmes, indépendamment de leurs notes.
-		Afin de faciliter l'intégration aux logiciels bibliques, la numération des versets est celle de la King James. Claude Royère claude.royere@gmail.com http://epelorient.free.fr
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreBBB/sword-FreBBB-1.3.ebuild b/app-dicts/sword-FreBBB/sword-FreBBB-1.3.ebuild
deleted file mode 100644
index faa0e32b8f10..000000000000
--- a/app-dicts/sword-FreBBB/sword-FreBBB-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="French Bible Bovet Bonnet (1900)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBBB"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreBDM1707/Manifest b/app-dicts/sword-FreBDM1707/Manifest
deleted file mode 100644
index af79ea7d7c13..000000000000
--- a/app-dicts/sword-FreBDM1707/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreBDM1707-1.1.zip 1839165 BLAKE2B 5dc3f24b357b74138a4259df8faa4180ea1e1a1155af7d8aa0b2aa44533a6c770e198a29be759168f1d58f0247cc7f1dcc0c293d6ee3e54ac1e605a0b1894123 SHA512 dd4f4f31514d2477bf4ae5cad70d761447ed71afe4733d8dd6dd8b095b91ff40ad11609d3a60ef25f1110531d20de5d7f0f7648082a035ae1d8f7a682b0a5cca
diff --git a/app-dicts/sword-FreBDM1707/metadata.xml b/app-dicts/sword-FreBDM1707/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreBDM1707/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreBDM1707/sword-FreBDM1707-1.1.ebuild b/app-dicts/sword-FreBDM1707/sword-FreBDM1707-1.1.ebuild
deleted file mode 100644
index bd5a0d7c088f..000000000000
--- a/app-dicts/sword-FreBDM1707/sword-FreBDM1707-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="French Bible David Martin (1707)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBDM1707"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreBDM1744/Manifest b/app-dicts/sword-FreBDM1744/Manifest
deleted file mode 100644
index c6e00eaa0cf4..000000000000
--- a/app-dicts/sword-FreBDM1744/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreBDM1744-2.0.zip 1739567 BLAKE2B b1df31e8a3053553e55224bb2955546aa3603c0e66efc5ec01d49ce45633112016fc5a872072658e4433d55d5917a450b7e0b364fe09cbc1f6afe690fb6effae SHA512 c214f5f73f51ec0a38f8fb29eedcce901180aa02a5e8a0b5b8356ef4f365c6c156c5f90a40d5b9546d8031971bdaf5aee3d55699113ac0ec3899dbc0ca39a63f
diff --git a/app-dicts/sword-FreBDM1744/metadata.xml b/app-dicts/sword-FreBDM1744/metadata.xml
deleted file mode 100644
index 6a64e601e943..000000000000
--- a/app-dicts/sword-FreBDM1744/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="fr">
-		La Sainte Bible, Version David Martin 1744: Cette Bible est basée sur le
-		Textus Receptus et est très fidèle. C'est une Bible d'étude idéal, bien
-		qu'elle contienne quelques vieux mots français. Pour plus d'infos, aller
-		sur le site: www.biblemartin.com.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreBDM1744/sword-FreBDM1744-2.0.ebuild b/app-dicts/sword-FreBDM1744/sword-FreBDM1744-2.0.ebuild
deleted file mode 100644
index 1699bbaa9a16..000000000000
--- a/app-dicts/sword-FreBDM1744/sword-FreBDM1744-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="Bible David Martin (1744)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBDM1744"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreBailly/Manifest b/app-dicts/sword-FreBailly/Manifest
deleted file mode 100644
index fd34b9c6d335..000000000000
--- a/app-dicts/sword-FreBailly/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreBailly-1.3.zip 4453304 BLAKE2B 79a0e099c5d14cbcb7729caab5d9313b2b7f8c1b28e613180a7b8198a105d7a62cf9dc19d9e23c31f2802fa9922a5d71fffc399c80c4d9655177be86f66daa1d SHA512 2251bc03a1f710be9827d8eb2d7d133c920ce9db4c76a37bb1dc681092ace63249840e5fb47422c553d03cfc68370e010ce621426536626c8d638c4eee64faa7
diff --git a/app-dicts/sword-FreBailly/metadata.xml b/app-dicts/sword-FreBailly/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreBailly/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreBailly/sword-FreBailly-1.3.ebuild b/app-dicts/sword-FreBailly/sword-FreBailly-1.3.ebuild
deleted file mode 100644
index afd124885fc7..000000000000
--- a/app-dicts/sword-FreBailly/sword-FreBailly-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.9"
-
-inherit sword-module
-
-DESCRIPTION="Abbreviated Greek-French Dictionary by A. Bailly"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBailly"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreCJE/Manifest b/app-dicts/sword-FreCJE/Manifest
deleted file mode 100644
index adc4c73824dd..000000000000
--- a/app-dicts/sword-FreCJE/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreCJE-2.0.1.zip 1177259 BLAKE2B 5fa97055afe8384e6dcbda34659c56d03930918f23d965156c8cf2a20231a755f2e04e35600f2c9da2d98e75951acce0a68e5cc4ef710d4dff3ee5a7420da9d2 SHA512 7b50807fdd310225331f11e3150b5242350401749762bd3b8d65933732676a476211d7d58c818573781bd8a730b4965516eb568b215021c9733e99fbbc649326
diff --git a/app-dicts/sword-FreCJE/metadata.xml b/app-dicts/sword-FreCJE/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreCJE/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreCJE/sword-FreCJE-2.0.1.ebuild b/app-dicts/sword-FreCJE/sword-FreCJE-2.0.1.ebuild
deleted file mode 100644
index 40aaa3e37513..000000000000
--- a/app-dicts/sword-FreCJE/sword-FreCJE-2.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="Chaque jour les Écritures"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCJE"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreChry/Manifest b/app-dicts/sword-FreChry/Manifest
deleted file mode 100644
index 758652661954..000000000000
--- a/app-dicts/sword-FreChry/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreChry-1.0.zip 7759404 BLAKE2B 277860c7d2c7b617a34b90ff3b21113fe5533d0bb226cba48b610578e71c7268c93ec431df111508231160dacb97e4fa5745618f49557c2781deff91057edb33 SHA512 4415c81f56a535532273f7ba8ed665e0340c78e573a7263489a945b0d1bb3d517ccca4911bafd81ebdde0d28f21b12d83809d79519a9f82e721d3ffe45c33e7e
diff --git a/app-dicts/sword-FreChry/metadata.xml b/app-dicts/sword-FreChry/metadata.xml
deleted file mode 100644
index 4571f8a226f7..000000000000
--- a/app-dicts/sword-FreChry/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="fr">
-		Ce Module rassemble les différents commentaires de la Bible par Saint Jean Chrysostome issue des œuvres de St Jean Chrysostome traduites.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreChry/sword-FreChry-1.0.ebuild b/app-dicts/sword-FreChry/sword-FreChry-1.0.ebuild
deleted file mode 100644
index e37ae461e3f1..000000000000
--- a/app-dicts/sword-FreChry/sword-FreChry-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Commentaires de la Bible par Saint Jean Chrysostome"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreChry"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreCrampon/Manifest b/app-dicts/sword-FreCrampon/Manifest
deleted file mode 100644
index 42135303bea5..000000000000
--- a/app-dicts/sword-FreCrampon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreCrampon-3.0.zip 2097817 BLAKE2B 22c47da09251b3f5f187347e8d3f07d63a49232268e1bb2765189d045d5e22b31b570582248ed213079c4ceb602582410b64ea3f76d8c5aec981a3644829a3e5 SHA512 24337f7b718c3aefe7c38ebc44aa98666c5748f493bbf80314a73fa885606f89ee08a48b8cfaa475b32e8ec68eec375c41e91ed61637186bf080e41927655799
diff --git a/app-dicts/sword-FreCrampon/metadata.xml b/app-dicts/sword-FreCrampon/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreCrampon/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreCrampon/sword-FreCrampon-3.0.ebuild b/app-dicts/sword-FreCrampon/sword-FreCrampon-3.0.ebuild
deleted file mode 100644
index 0dff482f389a..000000000000
--- a/app-dicts/sword-FreCrampon/sword-FreCrampon-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="La Bible Augustin Crampon 1923"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrampon"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreDAW/Manifest b/app-dicts/sword-FreDAW/Manifest
deleted file mode 100644
index 06ff3805cd0f..000000000000
--- a/app-dicts/sword-FreDAW/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreDAW-1.2.1.zip 7336441 BLAKE2B fa721bd02bacbf3b64d5d9244bb9c3a7505b9f3abc4df87fdab92a2c6aa581ed4f306909d8990d88c7dfab8496858b0d3104c7122b8777b77ea96e352da73bac SHA512 ee98a4c2cb171cf5a113c670723c6559c8e5727c41537269c543b783a8fb71922dfd210219f1e7c83b56eb4ccd1c93d742b7f4b192a049de2d63f01ad6a3d08e
diff --git a/app-dicts/sword-FreDAW/metadata.xml b/app-dicts/sword-FreDAW/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreDAW/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreDAW/sword-FreDAW-1.2.1.ebuild b/app-dicts/sword-FreDAW/sword-FreDAW-1.2.1.ebuild
deleted file mode 100644
index ef3d769108b3..000000000000
--- a/app-dicts/sword-FreDAW/sword-FreDAW-1.2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Dictionnaire encyclopédique de la Bible A. Westphal (1932)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreDAW"
-LICENSE="crosswire free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreGBM/Manifest b/app-dicts/sword-FreGBM/Manifest
deleted file mode 100644
index f757c9be262b..000000000000
--- a/app-dicts/sword-FreGBM/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreGBM-1.0.zip 40135 BLAKE2B 0e6e03df4983ab58260fd75ebd54f10e6a2bd9504449476328d41d216ca649187ff53dc7c6c9d00c2db0a9453e837152f000f6b222207bc76522035782ccdfe5 SHA512 ea0e745d928ab7b142796ab7cacaf3ad351c1df41dff4ed299e97374b6371c4e30532da3a06b7db766d3b1b2e97772280b99fa2c5e7a30c8c2a23c6647378f87
diff --git a/app-dicts/sword-FreGBM/metadata.xml b/app-dicts/sword-FreGBM/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreGBM/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreGBM/sword-FreGBM-1.0.ebuild b/app-dicts/sword-FreGBM/sword-FreGBM-1.0.ebuild
deleted file mode 100644
index e95be4e975b0..000000000000
--- a/app-dicts/sword-FreGBM/sword-FreGBM-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Glossary of the Bible David Martin 1744"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreGBM"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreGeneve1669/Manifest b/app-dicts/sword-FreGeneve1669/Manifest
deleted file mode 100644
index a2c80302a041..000000000000
--- a/app-dicts/sword-FreGeneve1669/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreGeneve1669-1.0.3.zip 412938 BLAKE2B a35a14396b1b2d66fa0a419b7b9ba7f578db91c001c442f6478c6526a450bf3682bca670c8ca27083140a91c819534e7ae2876ab7ef1f26075383bd556ce1bd0 SHA512 f3e8b7369a12cf442c811229130bbfdf9889de66bf26372f971b3af5680cd98c15b5957bc1e0eb5cf75d51e93c73bd2daecabf610aefe085b04bf12779bf7c43
diff --git a/app-dicts/sword-FreGeneve1669/metadata.xml b/app-dicts/sword-FreGeneve1669/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreGeneve1669/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreGeneve1669/sword-FreGeneve1669-1.0.3.ebuild b/app-dicts/sword-FreGeneve1669/sword-FreGeneve1669-1.0.3.ebuild
deleted file mode 100644
index 38e6229f1893..000000000000
--- a/app-dicts/sword-FreGeneve1669/sword-FreGeneve1669-1.0.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Le Nouveau Testament de la Bible de Genève de 1669"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreGeneve1669"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreJND/Manifest b/app-dicts/sword-FreJND/Manifest
deleted file mode 100644
index 73cdb60c2949..000000000000
--- a/app-dicts/sword-FreJND/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreJND-1.24.zip 2016489 BLAKE2B ddfbc4abccaa90c7b5a01212077e9587e4027d9789849c86eca3adf340d3db47b1bc923311127a97dd1d41dfbe06d53194d38303bf2d51d3759d2754dc8c29f5 SHA512 f050cd4f6fbb691909ed4a81e3eb39143b1a8c9c6ec6212e6e57ad4b523b6b0f1da4d5f2c21b9d81baff84edcbbb476c98cf42adfbd836df135f3fa8a2f6cd8e
diff --git a/app-dicts/sword-FreJND/metadata.xml b/app-dicts/sword-FreJND/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreJND/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreJND/sword-FreJND-1.24.ebuild b/app-dicts/sword-FreJND/sword-FreJND-1.24.ebuild
deleted file mode 100644
index 1c98d6931e71..000000000000
--- a/app-dicts/sword-FreJND/sword-FreJND-1.24.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="Bible J.N.Darby en français (1975)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreJND"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreKhan/Manifest b/app-dicts/sword-FreKhan/Manifest
deleted file mode 100644
index 9e057dcee9ca..000000000000
--- a/app-dicts/sword-FreKhan/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreKhan-1.0.2.zip 1271070 BLAKE2B f34a4b2f1d31b1c9e3113c4e251e4e23d17b91dd82bf98e5a8f77515e20b73bab28084864f2a737449581462b9c3f76bae48a61791fecd7d9f400aea8f61f539 SHA512 2f3589673fe8e2398d33f69f7350b588944b9623ea5e3a8ba5b74cc21ab86591f63a45512b718836dc66637ce52574c9fe8be763553dd092868830f313069efb
diff --git a/app-dicts/sword-FreKhan/metadata.xml b/app-dicts/sword-FreKhan/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreKhan/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreKhan/sword-FreKhan-1.0.2.ebuild b/app-dicts/sword-FreKhan/sword-FreKhan-1.0.2.ebuild
deleted file mode 100644
index f7408a09f4c0..000000000000
--- a/app-dicts/sword-FreKhan/sword-FreKhan-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="La Bible de Zadoc Khan"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreKhan"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreLSN1872/Manifest b/app-dicts/sword-FreLSN1872/Manifest
deleted file mode 100644
index 0ec2e3de071e..000000000000
--- a/app-dicts/sword-FreLSN1872/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreLSN1872-1.0.zip 1720200 BLAKE2B 157fa598a1ea895e1bda4b3b953ceafba884d1937d5c97c19636d4a7019d676a8671d040b1de5587a8d4d04dbead250fbcb62402e63dc0763a9fc3796fdb8bf4 SHA512 f8daf56f64a1a70a438fcf1d68324919c2c5fd7dde74ff583c33e4534c510029cb31e005260c734402569fc20ab389f9e5b9750209dc4302c90538794bfcc574
diff --git a/app-dicts/sword-FreLSN1872/metadata.xml b/app-dicts/sword-FreLSN1872/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreLSN1872/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreLSN1872/sword-FreLSN1872-1.0.ebuild b/app-dicts/sword-FreLSN1872/sword-FreLSN1872-1.0.ebuild
deleted file mode 100644
index 7edea384cfe6..000000000000
--- a/app-dicts/sword-FreLSN1872/sword-FreLSN1872-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="Bible de Lausanne (1872)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSN1872"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreLXX/Manifest b/app-dicts/sword-FreLXX/Manifest
deleted file mode 100644
index 909411a864bc..000000000000
--- a/app-dicts/sword-FreLXX/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreLXX-1.1.zip 1540524 BLAKE2B a026a5fab9517134beb498d76182928badcc22275b827f60db007b9762c834a5a06b1e851407822980ffa2f38a874f2319ee393f422f2f66e526671283928b9c SHA512 c566506b91d30e8d603b9a2084fd5f189357018b17ed9e23d6de7652ea5de6a30e19112deabc0480d1fa52eb7385a4c016ff899ef426739497caf03213a49c4b
diff --git a/app-dicts/sword-FreLXX/metadata.xml b/app-dicts/sword-FreLXX/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreLXX/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreLXX/sword-FreLXX-1.1.ebuild b/app-dicts/sword-FreLXX/sword-FreLXX-1.1.ebuild
deleted file mode 100644
index cd90f361c802..000000000000
--- a/app-dicts/sword-FreLXX/sword-FreLXX-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Traduction de la LXX par P. GIGUET et autres traducteurs, 1872"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLXX"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreOltramare1874/Manifest b/app-dicts/sword-FreOltramare1874/Manifest
deleted file mode 100644
index a49a95df3594..000000000000
--- a/app-dicts/sword-FreOltramare1874/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreOltramare1874-1.0.3.zip 416255 BLAKE2B 00920c818840299b1529ec3c6a258bc1a2c0187c5855d4fc0a76bc95bedf159d753eadfdc558f14752961219793e5889ea222ba7862957a53b3683c76b22af39 SHA512 2d5e484b92840b98f9ba2bea87dd0af9c9e3547f97881d222c986b4e280db44d6294da2ebbf381bba0c5b2988c9e11d669fab2c52a1be46e35922f40c65aa293
diff --git a/app-dicts/sword-FreOltramare1874/metadata.xml b/app-dicts/sword-FreOltramare1874/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreOltramare1874/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreOltramare1874/sword-FreOltramare1874-1.0.3.ebuild b/app-dicts/sword-FreOltramare1874/sword-FreOltramare1874-1.0.3.ebuild
deleted file mode 100644
index e1a0300fda2b..000000000000
--- a/app-dicts/sword-FreOltramare1874/sword-FreOltramare1874-1.0.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Le Nouveau Testament Version Oltramare 1874"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreOltramare1874"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FrePGR/Manifest b/app-dicts/sword-FrePGR/Manifest
deleted file mode 100644
index 115cb05f1186..000000000000
--- a/app-dicts/sword-FrePGR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FrePGR-1.2.zip 1711691 BLAKE2B 26939c46e7ed4636063a09589ef7c694086211751871e87bb085532a8d284e390e9dbbd97d5544c264ff802019eafec1e161198793533c404ef50cfcef263af6 SHA512 e2720e6b6a499a5c080c3fbdcd276b55cf2467ac773ffd1124507731bbd50454fabf8dbf56926e83b58e19e6dab5cd2557dc4ccb99156db860ebe3950d528864
diff --git a/app-dicts/sword-FrePGR/metadata.xml b/app-dicts/sword-FrePGR/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FrePGR/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FrePGR/sword-FrePGR-1.2.ebuild b/app-dicts/sword-FrePGR/sword-FrePGR-1.2.ebuild
deleted file mode 100644
index c86068836f2c..000000000000
--- a/app-dicts/sword-FrePGR/sword-FrePGR-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Bible Perret-Gentil et Rilliet"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FrePGR"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FrePilgrim/Manifest b/app-dicts/sword-FrePilgrim/Manifest
deleted file mode 100644
index b7c376df168a..000000000000
--- a/app-dicts/sword-FrePilgrim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FrePilgrim-1.0.zip 121199 BLAKE2B 071cabd7b3b3290d975d0c76b821f0bfb3881820ea64ff20f1ffb507608dbebef160b8e42e3ebebeb7d03248eb7c7a0db75b1d78dae5ee6ff91bbf1151668a2e SHA512 cc0ba68c8cf72ccbbe7c75aa06aa5a73ee8b4702a238ee8a58ded264ab0508a3720c904d78b46cf63c0e1c712382c7c956f0d3b7edfa13bd4ead576217746f6d
diff --git a/app-dicts/sword-FrePilgrim/metadata.xml b/app-dicts/sword-FrePilgrim/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FrePilgrim/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FrePilgrim/sword-FrePilgrim-1.0.ebuild b/app-dicts/sword-FrePilgrim/sword-FrePilgrim-1.0.ebuild
deleted file mode 100644
index d6030dc75f06..000000000000
--- a/app-dicts/sword-FrePilgrim/sword-FrePilgrim-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Pilgrim's Progress in French"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FrePilgrim"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreSegond1910/Manifest b/app-dicts/sword-FreSegond1910/Manifest
deleted file mode 100644
index 0b48db2d4c10..000000000000
--- a/app-dicts/sword-FreSegond1910/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreSegond1910-3.1.zip 1538856 BLAKE2B a67e77e014f467452d6775d4786aa9a1be9ee108fd6a0724e56ed790b88901125ed36f64f128a798f4fb987da7e3dc1755a64f8781a3526649444f65a7365560 SHA512 1e9b029d1cee5f1bb00d50905bbcf5617d7f9573a6d16db811b1220e83c082a38b34ea8fa5271a8b53711ce0cd78bbab7b9a5c74e46524948ca2a620b9f91aa7
diff --git a/app-dicts/sword-FreSegond1910/metadata.xml b/app-dicts/sword-FreSegond1910/metadata.xml
deleted file mode 100644
index ab2ba12be6e2..000000000000
--- a/app-dicts/sword-FreSegond1910/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="fr">
-		La Sainte Bible - Traduction de Louis Segond - (1910)
-
-		En 1874, suite à une commande de la Compagnie des Pasteurs de Genève,
-		parait la traduction de l’Ancien Testament par Louis Segond, pasteur
-		et théologien (1810-1885).
-		Une traduction précise dans un français toujours très correct, une grande
-		clarté dans l’expression expliquent le succès de son travail. Louis Segond
-		traduit ensuite le Nouveau Testament et la Bible complète parait en 1880.
-		Révisée plusieurs fois depuis, elle est devenue la Bible la plus largement
-		répandue dans les milieux protestants de langue française.
-		Source: http://richardlemay.com, avec lʼautorisation de Richard Lemay.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreSegond1910/sword-FreSegond1910-3.1.ebuild b/app-dicts/sword-FreSegond1910/sword-FreSegond1910-3.1.ebuild
deleted file mode 100644
index 4ddaae9c7d0a..000000000000
--- a/app-dicts/sword-FreSegond1910/sword-FreSegond1910-3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="French Bible Louis Segond (1910)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSegond1910"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreStapfer1889/Manifest b/app-dicts/sword-FreStapfer1889/Manifest
deleted file mode 100644
index 3f74edec4f94..000000000000
--- a/app-dicts/sword-FreStapfer1889/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreStapfer1889-1.0.2.zip 423774 BLAKE2B dbc31a9a0943cf6204d80c4e8958da86542a3623582ffd2de006f3c06c19c4b64f06c0d75761e19e5d5a73ee233cda8f92439fe89a82561cc166de0edafca048 SHA512 e840a5a44aaf45341eb296e4faf9fdf237a7017f4de1caeb062ddba425089efbbe5fcd241277e2e8d76775a52110e9c788fdb67248b5f749aa01db5f2159d99b
diff --git a/app-dicts/sword-FreStapfer1889/metadata.xml b/app-dicts/sword-FreStapfer1889/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreStapfer1889/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreStapfer1889/sword-FreStapfer1889-1.0.2.ebuild b/app-dicts/sword-FreStapfer1889/sword-FreStapfer1889-1.0.2.ebuild
deleted file mode 100644
index 00ca9d7da159..000000000000
--- a/app-dicts/sword-FreStapfer1889/sword-FreStapfer1889-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Le Nouveau Testament traduction de Stapfer - 1889"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreStapfer1889"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-FreSynodale1921/Manifest b/app-dicts/sword-FreSynodale1921/Manifest
deleted file mode 100644
index 20f824e5fd59..000000000000
--- a/app-dicts/sword-FreSynodale1921/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FreSynodale1921-1.0.3.zip 508496 BLAKE2B 2a8e272f1aceae79b7a862ff4f0b6bcca175b8327a5eee2b396858640cd9c009af983d27dda0bce3da9a37fe6cd67368cf7de8849c89761134cfd9a95657aca8 SHA512 98ad70528bd4f73e2a617e58608389885c8ece5d148dad760a1aefef436e3a0227ce9d14a35acf71dfe2359f09c050231791c04853bc3a4aa76816e6f97b9bce
diff --git a/app-dicts/sword-FreSynodale1921/metadata.xml b/app-dicts/sword-FreSynodale1921/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-FreSynodale1921/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-FreSynodale1921/sword-FreSynodale1921-1.0.3.ebuild b/app-dicts/sword-FreSynodale1921/sword-FreSynodale1921-1.0.3.ebuild
deleted file mode 100644
index a42f60136cd5..000000000000
--- a/app-dicts/sword-FreSynodale1921/sword-FreSynodale1921-1.0.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Le Nouveau Testament Version Synodale 1921 et le livre des Psaumes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSynodale1921"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Geez/Manifest b/app-dicts/sword-Geez/Manifest
deleted file mode 100644
index c0a800debfb5..000000000000
--- a/app-dicts/sword-Geez/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Geez-1.0.1.zip 487422 BLAKE2B e64c55b1f9a74e5b990db7c030b6a086c6e75f47b45889d69f9b2bcd19628dda290b50aa2624421770b9027af10c3fb635951c1fa4e835714d90654d84381e4d SHA512 2f529282292fcb9f3cddf85782d31608b0446ce6bf445d384e0ef11c0cf336135a9976a703e2743164cf490def547703f44c3a21d15eba6a5db2bff8eaabcb94
diff --git a/app-dicts/sword-Geez/metadata.xml b/app-dicts/sword-Geez/metadata.xml
deleted file mode 100644
index 314ae0c86755..000000000000
--- a/app-dicts/sword-Geez/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Biblia Veteris Testamenti Aethiopica The Ge’ez Old Testament comprised of the Augustus Dillmann’s Ethiopic Octateuch and Hiob Ludolf’s Psalter, digitized by Ran HaCohen
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Geez/sword-Geez-1.0.1.ebuild b/app-dicts/sword-Geez/sword-Geez-1.0.1.ebuild
deleted file mode 100644
index 11857759d9bc..000000000000
--- a/app-dicts/sword-Geez/sword-Geez-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Ge’ez Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geez"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Geneva/Manifest b/app-dicts/sword-Geneva/Manifest
deleted file mode 100644
index a51fc9743e1c..000000000000
--- a/app-dicts/sword-Geneva/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Geneva-1.1.zip 1680206 BLAKE2B 1f4ab1f61b12a4fe9f7382be9445799e292f89cf61252688c79d5d09227927317f21cb6d722a63de51cdca32126522cd24a32727939410207de9b9a76b6c2110 SHA512 9bcc2760f6e7a620a6b625f7a01166510daed7bb0b5ec9cddb534f4d2c8b4cc95e15543e725346ca43b66d3e032be72da43dfdc078c8c7579e4f58dd66aaafd9
diff --git a/app-dicts/sword-Geneva/metadata.xml b/app-dicts/sword-Geneva/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Geneva/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Geneva/sword-Geneva-1.1.ebuild b/app-dicts/sword-Geneva/sword-Geneva-1.1.ebuild
deleted file mode 100644
index 3d2a88cc49ef..000000000000
--- a/app-dicts/sword-Geneva/sword-Geneva-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Geneva"
-
-inherit sword-module
-
-DESCRIPTION="Geneva Bible Translation Notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Geneva1599/Manifest b/app-dicts/sword-Geneva1599/Manifest
deleted file mode 100644
index aed860fe7107..000000000000
--- a/app-dicts/sword-Geneva1599/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Geneva1599-2.0.zip 1535614 BLAKE2B 16805bc79979363440855f4178f580e8bb48281eee15e480051e770a423e2d147aaa0b3cc391a4eee71fbbe6e34a684efb57cf98b1573ef6a794ca7d47d2a1b5 SHA512 d33af875c7e06074d1ceb5777e863097df0c8b3df9b1637975e5e3e0310dac3ee0e9ec51a3deb82da92ddb154808ad7902db7c1d22aeee68bb5201d1b2a6fc99
diff --git a/app-dicts/sword-Geneva1599/metadata.xml b/app-dicts/sword-Geneva1599/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Geneva1599/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Geneva1599/sword-Geneva1599-2.0.ebuild b/app-dicts/sword-Geneva1599/sword-Geneva1599-2.0.ebuild
deleted file mode 100644
index 2bf275dcf518..000000000000
--- a/app-dicts/sword-Geneva1599/sword-Geneva1599-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Geneva Bible (1599)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva1599"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerAlbrecht/Manifest b/app-dicts/sword-GerAlbrecht/Manifest
deleted file mode 100644
index 1592a12e7dcc..000000000000
--- a/app-dicts/sword-GerAlbrecht/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerAlbrecht-1.5.zip 1020277 BLAKE2B 0a94e8a169b61ab977b03d4f58e64fd135735fdb32375e5de4cfab3260d302be11585f8f5273ef914a2b3577317c549857ff3abbfd0ee33c94d10a2cae451920 SHA512 8ec94b998dcd5e16064958e388c3cdb7e19f747f924827bd8a03275c2ab17078038cc7ffb2d172a1c4eff2cb76c66e2cfd84136dbb90afaf1fcf4fd23e421d25
diff --git a/app-dicts/sword-GerAlbrecht/metadata.xml b/app-dicts/sword-GerAlbrecht/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerAlbrecht/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerAlbrecht/sword-GerAlbrecht-1.5.ebuild b/app-dicts/sword-GerAlbrecht/sword-GerAlbrecht-1.5.ebuild
deleted file mode 100644
index 374f50f9f1b9..000000000000
--- a/app-dicts/sword-GerAlbrecht/sword-GerAlbrecht-1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="German Albrecht Neues Testament und Psalmen"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAlbrecht"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerAugustinus/Manifest b/app-dicts/sword-GerAugustinus/Manifest
deleted file mode 100644
index 65863513e3e9..000000000000
--- a/app-dicts/sword-GerAugustinus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerAugustinus-1.5.zip 254435 BLAKE2B 2ac9c0236d2cb5c55b09e4f4b8f81c38f307e18af487bed2010995f3eef206282235b4c38142be4a4ec317eb8d9100da934879c44f605538d3277c87ae08711f SHA512 1c68cf5df559533801a2516f6b4eb740e54c370e403f5a11c00a3b5cdc79e742e3e65a9b9ae696a526547e17a4a85362d351996b4bd45df4205bd22149007674
diff --git a/app-dicts/sword-GerAugustinus/metadata.xml b/app-dicts/sword-GerAugustinus/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerAugustinus/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerAugustinus/sword-GerAugustinus-1.5.ebuild b/app-dicts/sword-GerAugustinus/sword-GerAugustinus-1.5.ebuild
deleted file mode 100644
index e7259fe89ec5..000000000000
--- a/app-dicts/sword-GerAugustinus/sword-GerAugustinus-1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.3"
-
-inherit sword-module
-
-DESCRIPTION="Augustines Confessions (German)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAugustinus"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerBoLut/Manifest b/app-dicts/sword-GerBoLut/Manifest
deleted file mode 100644
index 1bb0995ae45c..000000000000
--- a/app-dicts/sword-GerBoLut/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerBoLut-3.0.zip 1538193 BLAKE2B d509adbc49e559aebc9d3d59daac5470fdc1513c8e0bd63bc67a8916df6a1d2d0c1bdf9fa65ffb4edb2b67e37cf34898d3da763a7474cc5b839cc26f17a389b1 SHA512 9bd00550020ea22d1565bfe67ddfcf9dfaf73d72a35c8e8ffbce7d5cefcdf44817246b1b10d088f9e5bda8ca542542c2d39428988e2b0855639c5585194d390f
diff --git a/app-dicts/sword-GerBoLut/metadata.xml b/app-dicts/sword-GerBoLut/metadata.xml
deleted file mode 100644
index 011d885d5858..000000000000
--- a/app-dicts/sword-GerBoLut/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="de">
-		Lutherbibel 1545.
-
-		Dieser Text wurde von Michael Bolsinger als "original Lutherbibel 1545" veröffentlicht, so wohl gedruckt wie im Internet, und ist noch heute unter dieser Bezeichnung zuweilen im Netz zu finden. Aber Bolsingers Text ist nicht der Text der Lutherbibel von 1545, sondern basiert auf einer Ausgabe der Cansteinschen Bibelanstalt, mit modernisierter Rechtschreibung und Zeichensetzung. Wie alle Lutherbibel ab ca.1600 enthält er das "Comma Johanneum" in 1.Jh 5,7-9 (das in keiner Ausgabe von Luthers Hand enthalten ist).
-
-		Lizenz: Public Domain (gemeinfrei). In elektronischer Form von Michael Bolsinger veröffentlicht auf http://www.luther-bibel-1545.de (inzwischen offline). Gegenwärtig (2021) erhältlich auf http://luther1545.org/luther-bibel.
-	</longdescription>
-	<longdescription lang="en">
-		Luther Bible 1545.
-
-		This text was published by Michael Bolsinger as the "original Luther Bible 1545", both in print and on the Internet, and can still be found on the Internet under this name at times. But Bolsingerߴs text is not the text of the Luther Bible from 1545, but is based on an edition of the Canstein Bible Institute, with modernized spelling and punctuation. Like all Luther Bibles from around 1600, it contains the "Comma Johanneum" in 1st century 5: 7-9 (which is not included in any edition of Lutherߴs hand).
-
-		License: Public Domain. Published in electronic form by Michael Bolsinger at http://www.luther-bibel-1545.de (now offline). Currently (2021) available at http://luther1545.org/luther-bibel.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerBoLut/sword-GerBoLut-3.0.ebuild b/app-dicts/sword-GerBoLut/sword-GerBoLut-3.0.ebuild
deleted file mode 100644
index 96fd4df1a998..000000000000
--- a/app-dicts/sword-GerBoLut/sword-GerBoLut-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Deutsch Bolsingerߴs Luther 1545 Bibel (moderne Rechtschreibung)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerBoLut"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerElb1871/Manifest b/app-dicts/sword-GerElb1871/Manifest
deleted file mode 100644
index 7fa761515ea3..000000000000
--- a/app-dicts/sword-GerElb1871/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerElb1871-1.2.zip 1749307 BLAKE2B b699eec36f3f8294a372d2c23b8dce3e2055b1840b1f57fe2dd9e30ab99531c05046586dead63bb7b7a1c0e68c8b81af40b438d8f3f4860b73a640553d1877e3 SHA512 f5ea9ed51884166f4fcb11d597faa6783040717012c29750d0ac823aa73fb7ac69848404837e5b8e99cde68e57cd202322f40d8557da2b45fc39d4bb52c5815b
diff --git a/app-dicts/sword-GerElb1871/metadata.xml b/app-dicts/sword-GerElb1871/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerElb1871/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerElb1871/sword-GerElb1871-1.2.ebuild b/app-dicts/sword-GerElb1871/sword-GerElb1871-1.2.ebuild
deleted file mode 100644
index f9b2c3f79133..000000000000
--- a/app-dicts/sword-GerElb1871/sword-GerElb1871-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="German Elberfelder (1871)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1871"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerElb1905/Manifest b/app-dicts/sword-GerElb1905/Manifest
deleted file mode 100644
index 4ce6e7da25b2..000000000000
--- a/app-dicts/sword-GerElb1905/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerElb1905-1.6.zip 1585058 BLAKE2B b3e69615e60efa42d450579e810e5c15c87e9d459fbff1d3b0f20a84fdad19209ad8d9cddfe2db65e76175237f223eda2bbad5e6ee4517337109a7d1b1b3d0bb SHA512 85260d9e403c09c6d5653a60e11097306fed21fe653850678f17c357cc66303aba66b591e21bebba0b43dde92b1093c9bdcb5d7e3c63a34d3edac8e3497d6a8d
diff --git a/app-dicts/sword-GerElb1905/metadata.xml b/app-dicts/sword-GerElb1905/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerElb1905/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerElb1905/sword-GerElb1905-1.6.ebuild b/app-dicts/sword-GerElb1905/sword-GerElb1905-1.6.ebuild
deleted file mode 100644
index 2d1701a5c396..000000000000
--- a/app-dicts/sword-GerElb1905/sword-GerElb1905-1.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="German Darby Unrevidierte Elberfelder (1905)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1905"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerGruenewald/Manifest b/app-dicts/sword-GerGruenewald/Manifest
deleted file mode 100644
index f8e4ffa9a0ac..000000000000
--- a/app-dicts/sword-GerGruenewald/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerGruenewald-1.5.zip 1596123 BLAKE2B d5c6d4b7cf83002b98d83c3ac7f2baa9dd983ff0c23c1d505548f481c2302fc184329ac9186d3016710fdd9d05d3038fa58c133d522813249b84f8b8a6472ab3 SHA512 c1172a5737a5aabefd341d1305c11bc7e029457903ba3719ac4d05c0d927b9392e4c9fff3770847834ce123dd29f9aedf4357eaa8bb13d978a2f8f25ab56f67e
diff --git a/app-dicts/sword-GerGruenewald/metadata.xml b/app-dicts/sword-GerGruenewald/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerGruenewald/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerGruenewald/sword-GerGruenewald-1.5.ebuild b/app-dicts/sword-GerGruenewald/sword-GerGruenewald-1.5.ebuild
deleted file mode 100644
index 30e2087ad35f..000000000000
--- a/app-dicts/sword-GerGruenewald/sword-GerGruenewald-1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1924 Grünewaldbibel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerGruenewald"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerHfa2002/Manifest b/app-dicts/sword-GerHfa2002/Manifest
deleted file mode 100644
index dc5272862743..000000000000
--- a/app-dicts/sword-GerHfa2002/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerHfa2002-1.1.zip 2215852 BLAKE2B dd159ccd4019dfb3aaf3d6c67cfb953795aaeb95cd6f324f87cd5d5b78caa0cb76fd8eb191e4aabc94c1b0ca394bd6049de74949272daa95a709277cf1c3fbfe SHA512 2fe2f0f05401ee27ed81bad978e641997a89a32ff4393c51476d106cafe9697751ea3bd885d41d8d7739801ac16be391632a20fc70bc739da1a5ebd1d869d408
diff --git a/app-dicts/sword-GerHfa2002/metadata.xml b/app-dicts/sword-GerHfa2002/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerHfa2002/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild b/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
deleted file mode 100644
index 177539c8bc6a..000000000000
--- a/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.6"
-
-inherit sword-module
-
-DESCRIPTION="Hoffnung fuer alle - Die Bibel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfa2002"
-LICENSE="sword-GerHfa2002"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "This SWORD module is locked. If you haven't done so yet, please visit"
-		elog
-		elog "https://crosswire.org/sword/modules/registration/gerhfa2002.jsp"
-		elog "(in German only)"
-		elog
-		elog "for information about purchasing and installing an unlock key."
-	fi
-}
diff --git a/app-dicts/sword-GerHfaLex2002/Manifest b/app-dicts/sword-GerHfaLex2002/Manifest
deleted file mode 100644
index 9936c5b2b02e..000000000000
--- a/app-dicts/sword-GerHfaLex2002/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerHfaLex2002-1.0.1.zip 45837 BLAKE2B e4f16c3284a0a58fc503d1b8fb3b6dc23a25a9b50f33eedd38d8eaabff258defc3365cfc5944fb1a4b6a88088726108a3f570da78d6ff55d801cdc279472d09a SHA512 5793c54f66cb6ca13393aefbb87d687fc2c34a5eabf17d38a8d426e441c7e8b72cccdd32d579a670ad23d742c922135c6cce58039e28a3ffb3fcfee4ab0c9c8b
diff --git a/app-dicts/sword-GerHfaLex2002/metadata.xml b/app-dicts/sword-GerHfaLex2002/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerHfaLex2002/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild b/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
deleted file mode 100644
index 51ea6c5c67a0..000000000000
--- a/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.6"
-
-inherit sword-module
-
-DESCRIPTION="Hoffnung fuer alle - Worterklaerungen"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfaLex2002"
-LICENSE="sword-GerHfa2002"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "This SWORD module is locked. If you haven't done so yet, please visit"
-		elog
-		elog "https://crosswire.org/sword/modules/registration/gerhfa2002.jsp"
-		elog "(in German only)"
-		elog
-		elog "for information about purchasing and installing an unlock key."
-	fi
-}
diff --git a/app-dicts/sword-GerKingComm/Manifest b/app-dicts/sword-GerKingComm/Manifest
deleted file mode 100644
index 981fbe3ddb50..000000000000
--- a/app-dicts/sword-GerKingComm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerKingComm-1.0.zip 6396345 BLAKE2B db1395beed3c08b76c0a70ef0d90eeab8e38839bbc9e35cc1ba09b7271898feb028b6503f64c8099a81cbd274065e8803e9f4c876a63a6b79f37f74a7bbca434 SHA512 0439bc349dd1b3c5e0b088ce258f867d251ee3eaf202716362b212f884b9c44128f2943de45ed2870b16e1f4043e86eb17c278f8804d8cdcedf61d32e1f62927
diff --git a/app-dicts/sword-GerKingComm/metadata.xml b/app-dicts/sword-GerKingComm/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerKingComm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerKingComm/sword-GerKingComm-1.0.ebuild b/app-dicts/sword-GerKingComm/sword-GerKingComm-1.0.ebuild
deleted file mode 100644
index a7418a505b77..000000000000
--- a/app-dicts/sword-GerKingComm/sword-GerKingComm-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Kingcomments (German), Kommentar zur ganzen Bibel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerKingComm"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerLeoNA28/Manifest b/app-dicts/sword-GerLeoNA28/Manifest
deleted file mode 100644
index cff5944d44a8..000000000000
--- a/app-dicts/sword-GerLeoNA28/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerLeoNA28-1.2.1.zip 1583052 BLAKE2B 6b79fc1aeacb051abba80c15313b42acaa83c4838a760355baac0cd6ec1203c6b47cf0384353233048b0557068768db17a851455b11e281279ed75aa4d46d7ad SHA512 1b825626ebb259e796dbb637c52305b35fb04de26ab58a32747d6984196226ba7e84577cc4138875bcf74eaf7f52cfd7c723df197b086803d3f0548b7edb6b81
diff --git a/app-dicts/sword-GerLeoNA28/metadata.xml b/app-dicts/sword-GerLeoNA28/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerLeoNA28/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerLeoNA28/sword-GerLeoNA28-1.2.1.ebuild b/app-dicts/sword-GerLeoNA28/sword-GerLeoNA28-1.2.1.ebuild
deleted file mode 100644
index 726ebb12c184..000000000000
--- a/app-dicts/sword-GerLeoNA28/sword-GerLeoNA28-1.2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Leonberger Bibel, NT (NA28)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoNA28"
-LICENSE="CC-BY-NC-ND-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerLeoRP18/Manifest b/app-dicts/sword-GerLeoRP18/Manifest
deleted file mode 100644
index 959794e9a876..000000000000
--- a/app-dicts/sword-GerLeoRP18/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerLeoRP18-1.2.zip 1599772 BLAKE2B eeefc753e9ae1877281e912018fb5897d63c74f6bbcd41b3db1e67e66b8cba7f3fad5f98138c968f450df6a6d25ed89741f77a61b07790128cbdab99982b4247 SHA512 4676a1836d6cb5285a5bd23d3afafb60a7bfaa741db046567f25de98a73c66b2dcedb0b46c44cefb0a3c45f4e6e86108d098187b108f9fbee83dffced15fe616
diff --git a/app-dicts/sword-GerLeoRP18/metadata.xml b/app-dicts/sword-GerLeoRP18/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerLeoRP18/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerLeoRP18/sword-GerLeoRP18-1.2.ebuild b/app-dicts/sword-GerLeoRP18/sword-GerLeoRP18-1.2.ebuild
deleted file mode 100644
index 48670ddd7a1a..000000000000
--- a/app-dicts/sword-GerLeoRP18/sword-GerLeoRP18-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Leonberger Bibel, NT (RP19)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoRP18"
-LICENSE="CC-BY-NC-ND-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerLutherpredigten/Manifest b/app-dicts/sword-GerLutherpredigten/Manifest
deleted file mode 100644
index 1adecc275da3..000000000000
--- a/app-dicts/sword-GerLutherpredigten/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerLutherpredigten-1.7.zip 480439 BLAKE2B 0fa071afc540616bdcc6f773095b18df17bbce83d55bffc1f9183be23793f07b3df3126752b21bde4c03c12a6d9ca52cad2bdb49cc223772f4e438f092734fa9 SHA512 3404a4da3bcf612df852cf3fcd8eb70ed76f6bddd91b8d03b5807c4c127253e5a8ecae205d9079f5e99f2c097eaf7e44859c63f4fb4eb67cba1e973fed406143
diff --git a/app-dicts/sword-GerLutherpredigten/metadata.xml b/app-dicts/sword-GerLutherpredigten/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerLutherpredigten/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerLutherpredigten/sword-GerLutherpredigten-1.7.ebuild b/app-dicts/sword-GerLutherpredigten/sword-GerLutherpredigten-1.7.ebuild
deleted file mode 100644
index 2f8c45055a29..000000000000
--- a/app-dicts/sword-GerLutherpredigten/sword-GerLutherpredigten-1.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.4"
-
-inherit sword-module
-
-DESCRIPTION="Eine Sammlung von Lutherpredigten"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLutherpredigten"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerMenge/Manifest b/app-dicts/sword-GerMenge/Manifest
deleted file mode 100644
index a1116270dd2b..000000000000
--- a/app-dicts/sword-GerMenge/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerMenge-1.1.zip 2601299 BLAKE2B d8b6065ad770f1e3e4608d04f4f13c4b8516ef2f0c4bdd5cb0b265e10f575fb47f11c50e0ca3be7b07a75454f3c26c6f27aff23dd26464cac3112010186acc38 SHA512 7604efdc8cd09fc2fa1e2a045eaa33fe00b2707cc0c2eb172cb682aafde370d5432a25ecae5d520439bd818730b2a8fdee39e6f34ea18889bd1b288d4636cc77
diff --git a/app-dicts/sword-GerMenge/metadata.xml b/app-dicts/sword-GerMenge/metadata.xml
deleted file mode 100644
index 9d17d40536c6..000000000000
--- a/app-dicts/sword-GerMenge/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="de">
-		Die Bibel nach der Übersetzung von Hermann Menge. Die vorliegende elektronische Ausgabe gibt die letzte von Menge bearbeitete Textfassung von 1939 inklusive der Apokryphen wieder.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerMenge/sword-GerMenge-1.1.ebuild b/app-dicts/sword-GerMenge/sword-GerMenge-1.1.ebuild
deleted file mode 100644
index cc43f403e313..000000000000
--- a/app-dicts/sword-GerMenge/sword-GerMenge-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Menge-Bibel (1939)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerMenge"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerNeUe/Manifest b/app-dicts/sword-GerNeUe/Manifest
deleted file mode 100644
index b2ba2d3f9fc9..000000000000
--- a/app-dicts/sword-GerNeUe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerNeUe-2.7.zip 1975175 BLAKE2B b89646077a9cee4de9b411922a7b8fd625b9fc422e6b26267d4b921c339b9666040f8d51e7246f08826ee1e38ee1e96789020fd93753d54f903202a44b1dea4b SHA512 0e48b6f34d939e3f653368f27e4f3d11e2b3a68a8ea4e6f33073e2c122dd9ad2dec1a4d4be9cb20719af14ba3b2babe9ceaf8ff2428eec3c48bf148eeb0fe508
diff --git a/app-dicts/sword-GerNeUe/metadata.xml b/app-dicts/sword-GerNeUe/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerNeUe/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerNeUe/sword-GerNeUe-2.7.ebuild b/app-dicts/sword-GerNeUe/sword-GerNeUe-2.7.ebuild
deleted file mode 100644
index 5847da598156..000000000000
--- a/app-dicts/sword-GerNeUe/sword-GerNeUe-2.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Neue evangelistische Übersetzung der Bibel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerNeUe"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerOffBiSt/Manifest b/app-dicts/sword-GerOffBiSt/Manifest
deleted file mode 100644
index 6e75923f4cb5..000000000000
--- a/app-dicts/sword-GerOffBiSt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerOffBiSt-1.0.zip 1574702 BLAKE2B 0debd98307e4325612e9939c05d1823e297703e0622c79e0d4365aa010f7a8a2671bcc5a6955b7254822a82f0abb16af1bf7b6694285110e56ad9232e0a26cd1 SHA512 e2c39de56895b9b1bd22cac27fcb6c61cb2c77e8fa424eefa7aba696e33d9e2362446fe69d8fb7a765b2ccfd91d0e36af91b27fa7ceea2acf58b4487b85156cb
diff --git a/app-dicts/sword-GerOffBiSt/metadata.xml b/app-dicts/sword-GerOffBiSt/metadata.xml
deleted file mode 100644
index d207317a3e2b..000000000000
--- a/app-dicts/sword-GerOffBiSt/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="de">
-		Es gibt viele Übersetzungen, aber keine aktuelle, die frei verwendet werden darf. Wir haben es uns als Ziel gesetzt eine freie deutsche Bibelübersetzung zu erstellen, die zu jedem Zweck genutzt werden darf. Unsere Ergebnisse stehen unter der CreativeCommons Attribution-Share Alike 3.0 Unported und dürfen damit beliebig kopiert und genutzt werden, solange angegeben ist, dass sie von uns kommen. Zum gemeinschaftlichen Übersetzen sind natürlich alle, die die nötigen Hebräisch-, Aramäisch- oder Griechischkenntnisse mitbringen, herzlich eingeladen. Im zweiten Schritt (einer lesefreundlichen Übersetzung) können dann alle, die Interesse haben, unabhängig von Konfessionen, Taufe, etc. mitarbeiten.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerOffBiSt/sword-GerOffBiSt-1.0.ebuild b/app-dicts/sword-GerOffBiSt/sword-GerOffBiSt-1.0.ebuild
deleted file mode 100644
index 3970fc395cc7..000000000000
--- a/app-dicts/sword-GerOffBiSt/sword-GerOffBiSt-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Offene Bibel - Studienfassung"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerOffBiSt"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerReinhardt/Manifest b/app-dicts/sword-GerReinhardt/Manifest
deleted file mode 100644
index 13165ac028eb..000000000000
--- a/app-dicts/sword-GerReinhardt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerReinhardt-1.6.zip 200320 BLAKE2B da4bf07cfc381bfbedbd2274445abb2e78f236842961d1283ea4aecf85cbf1777e0b85d9ae278b812483566fe4e64c67ac10f38c913d02b5c91fcb38701cb40e SHA512 84db10246e4b57dad224e3b214317e7504e96a15798872a56328b864db4c99857346869fec0788dae04685dde5db93a212ed644d21e84c53b1274b0c56cbc34a
diff --git a/app-dicts/sword-GerReinhardt/metadata.xml b/app-dicts/sword-GerReinhardt/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerReinhardt/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerReinhardt/sword-GerReinhardt-1.6.ebuild b/app-dicts/sword-GerReinhardt/sword-GerReinhardt-1.6.ebuild
deleted file mode 100644
index 5f2ccec56f14..000000000000
--- a/app-dicts/sword-GerReinhardt/sword-GerReinhardt-1.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="German Reinhardt Evangelien"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerReinhardt"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerSch/Manifest b/app-dicts/sword-GerSch/Manifest
deleted file mode 100644
index 64564bf52565..000000000000
--- a/app-dicts/sword-GerSch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerSch-1.1.1.zip 1573777 BLAKE2B c11422e778ec199c16340c3191b08588ec6e6e25b95563a391da13d32a1aed50e9a6b4eac9519ade2969e850a0ee30ec9754312b0b2877a912f9a2e505b8636e SHA512 68b0a0b1bd084539f22123916c535ce09c3440dafcfd34e5363401294023f026d7246fcafb51b82d5b0b8114aef5b42db6dcb7dc80c5210f6b4b3749a95e60af
diff --git a/app-dicts/sword-GerSch/metadata.xml b/app-dicts/sword-GerSch/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerSch/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerSch/sword-GerSch-1.1.1.ebuild b/app-dicts/sword-GerSch/sword-GerSch-1.1.1.ebuild
deleted file mode 100644
index c146952d5442..000000000000
--- a/app-dicts/sword-GerSch/sword-GerSch-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="German Schlachter Bibel (1951)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerSch"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerTafel/Manifest b/app-dicts/sword-GerTafel/Manifest
deleted file mode 100644
index 489cea1cd653..000000000000
--- a/app-dicts/sword-GerTafel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerTafel-1.1.zip 1372851 BLAKE2B acab53f2a8cc0fbc8692c46810f82337095ffab951c553c7e17c9eef713d6c1d590e3ee50615e2a31ab9a16d1662b6926b219f6e14ba46c9f75dbc994722b077 SHA512 da493e12e0c880498e68cda54cbf27869d76f915aeb6f4fd8e6be9938fa6f55e76e4e198c1869ebcf60d752e188d7d38bad1ae5e7284d7b501c87b5fb3389d86
diff --git a/app-dicts/sword-GerTafel/metadata.xml b/app-dicts/sword-GerTafel/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerTafel/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerTafel/sword-GerTafel-1.1.ebuild b/app-dicts/sword-GerTafel/sword-GerTafel-1.1.ebuild
deleted file mode 100644
index 2610adb1b33a..000000000000
--- a/app-dicts/sword-GerTafel/sword-GerTafel-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="German Tafelbibel (1911)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTafel"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerTextbibel/Manifest b/app-dicts/sword-GerTextbibel/Manifest
deleted file mode 100644
index 5c21b0bb4601..000000000000
--- a/app-dicts/sword-GerTextbibel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerTextbibel-1.1.zip 1264086 BLAKE2B 1b8fb76c48c49ffe6d7ebd71f97f973cc08ca3d32691afd77720f72a0d14bb92db3da62d578542ba60130ecab1d6d6ea63f240372f71954f576cc5b21ead8d72 SHA512 a468edd02c43ea9f5643074c08ef31c1b4e605d17751f64488ea56441066da7a1879a9738e4a61cc62d6a839ed557b4c1b9645a1d3d2e16b317cc08e1a753e9a
diff --git a/app-dicts/sword-GerTextbibel/metadata.xml b/app-dicts/sword-GerTextbibel/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GerTextbibel/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerTextbibel/sword-GerTextbibel-1.1.ebuild b/app-dicts/sword-GerTextbibel/sword-GerTextbibel-1.1.ebuild
deleted file mode 100644
index a8c6738a55af..000000000000
--- a/app-dicts/sword-GerTextbibel/sword-GerTextbibel-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="German Textbibel AT (1906)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTextbibel"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GerZurcher/Manifest b/app-dicts/sword-GerZurcher/Manifest
deleted file mode 100644
index b34069d6fa20..000000000000
--- a/app-dicts/sword-GerZurcher/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GerZurcher-1.0.zip 1789635 BLAKE2B 3173b49936d1d08306fcad1f3792870b23ccaafd521094cf15fb3c942e18abd0dc2b6f32a59926b39efe63ca576c27cd5006d84062503dd7ea06ac45c9124ee0 SHA512 703a807b04f13c42c7ec93887bb582a69ff26273b113670655357e57883b4714d4ff985852a256bb522da805ff706bafcfdd0df40310f65e75719e57e9870791
diff --git a/app-dicts/sword-GerZurcher/metadata.xml b/app-dicts/sword-GerZurcher/metadata.xml
deleted file mode 100644
index a6282dad9f16..000000000000
--- a/app-dicts/sword-GerZurcher/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="de">
-		Die Zürcher Bibel 1931 als selbstkompiliertes SWORD-Modul. Anmerkungen und Parallelstellen hängen leider direkt am Versende an, anstatt in Fußnoten formatiert zu sein.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GerZurcher/sword-GerZurcher-1.0.ebuild b/app-dicts/sword-GerZurcher/sword-GerZurcher-1.0.ebuild
deleted file mode 100644
index 3c4d888c04b2..000000000000
--- a/app-dicts/sword-GerZurcher/sword-GerZurcher-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Deutsche Zürcher Bibel von 1931"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerZurcher"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Godbey/Manifest b/app-dicts/sword-Godbey/Manifest
deleted file mode 100644
index fbcdc67e7439..000000000000
--- a/app-dicts/sword-Godbey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Godbey-1.0.zip 359620 BLAKE2B e5e6d5d941da0f3548196ce2543f432fa86c8f7e8ceba41259c67a16e25ea56328fef31340c1321dc185f28ba225c94e75ab0357197d6afaf673a36e11d08b61 SHA512 720e35a3fbf28f300bb51de81d50695ea53f8de3dc8c5032b0aa81d972a8a359dab6e148ecb7ff376126dc1024154ce3223f731e9b31d03958bbb4d9f6b69545
diff --git a/app-dicts/sword-Godbey/metadata.xml b/app-dicts/sword-Godbey/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Godbey/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Godbey/sword-Godbey-1.0.ebuild b/app-dicts/sword-Godbey/sword-Godbey-1.0.ebuild
deleted file mode 100644
index 0e7be56d4aad..000000000000
--- a/app-dicts/sword-Godbey/sword-Godbey-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1902 William Baxter Godbey NT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Godbey"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GodsWord/Manifest b/app-dicts/sword-GodsWord/Manifest
deleted file mode 100644
index 962476af9c59..000000000000
--- a/app-dicts/sword-GodsWord/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GodsWord-1.3.1.zip 1450003 BLAKE2B 236f87504b6d4a9a180f2b01f320121bf5fe7c27b6d2ff99c0328e4e178a856d225f6c4436b6707a6eefc9d63eaefcaa1c3c473a6cbc1a2328083fc0a4629f37 SHA512 68d170eb61156f923af36ee0338824938e1ec52fe28cc516ef99c71f8f7e6b6a35a4463116f190c73ef6f3c0eeaaa77f158da73625b46d5095ecd096eaa31b4f
diff --git a/app-dicts/sword-GodsWord/metadata.xml b/app-dicts/sword-GodsWord/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GodsWord/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GodsWord/sword-GodsWord-1.3.1.ebuild b/app-dicts/sword-GodsWord/sword-GodsWord-1.3.1.ebuild
deleted file mode 100644
index bcd3d40bf48c..000000000000
--- a/app-dicts/sword-GodsWord/sword-GodsWord-1.3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="God'S Word to the Nations"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GodsWord"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GreVamvas/Manifest b/app-dicts/sword-GreVamvas/Manifest
deleted file mode 100644
index 7658e3b05839..000000000000
--- a/app-dicts/sword-GreVamvas/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GreVamvas-1.0.2.zip 1874658 BLAKE2B e02894eb822cdf494e5e5d436581e255901e21ff3ee31820c0d0f990a4ed5e1cf781a3b31f5811700bcbbd0bd12018c725a81ef7a7595490d988c2a220a5e43c SHA512 a69875125a6f228d62239c67a84d2f4d027fd1ec5983d5520fa771cf14c24a29fca1564e9b3d76e42d2ca42493eb7fec3c55ec2e46d467933c5fa097207f8060
diff --git a/app-dicts/sword-GreVamvas/metadata.xml b/app-dicts/sword-GreVamvas/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GreVamvas/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GreVamvas/sword-GreVamvas-1.0.2.ebuild b/app-dicts/sword-GreVamvas/sword-GreVamvas-1.0.2.ebuild
deleted file mode 100644
index e9db8e3dadd3..000000000000
--- a/app-dicts/sword-GreVamvas/sword-GreVamvas-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Neophytos Vamvas's translation of the Holy Bible into modern Greek (1850)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreVamvas"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-GreekHebrew/Manifest b/app-dicts/sword-GreekHebrew/Manifest
deleted file mode 100644
index 34b22fe36fb3..000000000000
--- a/app-dicts/sword-GreekHebrew/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GreekHebrew-1.1.zip 127968 BLAKE2B 2af9aab6088b5179037500dcda5d28097e1a3e86708229363f18fa3152a8c8e3c08521861f77260d7f43f195c627195ba0205ed723d3e998c25df9baace8ba3a SHA512 60a816327cdbc392a73d47b9daf04908951a37f12840ade179e83970ca464ae725fd32690132273e6fd3a0c4f88aa17b180559c6947caeb649246cf7f1e62a27
diff --git a/app-dicts/sword-GreekHebrew/metadata.xml b/app-dicts/sword-GreekHebrew/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-GreekHebrew/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-GreekHebrew/sword-GreekHebrew-1.1.ebuild b/app-dicts/sword-GreekHebrew/sword-GreekHebrew-1.1.ebuild
deleted file mode 100644
index 06ce487b6683..000000000000
--- a/app-dicts/sword-GreekHebrew/sword-GreekHebrew-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="GreekHebrew"
-
-inherit sword-module
-
-DESCRIPTION="Greek to Hebrew Dictionary of Septuagint Words"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreekHebrew"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Haitian/Manifest b/app-dicts/sword-Haitian/Manifest
deleted file mode 100644
index fad878b6b595..000000000000
--- a/app-dicts/sword-Haitian/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Haitian-1.5.zip 1501318 BLAKE2B 6db81c276484ce1a855f746707aa9ad148b7f30f30284c457b423671714a0abc000d9dae0039c52e3750bdb38f73854b0eb3fd1bfd1a1548ceba9e61a7f04f29 SHA512 e85a8dc1f071d9ca1d198ee8a10a4ac69107420129280a69cb7affd0e35d2a919abbb1a3ec3a07c1556e961dd106ec5c435c730b58ff2b8bd403ad41f81a3a8c
diff --git a/app-dicts/sword-Haitian/metadata.xml b/app-dicts/sword-Haitian/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Haitian/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Haitian/sword-Haitian-1.5.ebuild b/app-dicts/sword-Haitian/sword-Haitian-1.5.ebuild
deleted file mode 100644
index e53049bed8e1..000000000000
--- a/app-dicts/sword-Haitian/sword-Haitian-1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Haitian Creole Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Haitian"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HebDelitzsch/Manifest b/app-dicts/sword-HebDelitzsch/Manifest
deleted file mode 100644
index 6d6106c0593b..000000000000
--- a/app-dicts/sword-HebDelitzsch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HebDelitzsch-1.2.zip 450760 BLAKE2B 983e8139fb7bde0fc8f67f75d2e821bbd0963e1294bc6163a345b82cc1a12d08fccd579975f7267eb81ad60b38927c0112864a6842d2b15445d9480a8188c454 SHA512 4b6f4ea88094aa519d8a6c1ed7f5e373fa61c56c602d6f79a63de73d820509cd14c68ecb73d3bc7f293ce28ee9dbafcc7b45cfdd7e7416c1cc475029406446dd
diff --git a/app-dicts/sword-HebDelitzsch/metadata.xml b/app-dicts/sword-HebDelitzsch/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-HebDelitzsch/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HebDelitzsch/sword-HebDelitzsch-1.2.ebuild b/app-dicts/sword-HebDelitzsch/sword-HebDelitzsch-1.2.ebuild
deleted file mode 100644
index 50fb33f96298..000000000000
--- a/app-dicts/sword-HebDelitzsch/sword-HebDelitzsch-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Hebrew New Testament with Niqqud, based on Delitzsch's translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebDelitzsch"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HebModern/Manifest b/app-dicts/sword-HebModern/Manifest
deleted file mode 100644
index c6d3c7c39f88..000000000000
--- a/app-dicts/sword-HebModern/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HebModern-1.2.zip 1171549 BLAKE2B a1642a763604083eb27689a84c1d59f499e5638480cf8525c3bd00ada83d801a99d13e76e2dd5930c48a37316bef0d6a51585dc389de1f0d8fa56375f776c6d1 SHA512 d7970e39db8a37b3eb80b90a629b209fd005ed4575bece6e2299800596b175830504596bc92941f564b1b43cee6833a617496fdd0518a3eaf8818c4e9654d3b4
diff --git a/app-dicts/sword-HebModern/metadata.xml b/app-dicts/sword-HebModern/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-HebModern/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HebModern/sword-HebModern-1.2.ebuild b/app-dicts/sword-HebModern/sword-HebModern-1.2.ebuild
deleted file mode 100644
index 5dcb165dfca2..000000000000
--- a/app-dicts/sword-HebModern/sword-HebModern-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Modern Hebrew Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HebrewGreek/Manifest b/app-dicts/sword-HebrewGreek/Manifest
deleted file mode 100644
index a873ea92b565..000000000000
--- a/app-dicts/sword-HebrewGreek/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HebrewGreek-1.1.zip 144581 BLAKE2B 527607281375e34ed876a055dc88d40d1ec757fb87cbb928abdd153220794764d3cf441a60f54e1424602e8261ae8f9a9479ce34c507afad2e6b204cfc27dd4a SHA512 bc9e55d5f980329b6e47bafe544f00435db8168400f8fc74c8d21d135deb895d30d582a35a32ac6185ec5ec307b016c000c88b9576fbc954eabc9ee9cdf78503
diff --git a/app-dicts/sword-HebrewGreek/metadata.xml b/app-dicts/sword-HebrewGreek/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-HebrewGreek/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HebrewGreek/sword-HebrewGreek-1.1.ebuild b/app-dicts/sword-HebrewGreek/sword-HebrewGreek-1.1.ebuild
deleted file mode 100644
index f45360003db6..000000000000
--- a/app-dicts/sword-HebrewGreek/sword-HebrewGreek-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="HebrewGreek"
-
-inherit sword-module
-
-DESCRIPTION="Hebrew to Greek Dictionary of Septuagint Words"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebrewGreek"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Heretics/Manifest b/app-dicts/sword-Heretics/Manifest
deleted file mode 100644
index 792f15a56aa6..000000000000
--- a/app-dicts/sword-Heretics/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Heretics-1.1.zip 132755 BLAKE2B a7c91bd2caa83bc48b7ef8bc453a667cacca3599f607077bf7f2a26e3beecb2b2c78053a915c64c3bb90ba8a1791929d9ef96367fe37dc18f6b84cbc9ac434f8 SHA512 46769cf1b3f66277be54a8e7b315472ea34d5ec2bfc529062fb6b9495ffb9e5bd7bf12e1d24109b6fa87f8762c63ed01152179ab2a822c8965f5a867192fe020
diff --git a/app-dicts/sword-Heretics/metadata.xml b/app-dicts/sword-Heretics/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Heretics/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Heretics/sword-Heretics-1.1.ebuild b/app-dicts/sword-Heretics/sword-Heretics-1.1.ebuild
deleted file mode 100644
index edc1353a7300..000000000000
--- a/app-dicts/sword-Heretics/sword-Heretics-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Heretics"
-
-inherit sword-module
-
-DESCRIPTION="Heretics by Gilbert K. Chesterton (1874-1936)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Heretics"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HinERV/Manifest b/app-dicts/sword-HinERV/Manifest
deleted file mode 100644
index 5d738baa5f8e..000000000000
--- a/app-dicts/sword-HinERV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HinERV-2.0.zip 2914763 BLAKE2B 7cdb4cae9c456557e3629e454ecd64a860da22d21b12b31d040a48775ebe25608b9c2eec93797fbb4bd0a0d2b7548e5bb7eb346c7ab20e9d57b19d96f2b30a15 SHA512 79690176398e16b1f8f7ba6798ac079a8219e5b66eae7539d688dbdc800959b9647f69a75658bc5d4edcb017310f3da0f61332073c8502855a00ad971ea1b844
diff --git a/app-dicts/sword-HinERV/metadata.xml b/app-dicts/sword-HinERV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-HinERV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HinERV/sword-HinERV-2.0.ebuild b/app-dicts/sword-HinERV/sword-HinERV-2.0.ebuild
deleted file mode 100644
index 45ed3c464065..000000000000
--- a/app-dicts/sword-HinERV/sword-HinERV-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Holy Bible: Easy-to-Read Version (Hindi ERV)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HinERV"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Hitchcock/Manifest b/app-dicts/sword-Hitchcock/Manifest
deleted file mode 100644
index bfd0aacd6fc4..000000000000
--- a/app-dicts/sword-Hitchcock/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Hitchcock-1.3.zip 44959 BLAKE2B 1233a3cdaccbe865ccef9f94ada8cfc1b399df7ece16cfc7848cdc5495cbe498ef1c130d43ab19d3c33ef9d6fca11ef303a6312a4b0ec24a53dede697e12ef90 SHA512 3900ee254025fcbeb38cb43548b8c0172bb390706c73370a0a0d15c1786f8b5285f2921822fde2b43e3cd8c5600a7414d0eb81571ffd09496e908721fac1b069
diff --git a/app-dicts/sword-Hitchcock/metadata.xml b/app-dicts/sword-Hitchcock/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Hitchcock/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Hitchcock/sword-Hitchcock-1.3.ebuild b/app-dicts/sword-Hitchcock/sword-Hitchcock-1.3.ebuild
deleted file mode 100644
index b1a3457cbba3..000000000000
--- a/app-dicts/sword-Hitchcock/sword-Hitchcock-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Hitchcock"
-
-inherit sword-module
-
-DESCRIPTION="Hitchcock's Bible Names"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Hitchcock"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HunIMIT/Manifest b/app-dicts/sword-HunIMIT/Manifest
deleted file mode 100644
index 63491773710a..000000000000
--- a/app-dicts/sword-HunIMIT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HunIMIT-1.0.zip 1229227 BLAKE2B f30d8ec9e175d0141066185c96830d0d0e43c366a32c7a04c4c8aa027015421e553baa0f53dd885f638ba52169d40c1ce95ccd6ed0c6499157d7ed6d0bfa47ee SHA512 33c53555150d0df1f9220dbe879b8e69a176388983df32aa3fce449f8bd7c7f0ee5a0551f9ec86e7b6e81cc77472cfb8fbdc8dd77971d87be8c3079ef4b2a583
diff --git a/app-dicts/sword-HunIMIT/metadata.xml b/app-dicts/sword-HunIMIT/metadata.xml
deleted file mode 100644
index 13b72f39d28c..000000000000
--- a/app-dicts/sword-HunIMIT/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="hu">
-		1898–1907 között jelentette meg az Izraelita Magyar Irodalmi Társulat (IMIT) a Biblia-fordítását, az ún. IMIT Szentírást négy kötetben. A kor legkiválóbb magyarországi tudós rabbijainak fordításait szöveghűség szempontjából Krausz Sámuel, magyar nyelvhelyességét pedig Bánóczi József gondozta, ellenőrizte. (Héber szöveggel bővített reprint kiadása 1994-ben jelent meg.) Jelen modul Baruch Oberlander rabbi engedélye alapján a www.zsido.com oldalon közzétett szöveget használja.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HunIMIT/sword-HunIMIT-1.0.ebuild b/app-dicts/sword-HunIMIT/sword-HunIMIT-1.0.ebuild
deleted file mode 100644
index 4df6125f4dc1..000000000000
--- a/app-dicts/sword-HunIMIT/sword-HunIMIT-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="The Bible of the Jewish-Hungarian Literature Society (Jewish)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunIMIT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HunKNB/Manifest b/app-dicts/sword-HunKNB/Manifest
deleted file mode 100644
index 989e670e9287..000000000000
--- a/app-dicts/sword-HunKNB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HunKNB-1.0.zip 2030342 BLAKE2B 029c3d9612d2638cb19c9a467587d34d4bc3f02465b5c65720d2efa33488353e5afca2e04f0bb6584119eb9f4cdfc98bc0b8b42e7411199a1ee3f7dd46560681 SHA512 697d9d4d57b92c5b37aa9875087969814f3c1178da0ead7031784279f7ba1b319b5b5f911cc67590b8b37bb382703b624cb7209b56b6aa32a1b4aee675ca2fa2
diff --git a/app-dicts/sword-HunKNB/metadata.xml b/app-dicts/sword-HunKNB/metadata.xml
deleted file mode 100644
index de6fb1e501f6..000000000000
--- a/app-dicts/sword-HunKNB/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="hu">
-		A Szent Jeromos Bibliatársulat gondozásában kiadott Káldi-Neovulgáta a legrégebbi magyar katolikus fordítás. A Káldi-Neovulgáta az 1626-ban kiadott Káldi-Biblia modern nyelvre átdolgozott változata. A fordítói szándék szerint mindenben követi a Katolikus Egyház jelenlegi hivatalos latin fordítása, a Neovulgata fordítói megoldásait.
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HunKNB/sword-HunKNB-1.0.ebuild b/app-dicts/sword-HunKNB/sword-HunKNB-1.0.ebuild
deleted file mode 100644
index c52ae943f96f..000000000000
--- a/app-dicts/sword-HunKNB/sword-HunKNB-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Káldi-Neovulgáta (Catholic) 2013"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKNB"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HunKar/Manifest b/app-dicts/sword-HunKar/Manifest
deleted file mode 100644
index b6f14465dac2..000000000000
--- a/app-dicts/sword-HunKar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HunKar-2.0.zip 2448161 BLAKE2B 5e4510902bb8527e47e11229e40bf7bdd21524e897b3e050aa8ea4c8cf6a7e0015e51a123a008c10b4dfcb4e3b601d2a0f3f55cc1682281485958e63ff469f97 SHA512 542223de7e176461ee0795d4c51b5dc1a4c93ef863e02656ad97d41d6080b80d2b5dc4cfd1b6c6d03b773e023e76a0674fd82ada69130005625eff1a8365fd65
diff --git a/app-dicts/sword-HunKar/metadata.xml b/app-dicts/sword-HunKar/metadata.xml
deleted file mode 100644
index bf9850eae053..000000000000
--- a/app-dicts/sword-HunKar/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Revised version of the original translation by Károli Gáspár, first
-		published in 1590 in Vizsoly, Hungary.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-HunKar/sword-HunKar-2.0.ebuild b/app-dicts/sword-HunKar/sword-HunKar-2.0.ebuild
deleted file mode 100644
index be1dfc49dc00..000000000000
--- a/app-dicts/sword-HunKar/sword-HunKar-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="The Karoli Bible revised version 1908"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKar"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HunRUF/Manifest b/app-dicts/sword-HunRUF/Manifest
deleted file mode 100644
index e2fc78ba227e..000000000000
--- a/app-dicts/sword-HunRUF/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HunRUF-1.0.zip 2042673 BLAKE2B 9a03fe17d6aec66d4b098c5c3451dfe0739b76d4f882099ddb072098cbba2a661190ba5f72835dfdffeaa90b4fa2879adbad371033c10535778587d2cff5205d SHA512 dd8f0539a6f43209749f2325aa23f2f41955e427434664cd93e90de612befb1615b24812da44dd6ca5c928493541ea27a3c39c460ad28a0c4eb680b8ae070788
diff --git a/app-dicts/sword-HunRUF/metadata.xml b/app-dicts/sword-HunRUF/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-HunRUF/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HunRUF/sword-HunRUF-1.0.ebuild b/app-dicts/sword-HunRUF/sword-HunRUF-1.0.ebuild
deleted file mode 100644
index 4719d9da0d9e..000000000000
--- a/app-dicts/sword-HunRUF/sword-HunRUF-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="A Magyar Bibliatársulat Revideált Újfordítású Bibliája"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunRUF"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-HunUj/Manifest b/app-dicts/sword-HunUj/Manifest
deleted file mode 100644
index 85291a5f817c..000000000000
--- a/app-dicts/sword-HunUj/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HunUj-1.8.1.zip 2031464 BLAKE2B b7a857e226eeace67b3c40331bf1f79bacc328e9b664b97c8ef7b19e102ab219d21f59e57d8c83ff96f953797e45444a2dc51dba28568c562d4cf1e081581612 SHA512 44ab81def1f8ffc580d3fefdf7c8d69a2872988c6791862d8d9865c0c1a1c29cc56951a0a190ebe884a7e9cf73d8daa7ab3629a3b17061e16c3c1ad57a6bafa3
diff --git a/app-dicts/sword-HunUj/metadata.xml b/app-dicts/sword-HunUj/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-HunUj/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-HunUj/sword-HunUj-1.8.1.ebuild b/app-dicts/sword-HunUj/sword-HunUj-1.8.1.ebuild
deleted file mode 100644
index 1ac4ab4e8233..000000000000
--- a/app-dicts/sword-HunUj/sword-HunUj-1.8.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="The New Translation Bible of the Hungarian Bible Society"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ISBE/Manifest b/app-dicts/sword-ISBE/Manifest
deleted file mode 100644
index 02352e62e80b..000000000000
--- a/app-dicts/sword-ISBE/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ISBE-2.2.zip 9987447 BLAKE2B 2c6ad5d596fb22bd18a2ff551836c2585aef0cc3e24d1ef3901a5ffde1079149615cddd4f26dd891b8aacc3b7081555ea575c540ba7d3afee2ed16d65c5679ff SHA512 3f4d111beb3795fa2ef566a07548ec32ee1ccda28292f960a8cc8ea40370c859aeb6108ddf840df338f6f1a7c2433b144b28e4d98fba66bd0d82ace66ee1475d
diff --git a/app-dicts/sword-ISBE/metadata.xml b/app-dicts/sword-ISBE/metadata.xml
deleted file mode 100644
index fb4effc9ae01..000000000000
--- a/app-dicts/sword-ISBE/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		THE INTERNATIONAL STANDARD BIBLE ENCYCLOPEDIA
-		James Orr, M.A., D.D. General Editor
-		John L. Nuelsen, D.D., LL.D. Edgar Y. Mullins, D.D., LL.D. Assistant Editors
-		Morris O. Evans, D.D., PhD. Managing Editor
-		Melvin Grove Kyle, D.D., JJ.D. Revising Editor
-		1844-1913 ed.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-ISBE/sword-ISBE-2.2.ebuild b/app-dicts/sword-ISBE/sword-ISBE-2.2.ebuild
deleted file mode 100644
index 2039c8b9e276..000000000000
--- a/app-dicts/sword-ISBE/sword-ISBE-2.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="International Standard Bible Encyclopedia"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ISBE"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ISV/Manifest b/app-dicts/sword-ISV/Manifest
deleted file mode 100644
index 276ba7ec855c..000000000000
--- a/app-dicts/sword-ISV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ISV-1.5.zip 532601 BLAKE2B 17bba89e7ab93def19ee5f489ab8748eda3c39e7cf779450796c12a3e737949b5dfbfb7c08df9739dfad7279e8e8a896cac0b4227cfa178819652f7add49afcc SHA512 ed0e0fd073f19f8286cd27b7041884ba401374e9a858ce132a2db4c2e9e98d6866d1c0cc368c798b80d25a303167fb4c843db649ec567e94b0a31b10a3da48c6
diff --git a/app-dicts/sword-ISV/metadata.xml b/app-dicts/sword-ISV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ISV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ISV/sword-ISV-1.5.ebuild b/app-dicts/sword-ISV/sword-ISV-1.5.ebuild
deleted file mode 100644
index ffb46453d20a..000000000000
--- a/app-dicts/sword-ISV/sword-ISV-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="ISV"
-
-inherit sword-module
-
-DESCRIPTION="International Standard Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ISV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Imitation/Manifest b/app-dicts/sword-Imitation/Manifest
deleted file mode 100644
index d57472a37ab3..000000000000
--- a/app-dicts/sword-Imitation/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Imitation-1.7.1.zip 126981 BLAKE2B 49a0cea9a24e17688d100fe89d19f435f9cc147646be7da6c734590b3f23d28dd316662e5bab87176be41f63ee64fab81cc1302cc456d082e218043d6e892a8c SHA512 0f2b5d0182076ee92b12454aac13bdb7009dc7fff5e582985c3e06774d0eef278fea5a03e3734cc382424b7b7ba6ecb0061509fab234bb656d6b65dbf955d792
diff --git a/app-dicts/sword-Imitation/metadata.xml b/app-dicts/sword-Imitation/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Imitation/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Imitation/sword-Imitation-1.7.1.ebuild b/app-dicts/sword-Imitation/sword-Imitation-1.7.1.ebuild
deleted file mode 100644
index 032396418fd2..000000000000
--- a/app-dicts/sword-Imitation/sword-Imitation-1.7.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Imitation of Christ by Thomas a Kempis"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Imitation"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Institutes/Manifest b/app-dicts/sword-Institutes/Manifest
deleted file mode 100644
index 93c0a79aff93..000000000000
--- a/app-dicts/sword-Institutes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Institutes-1.2.zip 1417954 BLAKE2B ba9d3e4f235ff1a34e37cb49e36547bf9262bce6b5911ccb7b0ecd1110cf7dd8c26dee8dbf47ccb4aa538f3e3718e13c12f9b7dadc5053c292256fc48efaea01 SHA512 dad9fe61bc84a0761e2104695658be7661613e3237e65ad190d425452b189d8614adaf785f9df86ec2d26b57ccf9854c1f482acd8367bd8c29d7c88e8e9b5e12
diff --git a/app-dicts/sword-Institutes/metadata.xml b/app-dicts/sword-Institutes/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Institutes/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Institutes/sword-Institutes-1.2.ebuild b/app-dicts/sword-Institutes/sword-Institutes-1.2.ebuild
deleted file mode 100644
index 558c136838bf..000000000000
--- a/app-dicts/sword-Institutes/sword-Institutes-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Institutes"
-
-inherit sword-module
-
-DESCRIPTION="Calvin's Institutes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Institutes"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-IriODomhnuill/Manifest b/app-dicts/sword-IriODomhnuill/Manifest
deleted file mode 100644
index fa39c7188161..000000000000
--- a/app-dicts/sword-IriODomhnuill/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST IriODomhnuill-1.0.zip 63376 BLAKE2B 6edbbcb12ed687a0d6f626abf34c057bd2cee2d3a12cf5b9bae16e96a16411718996b816f2e6fcf12a05bcb383e146ae197a84e1708df4cece4ea89e8ad63ef4 SHA512 5fc3024fc0ad1dd88e544e3270f23c8af446a9d4a8324838da7624144d2c6090db65f28d4776dc2df22cd6d1520464859c7de8405e1d45efcff904f7f360c5bb
diff --git a/app-dicts/sword-IriODomhnuill/metadata.xml b/app-dicts/sword-IriODomhnuill/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-IriODomhnuill/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-IriODomhnuill/sword-IriODomhnuill-1.0.ebuild b/app-dicts/sword-IriODomhnuill/sword-IriODomhnuill-1.0.ebuild
deleted file mode 100644
index 31208fd6e5ab..000000000000
--- a/app-dicts/sword-IriODomhnuill/sword-IriODomhnuill-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="A modern Irish New Testament (Luke preview)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=IriODomhnuill"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ItDizGreco/Manifest b/app-dicts/sword-ItDizGreco/Manifest
deleted file mode 100644
index 3239cf3b8d18..000000000000
--- a/app-dicts/sword-ItDizGreco/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ItDizGreco-1.2.zip 1540580 BLAKE2B 7688d565e91c53fd54371ab3b5fedd83abefafca8852190747f07caa480f41453f80dc6b6576c62f2ee1dd28da084898b68bf457fe7b01394cfb045addea3109 SHA512 926e124a34ed4ddba5f58073350883ec5a4367cbdd4681e23449d14163268f451807881e1a1b21f789a9f5bfe4a924fdaf256f530bd6d6931906da6a698f4143
diff --git a/app-dicts/sword-ItDizGreco/metadata.xml b/app-dicts/sword-ItDizGreco/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ItDizGreco/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ItDizGreco/sword-ItDizGreco-1.2.ebuild b/app-dicts/sword-ItDizGreco/sword-ItDizGreco-1.2.ebuild
deleted file mode 100644
index 0d56bdc1ab75..000000000000
--- a/app-dicts/sword-ItDizGreco/sword-ItDizGreco-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="Greek-Italian Dictionary of the New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItDizGreco"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ItNomiBibbia/Manifest b/app-dicts/sword-ItNomiBibbia/Manifest
deleted file mode 100644
index 85321b144178..000000000000
--- a/app-dicts/sword-ItNomiBibbia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ItNomiBibbia-1.0.zip 573300 BLAKE2B 1183a6ba2ad8d4be94068e891819023c24521b973c9af38d72e244e50c0a2f103aec93a5a73f1271ab79ccf09c0c07d5e7e85f8910314269a207123be983dc6e SHA512 49e1f3cc6674cb6ee2410ad5512b753a99ee074777ae0c646d63e7fbb4db73e44d60cb1f37491ba349809b154dcf0b37465822cb149ba9f27e37c4f7f115d8fd
diff --git a/app-dicts/sword-ItNomiBibbia/metadata.xml b/app-dicts/sword-ItNomiBibbia/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ItNomiBibbia/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ItNomiBibbia/sword-ItNomiBibbia-1.0.ebuild b/app-dicts/sword-ItNomiBibbia/sword-ItNomiBibbia-1.0.ebuild
deleted file mode 100644
index d121653b65e7..000000000000
--- a/app-dicts/sword-ItNomiBibbia/sword-ItNomiBibbia-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.1"
-
-inherit sword-module
-
-DESCRIPTION="Dizionario dei nomi della Bibbia"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItNomiBibbia"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ItaDio/Manifest b/app-dicts/sword-ItaDio/Manifest
deleted file mode 100644
index ad3e490b684c..000000000000
--- a/app-dicts/sword-ItaDio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ItaDio-1.1.zip 1579402 BLAKE2B 604b61130c8b24621ba05c040df61fd2555798c17cd859b248ecc3075a6646059a8f4b2e7f747c5208af81e7fd8ba0f5d53fc0cec8bda4b7b87937e789f5deed SHA512 560f19983f51d80e995e01abefe19455ebe3ae00b461930d58385621d1836f39e93bb9da973043f81fa3608cce48832cba556c337936e7c41ade01968d045c70
diff --git a/app-dicts/sword-ItaDio/metadata.xml b/app-dicts/sword-ItaDio/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ItaDio/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ItaDio/sword-ItaDio-1.1.ebuild b/app-dicts/sword-ItaDio/sword-ItaDio-1.1.ebuild
deleted file mode 100644
index a91062adcaab..000000000000
--- a/app-dicts/sword-ItaDio/sword-ItaDio-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Italian Giovanni Diodati Bibbia 1649"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaDio"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ItaRive/Manifest b/app-dicts/sword-ItaRive/Manifest
deleted file mode 100644
index 299f9f3d8af1..000000000000
--- a/app-dicts/sword-ItaRive/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ItaRive-1.1.zip 1575958 BLAKE2B 7f5071ddf807e37c9b3f4264ce6d2e5936dd09a0e22a07984773c8850d5b059197c402b8d8bf6a074e38f856904d03de6fef3f6097ea523fed6b4a15ab706cf6 SHA512 7f845fc9a2d8b248df22de2590971804944e2c6dd17ad5c1a711037ec200e95ae1b1b13cdc7433bb9630c91c04af605465169c9b2cd5b06adee4cfce92656162
diff --git a/app-dicts/sword-ItaRive/metadata.xml b/app-dicts/sword-ItaRive/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ItaRive/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ItaRive/sword-ItaRive-1.1.ebuild b/app-dicts/sword-ItaRive/sword-ItaRive-1.1.ebuild
deleted file mode 100644
index 59023a92c463..000000000000
--- a/app-dicts/sword-ItaRive/sword-ItaRive-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Italian Riveduta Bibbia (1927)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaRive"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JCRHoliness/Manifest b/app-dicts/sword-JCRHoliness/Manifest
deleted file mode 100644
index 445147c9c3f4..000000000000
--- a/app-dicts/sword-JCRHoliness/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JCRHoliness-1.0.zip 364726 BLAKE2B ae8e3fc039c92079a983fbaf6e08aea07e1ae7ad8c35b5e7adabce3202b29c30b7e8f750970fbfd2089b60532bc0855e514307385916f9695cbf49e5fe7d4dda SHA512 6ae9d21c2371edf081ab979ce1ab8e3ad84bbf0855f594c1f168490d55ebd11e113d48ba91e52e0e5c6d13b12ffd13e9ad1fb40932a3029a6438eb09a387bd5b
diff --git a/app-dicts/sword-JCRHoliness/metadata.xml b/app-dicts/sword-JCRHoliness/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-JCRHoliness/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-JCRHoliness/sword-JCRHoliness-1.0.ebuild b/app-dicts/sword-JCRHoliness/sword-JCRHoliness-1.0.ebuild
deleted file mode 100644
index 8b47d429c4c6..000000000000
--- a/app-dicts/sword-JCRHoliness/sword-JCRHoliness-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Holiness by J. C. Ryle"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JCRHoliness"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JEAffections/Manifest b/app-dicts/sword-JEAffections/Manifest
deleted file mode 100644
index 2342be43ec42..000000000000
--- a/app-dicts/sword-JEAffections/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JEAffections-1.0.zip 334808 BLAKE2B 640835bf426e904f74406616a639acc2b7f92e4f07a2b386dabcde6dbeca69427cc06e9a740daaf00431b066bb654db3ed3ba23c3310bba78325a628f6db6c2c SHA512 a0f7e4f9836d5065be283c15d2f520d3eb20e8de7c94e1c86f7958e45e50fe5b39612ba3c790b06c8f11b984a893d72948e9181746779abe46b3f61b67dc8293
diff --git a/app-dicts/sword-JEAffections/metadata.xml b/app-dicts/sword-JEAffections/metadata.xml
deleted file mode 100644
index 5377184d2d20..000000000000
--- a/app-dicts/sword-JEAffections/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		A Treatise Concerning Religious Affections is a famous publication written in 1746 by Jonathan Edwards describing his philosophy about the process of Christian conversion in Northampton, Massachusetts during the Great Awakening, which emanated from Edwards congregation starting in 1734.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JEAffections/sword-JEAffections-1.0.ebuild b/app-dicts/sword-JEAffections/sword-JEAffections-1.0.ebuild
deleted file mode 100644
index 37ad476304bb..000000000000
--- a/app-dicts/sword-JEAffections/sword-JEAffections-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Religious Affections by Jonathan Edwards"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JEAffections"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JESermons/Manifest b/app-dicts/sword-JESermons/Manifest
deleted file mode 100644
index 0cb0d36f2974..000000000000
--- a/app-dicts/sword-JESermons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JESermons-1.0.zip 373636 BLAKE2B 016c4a8233145ae820de8fbc0634fdd33c01717828b64ba7f4093791c7dcd8aa02cb14850bb2f6f6ded415acd0df1d202a5fe367999f7420cd70ca679529f576 SHA512 07ab1be31b5661c15be92d7c31e3a20543d29d062ebb6ee1ddf8e11e299f509df20d11f312e95db792d48a7015a3d4f0e0aa92f11f52f535ff3f4f3c97ab7c46
diff --git a/app-dicts/sword-JESermons/metadata.xml b/app-dicts/sword-JESermons/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-JESermons/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-JESermons/sword-JESermons-1.0.ebuild b/app-dicts/sword-JESermons/sword-JESermons-1.0.ebuild
deleted file mode 100644
index 13f3761a7ee2..000000000000
--- a/app-dicts/sword-JESermons/sword-JESermons-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Select Sermons of Jonathan Edwards"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JESermons"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JFB/Manifest b/app-dicts/sword-JFB/Manifest
deleted file mode 100644
index e09bc53c851e..000000000000
--- a/app-dicts/sword-JFB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JFB-3.0.zip 5687741 BLAKE2B 51f1753a3df3551fe4738d890a32261f4450310ac1210b584e25fc8228fc3fc9a33d694360729ee77a821a63352d5542d2b640a7b8e96bd9f5c83270d607520e SHA512 796432cf74e7bbccbb7252ec0dfc6d5d52cb06641e8911c5cba44bd37f8c06cf4345d9e988c2f30e7322e38f608ee0b4e5a12ccc987282b08f90aaf533478e9e
diff --git a/app-dicts/sword-JFB/metadata.xml b/app-dicts/sword-JFB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-JFB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-JFB/sword-JFB-3.0.ebuild b/app-dicts/sword-JFB/sword-JFB-3.0.ebuild
deleted file mode 100644
index d104006f5b04..000000000000
--- a/app-dicts/sword-JFB/sword-JFB-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Jamieson Fausset Brown Bible Commentary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JFB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JOChrist/Manifest b/app-dicts/sword-JOChrist/Manifest
deleted file mode 100644
index 7f84307e6ec8..000000000000
--- a/app-dicts/sword-JOChrist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JOChrist-0.5.zip 291983 BLAKE2B a8191001152244ee0b7da93440771da431360050ea165f8cdd8131759a5822286e0368fba66a977b698cb2b06c7bb2085d193a0f635b4edb56112d563f25a260 SHA512 f5567dcefba877680ade70d4b84c09ea26d046584e14d51dba65b2ae3e62e26e2a01339286b6417668518d39cf2c981516fee9a750cf17c123e7f8fb4226f10d
diff --git a/app-dicts/sword-JOChrist/metadata.xml b/app-dicts/sword-JOChrist/metadata.xml
deleted file mode 100644
index 502296142551..000000000000
--- a/app-dicts/sword-JOChrist/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		A Declaration of the Glorious Mystery of the Person of Christ -- God and Man: with the Infinite Wisdom, Love, and Power of God in the Contrivance and Constitution of that; as also, of the Grounds and Reasons of His Incarnation; the Nature of His Ministry in Heaven; the Present State of the Church above upon that; and the Use of His Person in Religion: with an Account and Vindication of the Honour, Worship, Faith, Love, and Obedience due to Him, in and from the Church.  By John Owen.  Archaic words in the text have been automatically modernized.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JOChrist/sword-JOChrist-0.5.ebuild b/app-dicts/sword-JOChrist/sword-JOChrist-0.5.ebuild
deleted file mode 100644
index f4adb1cc9634..000000000000
--- a/app-dicts/sword-JOChrist/sword-JOChrist-0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Christologia by John Owen"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOChrist"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JOCommGod/Manifest b/app-dicts/sword-JOCommGod/Manifest
deleted file mode 100644
index 9dc034b4d90e..000000000000
--- a/app-dicts/sword-JOCommGod/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JOCommGod-0.1.zip 412234 BLAKE2B e9e7d27f3e331d194f27bc53553ac0796c9a50ddcf44f4cd45a42a3cc4619d24b7b480db8bc361831e3fb1f6eda90ff788e23518eebd5ec51e6710de282aa2a6 SHA512 621c618a4f1ae92a0e92eb611ced362661c2a29722de2668394d4717678e644aedd062c2250525a9eced932598cfda50bd9d794771f06ab3e43948bdbd0d8629
diff --git a/app-dicts/sword-JOCommGod/metadata.xml b/app-dicts/sword-JOCommGod/metadata.xml
deleted file mode 100644
index b651f7c52470..000000000000
--- a/app-dicts/sword-JOCommGod/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		One of John Owen's finest devotional treatises in which he examines the Christian's communion with God as it relates to all three members of the Holy Trinity.  By John Owen.  Archaic words in the text have been automatically modernized.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JOCommGod/sword-JOCommGod-0.1.ebuild b/app-dicts/sword-JOCommGod/sword-JOCommGod-0.1.ebuild
deleted file mode 100644
index aea4459d535d..000000000000
--- a/app-dicts/sword-JOCommGod/sword-JOCommGod-0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Communion with God the Father, Son and Holy Ghost by John Owen"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOCommGod"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JOGlory/Manifest b/app-dicts/sword-JOGlory/Manifest
deleted file mode 100644
index 7d11ee8ee65f..000000000000
--- a/app-dicts/sword-JOGlory/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JOGlory-0.5.zip 209907 BLAKE2B 7a42b1c2ca0fcaaa421ffd9e2763cb9ed695a021da6ff961b9749c874cc3fe00b785557011f0096319a079e4c8e5e0ffcc55a128babc638eca9677e0106b470d SHA512 20e94b768ab4bdbd27fd2e5c4469402ae0ad3a6bd2c70f26d817d21ac005222aec74eb8e732fb863f62139cdf7983d4bfefeacb8e08aa84935a43b5deafdeb85
diff --git a/app-dicts/sword-JOGlory/metadata.xml b/app-dicts/sword-JOGlory/metadata.xml
deleted file mode 100644
index 9ed0ebaab191..000000000000
--- a/app-dicts/sword-JOGlory/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Meditations and Discourses on the Glory of Christ is a collection of discourses in which John Owen (1616-1683) proclaims the glory of the Lord as it is revealed in Scripture.  Archaic words in the text have been automatically modernized.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JOGlory/sword-JOGlory-0.5.ebuild b/app-dicts/sword-JOGlory/sword-JOGlory-0.5.ebuild
deleted file mode 100644
index 8c02cdf400b7..000000000000
--- a/app-dicts/sword-JOGlory/sword-JOGlory-0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The Glory of Christ by John Owen"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOGlory"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JOMortSin/Manifest b/app-dicts/sword-JOMortSin/Manifest
deleted file mode 100644
index 0864487f3898..000000000000
--- a/app-dicts/sword-JOMortSin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JOMortSin-1.0.zip 95888 BLAKE2B 19020a4a93a0ad73ef575a3c781ce4c9b3f73df00ebc607818af38c7a31cd20391d6b73b82c6bbea1a5b5b195dedd659554af8898aa5de9a8f1505f0f40deb02 SHA512 443d2c0b2754475ee306f7d15f366b0ab894c05c685a3cf58c121de4ba14b61b4bab460146815cc3ba2c7f9db95877f5463f5136c139d5dd867d32b80f2dedfe
diff --git a/app-dicts/sword-JOMortSin/metadata.xml b/app-dicts/sword-JOMortSin/metadata.xml
deleted file mode 100644
index f71f54d5f5e6..000000000000
--- a/app-dicts/sword-JOMortSin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		In this classic work Owen addresses many of the questions that occur to every believer battling against sin.  By John Owen.  Archaic words in the text have been automatically modernized.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JOMortSin/sword-JOMortSin-1.0.ebuild b/app-dicts/sword-JOMortSin/sword-JOMortSin-1.0.ebuild
deleted file mode 100644
index 65b691c5f61d..000000000000
--- a/app-dicts/sword-JOMortSin/sword-JOMortSin-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The Mortification of Sin by John Owen"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOMortSin"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JPS/Manifest b/app-dicts/sword-JPS/Manifest
deleted file mode 100644
index 588cfa66bc28..000000000000
--- a/app-dicts/sword-JPS/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JPS-2.1.zip 1157711 BLAKE2B 888d81775a0f933dec64ee83b204dd70b3ee94261cb0387475bd564521445ce75db74e2708ea04d3772a13caad3d95d01e4e588bb7fa60669bdb8e50691fb226 SHA512 78ee5dda684a2617b5749a4dbc9174cffc59addfe6ff988504de711e1b66da9c74bb0084b9c02e40f525c86a7dfc44a187d17b2ed7e68b769b81e941e17e3f7d
diff --git a/app-dicts/sword-JPS/metadata.xml b/app-dicts/sword-JPS/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-JPS/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-JPS/sword-JPS-2.1.ebuild b/app-dicts/sword-JPS/sword-JPS-2.1.ebuild
deleted file mode 100644
index da5b7b6aa527..000000000000
--- a/app-dicts/sword-JPS/sword-JPS-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Jewish Publication Society Old Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JPS"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JST/Manifest b/app-dicts/sword-JST/Manifest
deleted file mode 100644
index f374fc198447..000000000000
--- a/app-dicts/sword-JST/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JST-1.1.zip 1446738 BLAKE2B ad5bd12e82d6aec2bcac4f2052852bbf619b08e9fe135750b0eb6b1fcab31f8acf2227f24a7b2f998eb8b9f9991def6c052619db75b85de251cae1a8f53c692c SHA512 0fe3fdae23d95dcaab3ff7b3a6c7768d4f98e15c2771584bd501e35738f8b1d164c1706ee5d5da0ecc6c62ec955fd23dcd9cb7df55671685cc0d640abd7bed11
diff --git a/app-dicts/sword-JST/metadata.xml b/app-dicts/sword-JST/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-JST/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-JST/sword-JST-1.1.ebuild b/app-dicts/sword-JST/sword-JST-1.1.ebuild
deleted file mode 100644
index 8b3385fe9f8c..000000000000
--- a/app-dicts/sword-JST/sword-JST-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="JST"
-
-inherit sword-module
-
-DESCRIPTION="Joseph Smith Translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JST"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JapBungo/Manifest b/app-dicts/sword-JapBungo/Manifest
deleted file mode 100644
index 210ea8cdaebc..000000000000
--- a/app-dicts/sword-JapBungo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JapBungo-1.0.zip 560591 BLAKE2B 4904a2f05d5f41de5607689cb776b75d544b84298260512d0ab1ba1d32860c7b8c7876bc376b535ddaadb77e3095f18ff9a324feee9beb20fef9a2d33f84df6f SHA512 253afcd9ae148aa17ac38a25c668868a2027b44ea5196eb944ce52ad4efa180578a27d4a0abec36249d05b02186a92836e026c4af6e38629320bec13dbbd5a92
diff --git a/app-dicts/sword-JapBungo/metadata.xml b/app-dicts/sword-JapBungo/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-JapBungo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-JapBungo/sword-JapBungo-1.0.ebuild b/app-dicts/sword-JapBungo/sword-JapBungo-1.0.ebuild
deleted file mode 100644
index 28132a5182e5..000000000000
--- a/app-dicts/sword-JapBungo/sword-JapBungo-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.12"
-
-inherit sword-module
-
-DESCRIPTION="Classical Japanese Bible (Bungo-yaku/Taisho-kaiyaku), 1950 edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapBungo"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JapDenmo/Manifest b/app-dicts/sword-JapDenmo/Manifest
deleted file mode 100644
index 4fefe23243b5..000000000000
--- a/app-dicts/sword-JapDenmo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JapDenmo-1.1.1.zip 344068 BLAKE2B 0a7c1ec03a717fecd9b4071563709ce1f0e08d6086530d1e35aef313c48b36ed64e5bf58a65958279382ca35bbd47c2022f0d8ea67b122847bce1db27fe4527a SHA512 4631e31ebd6ed3233b7c742ef4b7c834c8ff36ef092cdff03acc294912a9170d5223f92cc189d5eccf5f6e6de0422702a6639526d90da0d019aed778f1268d0e
diff --git a/app-dicts/sword-JapDenmo/metadata.xml b/app-dicts/sword-JapDenmo/metadata.xml
deleted file mode 100644
index 19638ff462b5..000000000000
--- a/app-dicts/sword-JapDenmo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		"Electronic Network Bible" is a new translation of the Bible by modern Japanese aimed at completely free use. Translation work is underway with "World English Bible" as the base, and referring to several Japanese translations. The latest draft at the present moment is March 3, 2002 version.
-	</longdescription>
-	<longdescription lang="ja">
-		「電網聖書」は，完全に自由な利用を目的とした，現代日本語による聖書の新しい翻訳です。 翻訳作業は，「世界英語聖書」（World English Bible）を底本とし，いくつかの日本語訳を参照しながら進められています。 現時点での最新の草稿は2002年3月3日版です。
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JapDenmo/sword-JapDenmo-1.1.1.ebuild b/app-dicts/sword-JapDenmo/sword-JapDenmo-1.1.1.ebuild
deleted file mode 100644
index da363cdd0110..000000000000
--- a/app-dicts/sword-JapDenmo/sword-JapDenmo-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Japanese Electronic Network Bible (Denmo)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapDenmo"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JapKougo/Manifest b/app-dicts/sword-JapKougo/Manifest
deleted file mode 100644
index 54c6d6ebb65b..000000000000
--- a/app-dicts/sword-JapKougo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JapKougo-1.1.zip 2113786 BLAKE2B 05d2df789bf27b4f0f9d5069218dd8904870036570d491550f9157fe9c6642672dd81359711e2e63795a9c196ae40336188fc397240b270fdf754a303fe26373 SHA512 aa4d7cf8b4d4f3e782224cc359a524e2f4f99ae211c3b6eca44df18e753a92e91b0a06e727399b11ac0db0995239f41f08d5756cfd2cfcec579984cbb20095e3
diff --git a/app-dicts/sword-JapKougo/metadata.xml b/app-dicts/sword-JapKougo/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-JapKougo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-JapKougo/sword-JapKougo-1.1.ebuild b/app-dicts/sword-JapKougo/sword-JapKougo-1.1.ebuild
deleted file mode 100644
index 29a2e2815b36..000000000000
--- a/app-dicts/sword-JapKougo/sword-JapKougo-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.12"
-
-inherit sword-module
-
-DESCRIPTION="Colloquial Japanese Bible (Kougo-yaku), published 1954/1955"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapKougo"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JapMeiji/Manifest b/app-dicts/sword-JapMeiji/Manifest
deleted file mode 100644
index 52f6fba9b2c4..000000000000
--- a/app-dicts/sword-JapMeiji/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JapMeiji-1.0.zip 492094 BLAKE2B dc985b7d0ade888eb4957271574f95a9804be962bfc39d34d72ba20eeac2672d0c7304edebf6d16a34ca1b0b371d77062e746aba9ca3fe62e5ecfbfd73973a5d SHA512 7ef97965cdaca67693cb2a2fd5857bb740c90e8aeda17934cad57906a3528145889b2f42c142368d82b35a1e5c859a86b014ddcff68ef138e4acf890efe4f702
diff --git a/app-dicts/sword-JapMeiji/metadata.xml b/app-dicts/sword-JapMeiji/metadata.xml
deleted file mode 100644
index 17021541c000..000000000000
--- a/app-dicts/sword-JapMeiji/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="ja">
-		文語訳(明治元訳)舊約聖書の初版は1887年ですが、本サイトでは1953年版を底本としています。
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JapMeiji/sword-JapMeiji-1.0.ebuild b/app-dicts/sword-JapMeiji/sword-JapMeiji-1.0.ebuild
deleted file mode 100644
index d082695e91c2..000000000000
--- a/app-dicts/sword-JapMeiji/sword-JapMeiji-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.12"
-
-inherit sword-module
-
-DESCRIPTION="Japanese Bible translation from the Meiji period, version from 1953"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapMeiji"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-JapRaguet/Manifest b/app-dicts/sword-JapRaguet/Manifest
deleted file mode 100644
index 03b6d9bf0b08..000000000000
--- a/app-dicts/sword-JapRaguet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JapRaguet-1.0.zip 645470 BLAKE2B f005c035b57adcda509bf4e687e10aad3005b5a4bc0fecb70c054ae61b960e8e5cabaa597a63607f199533da3b0b171f505cde7dd836c4bdb72b12cd517ed657 SHA512 354d42d23c86306d26af282de07409dcfeda42a2839384d748d2f2c66cb8c153d72959339a7cd4743237a225098c171171ebee4210b5a2e441640843307f2c52
diff --git a/app-dicts/sword-JapRaguet/metadata.xml b/app-dicts/sword-JapRaguet/metadata.xml
deleted file mode 100644
index 395a69541c69..000000000000
--- a/app-dicts/sword-JapRaguet/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Emile Raguet (1854-1929) was a Belgian missionary. He came to Japan at 1879. He translated a New Tastament based on Vulgate into classical Japanese in 1910. His translation was treated as the semi-official Catholic translation in Japan.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-JapRaguet/sword-JapRaguet-1.0.ebuild b/app-dicts/sword-JapRaguet/sword-JapRaguet-1.0.ebuild
deleted file mode 100644
index c6d6015bb619..000000000000
--- a/app-dicts/sword-JapRaguet/sword-JapRaguet-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.12"
-
-inherit sword-module
-
-DESCRIPTION="Raguet-yaku - Japanese translation of the Bible by Emile Raguet (1910)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapRaguet"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Josephus/Manifest b/app-dicts/sword-Josephus/Manifest
deleted file mode 100644
index 58761c7748b5..000000000000
--- a/app-dicts/sword-Josephus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Josephus-1.1.zip 1633099 BLAKE2B 5e1a5d7e887e13729534f61e41a64cfd0e25f8e1574c6f677122c707885d1acdfd4c34b3edfec5420fef47d4f97b7fcec48fbcabe27a894cdd4b24f2b1087978 SHA512 9f8b4f29cc16d966f71fbe65c583eb7b69e5635f5bafbb7a9b3998d70240807513e9ff0f5f2752dc45bc137f65f74bcf539dda4b97ac83ced41a3b1b2e8c2d2c
diff --git a/app-dicts/sword-Josephus/metadata.xml b/app-dicts/sword-Josephus/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Josephus/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Josephus/sword-Josephus-1.1.ebuild b/app-dicts/sword-Josephus/sword-Josephus-1.1.ebuild
deleted file mode 100644
index dcb614f03945..000000000000
--- a/app-dicts/sword-Josephus/sword-Josephus-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.3"
-
-inherit sword-module
-
-DESCRIPTION="Josephus: The Complete Works"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Jubilee2000/Manifest b/app-dicts/sword-Jubilee2000/Manifest
deleted file mode 100644
index 6dd21db736a8..000000000000
--- a/app-dicts/sword-Jubilee2000/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Jubilee2000-1.1.zip 1457787 BLAKE2B 95c846f65b30e053fd4c686577359db7af796a72e7e44b596a463db02eb9e09bc4c4982e5e9ad3fcdc4332514a8e4ecb4046afe7f64cc51aa34beae1a2ff269a SHA512 d8efc7bbf96873bfdbcce77e4747c716cccbea9a47b85260242f114d23763c9c92c1ace50a987ba9c908e92a2379b89f34a057082bb1d1cb6e9718ad3c944927
diff --git a/app-dicts/sword-Jubilee2000/metadata.xml b/app-dicts/sword-Jubilee2000/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Jubilee2000/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Jubilee2000/sword-Jubilee2000-1.1.ebuild b/app-dicts/sword-Jubilee2000/sword-Jubilee2000-1.1.ebuild
deleted file mode 100644
index 7ca8593d407b..000000000000
--- a/app-dicts/sword-Jubilee2000/sword-Jubilee2000-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Jubilee2000"
-
-inherit sword-module
-
-DESCRIPTION="English Jubilee 2000 Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Jubilee2000"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KD/Manifest b/app-dicts/sword-KD/Manifest
deleted file mode 100644
index b08599e33348..000000000000
--- a/app-dicts/sword-KD/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KD-1.0.zip 11712440 BLAKE2B 1218b0cebf572840f3efa1039c7abcd7fd56e02c906cdb793134f84da596786e0e2928fe76ef76cdd0b0b2d2ee93353e3ac2c00e18cabca6ff2709d653f9e5e9 SHA512 f87c0332cfeb2e894dce0c43a0a99fd19ce67cdac6bf15975990d52c36e9ec5f1d7a9b7a02d8c847d97c4aa10784ea096c29dfd0ff9dac4ca906fe7cbfb57718
diff --git a/app-dicts/sword-KD/metadata.xml b/app-dicts/sword-KD/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KD/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KD/sword-KD-1.0.ebuild b/app-dicts/sword-KD/sword-KD-1.0.ebuild
deleted file mode 100644
index 60aa9d0f9bc8..000000000000
--- a/app-dicts/sword-KD/sword-KD-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Keil and Delitzsch Biblical Commentary on the Old Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KD"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KJV/Manifest b/app-dicts/sword-KJV/Manifest
deleted file mode 100644
index 8863a553e869..000000000000
--- a/app-dicts/sword-KJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KJV-2.10.2.zip 4065733 BLAKE2B 9c2fa48a38fe6352232b402de03bd2ce0651e1f30fa4a9e707b98412940a9b18c9fc465b1bb2628bdcd21bf3f8369da7eecf3a68e088ed6072fd9af1cd2f6e5f SHA512 43e841f9a6e833e8f39ac57c75d781af7b3b2d8ba59568300d0829eae809cd190e35639eb60342f36b87e5cdce6093fba4b2d7a55ed97fcdc8681025ed4100ac
diff --git a/app-dicts/sword-KJV/metadata.xml b/app-dicts/sword-KJV/metadata.xml
deleted file mode 100644
index 22d087518d7d..000000000000
--- a/app-dicts/sword-KJV/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This is the King James Version of the Holy Bible (also known as the Authorized
-		Version) with embedded Strong's Numbers. The rights to the base text are held
-		by the Crown of England. The Strong's numbers in the OT were obtained from The
-		Bible Foundation: http://www.bf.org. The NT Strong's data was obtained from
-		The KJV2003 Project at CrossWire: http://www.crosswire.org. These mechanisms
-		provide a useful means for looking up the exact original language word
-		in a lexicon that is keyed to Strong's numbers.
-		Special thanks to the volunteers at Bible Foundation for keying the
-		Hebrew/English data and of Project KJV2003 for working toward the completion
-		of synchronizing the English phrases to the Stephanas Textus Receptus, and to
-		Dr. Maurice Robinson for providing the base Greek text with Strong's and
-		Morphology. We are also appreciative of formatting markup that was provided by
-		Michael Paul Johnson at http://www.ebible.org. Their time and generosity to
-		contribute such for the free use of the Body of Christ is a great blessing and
-		this derivitive work could not have been possible without these efforts of so
-		many individuals. It is in this spirit that we in turn offer the KJV2003
-		Project text freely for any purpose. Any copyright that might be obtained for
-		this effort is held by CrossWire Bible Society.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-KJV/sword-KJV-2.10.2.ebuild b/app-dicts/sword-KJV/sword-KJV-2.10.2.ebuild
deleted file mode 100644
index eb00bb501c8d..000000000000
--- a/app-dicts/sword-KJV/sword-KJV-2.10.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="King James Version (1769) with Strongs Numbers and Morphology"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KJVA/Manifest b/app-dicts/sword-KJVA/Manifest
deleted file mode 100644
index 4db869c537aa..000000000000
--- a/app-dicts/sword-KJVA/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KJVA-3.0.1.zip 3941853 BLAKE2B 092ccdc2ef222bdeb1a79621c6daf61b31fe68232258249fe7124c2177bdeb85d984301a6546ee2bcb5a7a2dd2b71417f704de5e34484982236c492753cb431d SHA512 a47fafd19f050aafda95280dbe2b3055818fb05344ad3a9f01cedbb14cb87fa290b515090c259e657b1f26e4c585b7e0fa93ec8c2e824592aefc02b3818ac84d
diff --git a/app-dicts/sword-KJVA/metadata.xml b/app-dicts/sword-KJVA/metadata.xml
deleted file mode 100644
index 22d087518d7d..000000000000
--- a/app-dicts/sword-KJVA/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This is the King James Version of the Holy Bible (also known as the Authorized
-		Version) with embedded Strong's Numbers. The rights to the base text are held
-		by the Crown of England. The Strong's numbers in the OT were obtained from The
-		Bible Foundation: http://www.bf.org. The NT Strong's data was obtained from
-		The KJV2003 Project at CrossWire: http://www.crosswire.org. These mechanisms
-		provide a useful means for looking up the exact original language word
-		in a lexicon that is keyed to Strong's numbers.
-		Special thanks to the volunteers at Bible Foundation for keying the
-		Hebrew/English data and of Project KJV2003 for working toward the completion
-		of synchronizing the English phrases to the Stephanas Textus Receptus, and to
-		Dr. Maurice Robinson for providing the base Greek text with Strong's and
-		Morphology. We are also appreciative of formatting markup that was provided by
-		Michael Paul Johnson at http://www.ebible.org. Their time and generosity to
-		contribute such for the free use of the Body of Christ is a great blessing and
-		this derivitive work could not have been possible without these efforts of so
-		many individuals. It is in this spirit that we in turn offer the KJV2003
-		Project text freely for any purpose. Any copyright that might be obtained for
-		this effort is held by CrossWire Bible Society.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-KJVA/sword-KJVA-3.0.1.ebuild b/app-dicts/sword-KJVA/sword-KJVA-3.0.1.ebuild
deleted file mode 100644
index 923b02ac7ec4..000000000000
--- a/app-dicts/sword-KJVA/sword-KJVA-3.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="King James Version (1769) incl. Apocrypha, with Strongs Numbers and Morphology"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVA"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KJVPCE/Manifest b/app-dicts/sword-KJVPCE/Manifest
deleted file mode 100644
index bb39ea166e41..000000000000
--- a/app-dicts/sword-KJVPCE/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KJVPCE-1.0.zip 1561436 BLAKE2B 0baa54c37e2dcf365a8ad8a07c1af25074270fd06b814058cf067e6f139635b9bd48e019c387526a8c3c0573505afb6a12c20a73d4230e8aa7b63c293abbcc5f SHA512 aadbc163f998d59bb3a22fb2eef5f6b1ce4d6cabe01e215716d178de3aff114f65506ff8ea5670ebbb4bf77db4d1cf9338ace2ae34d943e991c32c592b5de68b
diff --git a/app-dicts/sword-KJVPCE/metadata.xml b/app-dicts/sword-KJVPCE/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KJVPCE/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KJVPCE/sword-KJVPCE-1.0.ebuild b/app-dicts/sword-KJVPCE/sword-KJVPCE-1.0.ebuild
deleted file mode 100644
index 58e17ab049d2..000000000000
--- a/app-dicts/sword-KJVPCE/sword-KJVPCE-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="King James Version: Pure Cambridge Edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVPCE"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KLV/Manifest b/app-dicts/sword-KLV/Manifest
deleted file mode 100644
index a7a23ecc38b6..000000000000
--- a/app-dicts/sword-KLV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KLV-2.2.zip 1519608 BLAKE2B 4026a94af8ecd4196f69690460b34e49ae9b0ae131865ba7841d913fe5a8c76316f9ea2faf0fda8b4a783bddb2ee30494de3e56cbbea54718cd19db00ad72648 SHA512 2c5f3a366363bab66d008e1b774143c9d55d704dcd67db11c46eeaae99d4bb68a2c70e25dd5698bec83d1b82e039e790a525db7d775e5adc8b823c717c422740
diff --git a/app-dicts/sword-KLV/metadata.xml b/app-dicts/sword-KLV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KLV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KLV/sword-KLV-2.2.ebuild b/app-dicts/sword-KLV/sword-KLV-2.2.ebuild
deleted file mode 100644
index 5db54820282b..000000000000
--- a/app-dicts/sword-KLV/sword-KLV-2.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="KLV"
-
-inherit sword-module
-
-DESCRIPTION="Klingon Language Version of the World English Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KLVen_iklingon/Manifest b/app-dicts/sword-KLVen_iklingon/Manifest
deleted file mode 100644
index f9afefe9eba2..000000000000
--- a/app-dicts/sword-KLVen_iklingon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KLVen_iklingon-2.1.zip 10484 BLAKE2B cbce36ac41f695efbdb89fe360ee69a4f8d676af4e9d03ea68be2d8360827d8135db1bf8d2641759a1ca88fb57d74fb5fb2a6c29af827e3bb1504136702f80a2 SHA512 7a6422d96e4524efd8f12acb9ae52ac561283db040ecae4127ab43c124b4e26bce584d243ce76d3eb644c3365422308b3087e36e2c59fef66953d8c392c3f53e
diff --git a/app-dicts/sword-KLVen_iklingon/metadata.xml b/app-dicts/sword-KLVen_iklingon/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KLVen_iklingon/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KLVen_iklingon/sword-KLVen_iklingon-2.1.ebuild b/app-dicts/sword-KLVen_iklingon/sword-KLVen_iklingon-2.1.ebuild
deleted file mode 100644
index a607b72a82fb..000000000000
--- a/app-dicts/sword-KLVen_iklingon/sword-KLVen_iklingon-2.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="KLVen_iklingon"
-
-inherit sword-module
-
-DESCRIPTION="Klingon Language Version English to Klingon mapping lexicon"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLVen_iklingon"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KLViklingon_en/Manifest b/app-dicts/sword-KLViklingon_en/Manifest
deleted file mode 100644
index 3fb85121530c..000000000000
--- a/app-dicts/sword-KLViklingon_en/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KLViklingon_en-2.1.zip 9892 BLAKE2B a38c7eb5cf290761d8ccfca9719af60d7a8dd955817bfa47d8a423f39ae4d9edb22fa3b486ba1cc506ada15031cb998434f2cb754712922eb570a6a681fe9ff8 SHA512 4e45c5f0e3b2c7b7dadf08141e65e1bc8130ce9c75c56752b9d3216d2dbfaf249e774565d617473754acf4ecd20bacbea4d0789366cbbff15e3c688b18b2d795
diff --git a/app-dicts/sword-KLViklingon_en/metadata.xml b/app-dicts/sword-KLViklingon_en/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KLViklingon_en/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KLViklingon_en/sword-KLViklingon_en-2.1.ebuild b/app-dicts/sword-KLViklingon_en/sword-KLViklingon_en-2.1.ebuild
deleted file mode 100644
index 85f1baa932c5..000000000000
--- a/app-dicts/sword-KLViklingon_en/sword-KLViklingon_en-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MODULE="KLViklingon_en"
-
-inherit sword-module
-
-DESCRIPTION="Klingon Language Version Klingon to English mapping lexicon"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLViklingon_en"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Kapingamarangi/Manifest b/app-dicts/sword-Kapingamarangi/Manifest
deleted file mode 100644
index 6a06d49d9325..000000000000
--- a/app-dicts/sword-Kapingamarangi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Kapingamarangi-1.0.1.zip 3916592 BLAKE2B 94704fe0cda9bb103f42e47590fa3e225c253553011ede7e57520041b3bff7f04db838036f3fb26ee179d4fdce0ad680388350738376a8b2748bd84566c5af65 SHA512 d4af52dc3d55d89a732e4c466d3791a113ee06cee292bbcd5227285a81c582ea0f3415879283071b99517add4f3d54ed30f611f1040923bb39018d938f9ee556
diff --git a/app-dicts/sword-Kapingamarangi/metadata.xml b/app-dicts/sword-Kapingamarangi/metadata.xml
deleted file mode 100644
index 347df0a3d660..000000000000
--- a/app-dicts/sword-Kapingamarangi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		The New Testament in the Kapingamarangi language of the Federated States of Micronesia, spoken on the Kapingamarangi and Ponape islands, Caroline Islands
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Kapingamarangi/sword-Kapingamarangi-1.0.1.ebuild b/app-dicts/sword-Kapingamarangi/sword-Kapingamarangi-1.0.1.ebuild
deleted file mode 100644
index 10177ab51d2e..000000000000
--- a/app-dicts/sword-Kapingamarangi/sword-Kapingamarangi-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The New Testament in the Kapingamarangi language"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kapingamarangi"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Kaz/Manifest b/app-dicts/sword-Kaz/Manifest
deleted file mode 100644
index 39420179b079..000000000000
--- a/app-dicts/sword-Kaz/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Kaz-1.1.1.zip 3614233 BLAKE2B 076128f674e390bb6f089fa689cb0d84eac1aeeba74cafd9b63a313f148352fbf80a32b2d13cd0b3e9bfac3a78e12a5d8bd6167af45a864db05c3a0f9505fa3e SHA512 bf6ca9c8c62c88400a9c22cfcc8034fc3c54af0a4ecbd16f83ad3c9a84b7a4640cbec20853785b3d3b7e479a11e6fd448b0e6502f0d9371412d84deb44ed7898
diff --git a/app-dicts/sword-Kaz/metadata.xml b/app-dicts/sword-Kaz/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Kaz/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Kaz/sword-Kaz-1.1.1.ebuild b/app-dicts/sword-Kaz/sword-Kaz-1.1.1.ebuild
deleted file mode 100644
index 2ffb326e631b..000000000000
--- a/app-dicts/sword-Kaz/sword-Kaz-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Bible translation into Kazakh"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kaz"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Kekchi/Manifest b/app-dicts/sword-Kekchi/Manifest
deleted file mode 100644
index d93389f96a4b..000000000000
--- a/app-dicts/sword-Kekchi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Kekchi-1.5.zip 1676130 BLAKE2B e31a2d8ea4a6b5df1e26f141bb7959e3244eeac42a98794409121f3a7d6bcd9a1e987a8289f51513d93ed1e850ca66194a1c2315cb33e22ded527b2a18abd180 SHA512 c4c3df33e26165780cdd19441f8765293360119fe5d8179b66a7032893d4885ed5724f1674929f909183f96af5f87f4893e8e4bb72e34af5bb3c6f32b02ca877
diff --git a/app-dicts/sword-Kekchi/metadata.xml b/app-dicts/sword-Kekchi/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Kekchi/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Kekchi/sword-Kekchi-1.5.ebuild b/app-dicts/sword-Kekchi/sword-Kekchi-1.5.ebuild
deleted file mode 100644
index b3cf6682bb2f..000000000000
--- a/app-dicts/sword-Kekchi/sword-Kekchi-1.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="K'ekchi' Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KhmerNT/Manifest b/app-dicts/sword-KhmerNT/Manifest
deleted file mode 100644
index 8a358b227541..000000000000
--- a/app-dicts/sword-KhmerNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KhmerNT-1.1.zip 550616 BLAKE2B d1d9199e0605290abb441f2440698cb33f9424b1f4d540c676f529afbf3ecaa0d427ad7c40d6d18a1a25b5dc72c6f55363d422a79bdd651deb37550d4b692541 SHA512 7955344af9dc6cb6ebcdf313563d867a8399c351cbd247e32f5f2c5590d5108ff3ad4f0cca3e9a0fb9fb13838bdcf5606d3b6edd213b38f741758c00e4127ca6
diff --git a/app-dicts/sword-KhmerNT/metadata.xml b/app-dicts/sword-KhmerNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KhmerNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KhmerNT/sword-KhmerNT-1.1.ebuild b/app-dicts/sword-KhmerNT/sword-KhmerNT-1.1.ebuild
deleted file mode 100644
index 37e274203657..000000000000
--- a/app-dicts/sword-KhmerNT/sword-KhmerNT-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Khmer Christian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KhmerNT"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KingComm/Manifest b/app-dicts/sword-KingComm/Manifest
deleted file mode 100644
index 8da442795be1..000000000000
--- a/app-dicts/sword-KingComm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KingComm-1.1.zip 8402252 BLAKE2B 46559ad4541abcf54d746714c78e200c41e9cb857caba016c0a42810c950264fac953728374db4d3d759d475df770c37819cf645625e364eb83218d78b8103ce SHA512 8d7c112d61d7a2ba528cbfe889a6500e51bf989e1587a23427d290cff277448f0ef0323ba413b1d89d7b2d19e0fa043282dfc6ca11e63a8379353b0592c3379c
diff --git a/app-dicts/sword-KingComm/metadata.xml b/app-dicts/sword-KingComm/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KingComm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KingComm/sword-KingComm-1.1.ebuild b/app-dicts/sword-KingComm/sword-KingComm-1.1.ebuild
deleted file mode 100644
index b9f2c2d1ae34..000000000000
--- a/app-dicts/sword-KingComm/sword-KingComm-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Kingcomments, commentary on the whole Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KingComm"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KorHKJV/Manifest b/app-dicts/sword-KorHKJV/Manifest
deleted file mode 100644
index d61d86db94b2..000000000000
--- a/app-dicts/sword-KorHKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KorHKJV-1.0.zip 1711946 BLAKE2B 9f268c8ad2033644a7a379a3407a294331b2d7ccc741708f685084ec491816b12378ad1683933a1d3805973963e5845f30e514ed19d3939b5e7a8c13524565bd SHA512 12e17a5d6c4cc5bc1729ee6732bcd27dbea3eae25f6030104b3b31f912a5546e73982fa9de91e1e69e5561bd851c1e0d96df34b096b306b9b3d0686be7a6c94d
diff --git a/app-dicts/sword-KorHKJV/metadata.xml b/app-dicts/sword-KorHKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KorHKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KorHKJV/sword-KorHKJV-1.0.ebuild b/app-dicts/sword-KorHKJV/sword-KorHKJV-1.0.ebuild
deleted file mode 100644
index f6b7e8fed1d2..000000000000
--- a/app-dicts/sword-KorHKJV/sword-KorHKJV-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Korean Hangul King James Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorHKJV"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KorRV/Manifest b/app-dicts/sword-KorRV/Manifest
deleted file mode 100644
index c41424365817..000000000000
--- a/app-dicts/sword-KorRV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KorRV-2.0.1.zip 1476689 BLAKE2B 0be11e327b9d277931fa90a9db01dc6d497029cb87281f6553615dc751b902de0c451abbec248a2446238a52f991cf23425999b0b5049f0d31d630cd0bdc5b82 SHA512 a0e5acfb4ee3113c42c3f14fa96523740b6bc17031b004b17172ea229eb1bfc6081cc32fd2efc71518863335b39665e873fc7c17ca78ac26c3e85f6b37c16223
diff --git a/app-dicts/sword-KorRV/metadata.xml b/app-dicts/sword-KorRV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KorRV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KorRV/sword-KorRV-2.0.1.ebuild b/app-dicts/sword-KorRV/sword-KorRV-2.0.1.ebuild
deleted file mode 100644
index 0e77e0470c6f..000000000000
--- a/app-dicts/sword-KorRV/sword-KorRV-2.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Korean Revised Version 1952/1961"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorRV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-KtuVB/Manifest b/app-dicts/sword-KtuVB/Manifest
deleted file mode 100644
index cdefeaa2139f..000000000000
--- a/app-dicts/sword-KtuVB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KtuVB-3.2.zip 2851979 BLAKE2B b27bbe27935e7ee8b9220800ad69cadc440e3ca6afa60dab7fad6e9c33ede94aa6d0b56e934f27ede23daf15babd2d650d912f1a4b99a5dff81029e2159ecd0e SHA512 e5b8a197afec3f299ff8455dd5154165a534ae46f386413a04ad12a9e008eaadfefe7699fd78591b0e9702472f5ed8557d7e52c231ff4a591ffe3aa18f0dfd5e
diff --git a/app-dicts/sword-KtuVB/metadata.xml b/app-dicts/sword-KtuVB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-KtuVB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-KtuVB/sword-KtuVB-3.2.ebuild b/app-dicts/sword-KtuVB/sword-KtuVB-3.2.ebuild
deleted file mode 100644
index ac20ffb7c177..000000000000
--- a/app-dicts/sword-KtuVB/sword-KtuVB-3.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Masonama ya Santu par le Père Widart et l’équipe de Verbum Bible Kinshasa"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KtuVB"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LEB/Manifest b/app-dicts/sword-LEB/Manifest
deleted file mode 100644
index 960b195e1d4c..000000000000
--- a/app-dicts/sword-LEB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LEB-3.0.zip 2324760 BLAKE2B 854f3d00d443ad79543373729b476c87613efe72943f65aad74ba23b3cd4ef01521bcd590d4d95ed4a959a54d45e14039daddf47222d779456c9b0fabaec30b3 SHA512 c6e157938c9928d81f629216c8f4179f747dc33a75dfebefa71c90d9e7ea2b730f512f8a4bb899d0c1d09d71018e1d02fb3d9253fa7910f16287eb71d2aa4189
diff --git a/app-dicts/sword-LEB/metadata.xml b/app-dicts/sword-LEB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-LEB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-LEB/sword-LEB-3.0.ebuild b/app-dicts/sword-LEB/sword-LEB-3.0.ebuild
deleted file mode 100644
index b8bcfc290933..000000000000
--- a/app-dicts/sword-LEB/sword-LEB-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Lexham English Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LEB"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LITV/Manifest b/app-dicts/sword-LITV/Manifest
deleted file mode 100644
index c12da7cf6e20..000000000000
--- a/app-dicts/sword-LITV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LITV-1.4.zip 1449901 BLAKE2B 34cc315144dd09f4b850fc5b1414fe20bc44d0880d08681435c6a6049d450853f06b5a7bb16789c52747706bea8b2ae1a0d05d95d3f32623ee8d2e640709a187 SHA512 fd1a70df91d08c048c8689ccd77e9f77dc53300543aa2a9ae6c413b04c31724dd8b088008b9f7087600200d881397a7b82ac9af5813becd53eb5041d6979de5b
diff --git a/app-dicts/sword-LITV/metadata.xml b/app-dicts/sword-LITV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-LITV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-LITV/sword-LITV-1.4.ebuild b/app-dicts/sword-LITV/sword-LITV-1.4.ebuild
deleted file mode 100644
index 4b0f9e650dd8..000000000000
--- a/app-dicts/sword-LITV/sword-LITV-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Green's Literal Translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LITV"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LO/Manifest b/app-dicts/sword-LO/Manifest
deleted file mode 100644
index 8dad09ae9876..000000000000
--- a/app-dicts/sword-LO/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LO-1.1.zip 366644 BLAKE2B 042d363ec1038fd0c68e3794763249cd777083dbbcfa4ef88263fc1d3fd89ce1fdd58cbe593d96aa69f26a13957ab3fa9fd2563e9165059bb1905b0ebac0ed16 SHA512 0442690740bf9bdaafba5f08497ca3615e65a4b327abb57834c95a0e2a00a32081949460c85fb4505df455e84ce3c3d83b7f391f60baa37f44ac4714463e44fa
diff --git a/app-dicts/sword-LO/metadata.xml b/app-dicts/sword-LO/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-LO/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-LO/sword-LO-1.1.ebuild b/app-dicts/sword-LO/sword-LO-1.1.ebuild
deleted file mode 100644
index 8d8115e5f6e7..000000000000
--- a/app-dicts/sword-LO/sword-LO-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The Living Oracles NT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LO"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LXX/Manifest b/app-dicts/sword-LXX/Manifest
deleted file mode 100644
index 71009c11748c..000000000000
--- a/app-dicts/sword-LXX/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LXX-2.5.zip 3279771 BLAKE2B 40bec0a0f84e463ec770d9deda2fea0653bc8b3e92fd0cbd98f48311c1b07cb22f2ffa89a48d744b14890c5777fe1c449996e1b70788d4b15d3fb27b3900b89c SHA512 816ce66342bf4b7e23723a81dbf4e2f6a5699a657d1cb53276259ea96881b001d89cf3c18a0e9e67c57f059cddceba268d5af4bb020889ff2dfee19a6f6ad73d
diff --git a/app-dicts/sword-LXX/metadata.xml b/app-dicts/sword-LXX/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-LXX/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-LXX/sword-LXX-2.5.ebuild b/app-dicts/sword-LXX/sword-LXX-2.5.ebuild
deleted file mode 100644
index 07ab2e37fbf1..000000000000
--- a/app-dicts/sword-LXX/sword-LXX-2.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Septuagint, Morphologically Tagged Rahlfs'"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LXX"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Latvian/Manifest b/app-dicts/sword-Latvian/Manifest
deleted file mode 100644
index ff5b8f6f0888..000000000000
--- a/app-dicts/sword-Latvian/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Latvian-1.4.zip 369413 BLAKE2B 63dce51cd751276f82e2279ea679167516abdf3a9ed3428916f9d74fe67759cfd730cd2ab2a177d25085244cbd867b514d298c122d319602dcb39753b5b59c7d SHA512 4c65d9b3a2e7b252af64dc760d470a72792d6385fe6f8f3e1b79c204738c2a7d95269591a659ba1bd31e0251a022c3cdb23b45c84c3b452d94dc70215893f1e0
diff --git a/app-dicts/sword-Latvian/metadata.xml b/app-dicts/sword-Latvian/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Latvian/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Latvian/sword-Latvian-1.4.ebuild b/app-dicts/sword-Latvian/sword-Latvian-1.4.ebuild
deleted file mode 100644
index fe1df42a665f..000000000000
--- a/app-dicts/sword-Latvian/sword-Latvian-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Latvian New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LawGospel/Manifest b/app-dicts/sword-LawGospel/Manifest
deleted file mode 100644
index 0e3d2b1cfe5f..000000000000
--- a/app-dicts/sword-LawGospel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LawGospel-2.1.zip 579480 BLAKE2B ee2a7a69816f152d60d3c8dc0e641327ed7327df49b7cd0d336f8d9fce3c503922ecf6d238950c4fd07f82208e065451b9c02d4dfa1e3ce0f76dee648b124a96 SHA512 10dc357e43386e30b4ea330906b816c35cd836c51a35b77e31be98568133f0e5db99e706e4208e3836f28bba28a8da68f7cdc7d5fe5dd82c137acaec103b395c
diff --git a/app-dicts/sword-LawGospel/metadata.xml b/app-dicts/sword-LawGospel/metadata.xml
deleted file mode 100644
index 134eeebf9f68..000000000000
--- a/app-dicts/sword-LawGospel/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This work is an electronic reproduction of C.F.W. Walther's Law and Gospel, published by Concordia Publishing House in 1929. As the 1929 edition was not copyrighted, it is in the public domain. In 1989, CPH released a copyrighted edition of Law and Gospel. That work was not consulted in the production of this online edition. Converted to SWORD module format by Brian Dumont (brian dot j dot dumont at gmail dot com)
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-LawGospel/sword-LawGospel-2.1.ebuild b/app-dicts/sword-LawGospel/sword-LawGospel-2.1.ebuild
deleted file mode 100644
index 4505f160edf6..000000000000
--- a/app-dicts/sword-LawGospel/sword-LawGospel-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.10"
-
-inherit sword-module
-
-DESCRIPTION="Walther's Law and Gospel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LawGospel"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Leeser/Manifest b/app-dicts/sword-Leeser/Manifest
deleted file mode 100644
index 05f3d0023688..000000000000
--- a/app-dicts/sword-Leeser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Leeser-1.2.zip 1142555 BLAKE2B 76c1a100ff15a22f55f777cbc1b251f8a3a8831e85a1430be145c990e9d11969d459b862a51ac0f8f7f071934ae3af56e52ece149f2771b34c3269bf71a32fb5 SHA512 21d0151221a60bd1359c5ba6edb7ef466d5a25f6f494c1393a5a2557e83388eed4b1cf9fb85216b62f1446794e1380a93662170f46087ae46dfcc14dc1ba27b1
diff --git a/app-dicts/sword-Leeser/metadata.xml b/app-dicts/sword-Leeser/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Leeser/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Leeser/sword-Leeser-1.2.ebuild b/app-dicts/sword-Leeser/sword-Leeser-1.2.ebuild
deleted file mode 100644
index 65423e3b1da9..000000000000
--- a/app-dicts/sword-Leeser/sword-Leeser-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1853 Leeser Old Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Leeser"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Lightfoot/Manifest b/app-dicts/sword-Lightfoot/Manifest
deleted file mode 100644
index 53cd146ebd1b..000000000000
--- a/app-dicts/sword-Lightfoot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Lightfoot-1.0.zip 644888 BLAKE2B 78ee5fa9de454fe525a75813a6e035bdca26b3df119fff68a169bc42b90c4211ad7b5f273d01f8b56c08c4c422e87ac0f734c43772a1d4e076210b797ffbe161 SHA512 87446451899e6a24198ddbf716a8d4114ccc76d0f68a62dd131c546386cd8deba916f9a47c3fdd6820d2b0669423fdb7eb666878031b91cc36f068305b7c63cb
diff --git a/app-dicts/sword-Lightfoot/metadata.xml b/app-dicts/sword-Lightfoot/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Lightfoot/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Lightfoot/sword-Lightfoot-1.0.ebuild b/app-dicts/sword-Lightfoot/sword-Lightfoot-1.0.ebuild
deleted file mode 100644
index bb86769b6fb1..000000000000
--- a/app-dicts/sword-Lightfoot/sword-Lightfoot-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Lightfoot"
-
-inherit sword-module
-
-DESCRIPTION="John Lightfoot Commentary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Lightfoot"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LinVB/Manifest b/app-dicts/sword-LinVB/Manifest
deleted file mode 100644
index 1a5f4fcea86a..000000000000
--- a/app-dicts/sword-LinVB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LinVB-1.0.1.zip 2091674 BLAKE2B ae7f1e70b378a4c845552bc2713741c072ca15eb9ad1038fff9bcb7d2dd22d9bc2c8c40572fa5d2ca63773b329891284f4800a3b9d641971939174f4d15bb642 SHA512 317178f58cd75e4680da5a8200ad862de25454234c01afb65bdd862410820033918c1a4c646871f6f6387ed26493800c293d2b3bc0973dc5ecddf5b84e8aef18
diff --git a/app-dicts/sword-LinVB/metadata.xml b/app-dicts/sword-LinVB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-LinVB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-LinVB/sword-LinVB-1.0.1.ebuild b/app-dicts/sword-LinVB/sword-LinVB-1.0.1.ebuild
deleted file mode 100644
index 8aaa9263251e..000000000000
--- a/app-dicts/sword-LinVB/sword-LinVB-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Liloba lya Nzambe, édition Verbum Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LinVB"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LtKBB/Manifest b/app-dicts/sword-LtKBB/Manifest
deleted file mode 100644
index f628edd244a3..000000000000
--- a/app-dicts/sword-LtKBB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LtKBB-1.7.2.zip 1411962 BLAKE2B 44e850c792b08a47d56492def0c5e57f18b95366e1d9726b3d708b086ec3ce37b8e0904f0b2e2e5167ae3597e29866dee47e35e242b0fc4d2a971a14b060b375 SHA512 f874c121094d315c7d2c53677b5ea5620815cd275a242a508be6b131a25ed014e810550a3d02f823dbc7e47cce80c5a08309ee1d9414296f9117f4fd014022ea
diff --git a/app-dicts/sword-LtKBB/metadata.xml b/app-dicts/sword-LtKBB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-LtKBB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-LtKBB/sword-LtKBB-1.7.2.ebuild b/app-dicts/sword-LtKBB/sword-LtKBB-1.7.2.ebuild
deleted file mode 100644
index 7ad0afb022ed..000000000000
--- a/app-dicts/sword-LtKBB/sword-LtKBB-1.7.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Lithuanian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LtKBB"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Luther/Manifest b/app-dicts/sword-Luther/Manifest
deleted file mode 100644
index a1418681fb95..000000000000
--- a/app-dicts/sword-Luther/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Luther-1.1.zip 3041937 BLAKE2B f2764b8e4c1447a9b7dc5ccbd717990bca9442cebdda71b408786fc141148a77c5a62055ca9a7df493d9e8f55b1e98bd57222c5883fc0c1a5df6a46c1b0c2867 SHA512 8054679c205f2d498cc3677d7cb71e461a6640f414863077d4680de1474a55b85ca4f1b74aadff4f91b671c4709d7a84ea348d57a57c87ee8b39b1bf75df7c4f
diff --git a/app-dicts/sword-Luther/metadata.xml b/app-dicts/sword-Luther/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Luther/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Luther/sword-Luther-1.1.ebuild b/app-dicts/sword-Luther/sword-Luther-1.1.ebuild
deleted file mode 100644
index e5739713ddbc..000000000000
--- a/app-dicts/sword-Luther/sword-Luther-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Luther"
-
-inherit sword-module
-
-DESCRIPTION="Luther's Commentary on Galatians"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Luther"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-LvGluck8/Manifest b/app-dicts/sword-LvGluck8/Manifest
deleted file mode 100644
index 02a12963e486..000000000000
--- a/app-dicts/sword-LvGluck8/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LvGluck8-1.1.zip 1909136 BLAKE2B 53717a113faa07d06209eda3052f2d2a0d2ddfb442080d272c1f27feb4e4edd19309d91b4a5a70917a5c715f33369d6325b06337ae6371656b165cd30e7e7132 SHA512 2f7ca3917059a43089e88bb450756ffda0b4a4c10c95a4ad0f7087183b0514f17627ee2c4f59ef2883234841a7f817a3d9dd65e5dfc1efa47756e308c74209e3
diff --git a/app-dicts/sword-LvGluck8/metadata.xml b/app-dicts/sword-LvGluck8/metadata.xml
deleted file mode 100644
index 783f7711f625..000000000000
--- a/app-dicts/sword-LvGluck8/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This electronic version was first written by German Johann Ernst Glück and over the years has been improved until 7th edition in 1898. This Bible was created from 7th edition. However some words currently not in use in Latvian language are replaced by words in use today. Some old words are explained in parentheses. Statements or structure has not been altered.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-LvGluck8/sword-LvGluck8-1.1.ebuild b/app-dicts/sword-LvGluck8/sword-LvGluck8-1.1.ebuild
deleted file mode 100644
index 7c51fdb9e82b..000000000000
--- a/app-dicts/sword-LvGluck8/sword-LvGluck8-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Latvian Glück 8th edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LvGluck8"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MAK/Manifest b/app-dicts/sword-MAK/Manifest
deleted file mode 100644
index ba0c343536b7..000000000000
--- a/app-dicts/sword-MAK/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MAK-1.0.zip 365363 BLAKE2B 06609b47fdf89b4c1f22df60b8b73ecc7f9935af0a5b45476a8e805256e8dbf11b7e335410d392ef226c19a97fab249648d65496923d743b5c9ebbc5dc318529 SHA512 42bbcefda76fde6638c0951cee412b68ad2d1e3b39519f2c749f77fe8a65a6ddd4a0cd7f41e951c8091ae7120cd86f261ae39602cebc13153ce72fdc1f4b5fd2
diff --git a/app-dicts/sword-MAK/metadata.xml b/app-dicts/sword-MAK/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-MAK/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-MAK/sword-MAK-1.0.ebuild b/app-dicts/sword-MAK/sword-MAK-1.0.ebuild
deleted file mode 100644
index 310e0aa7e604..000000000000
--- a/app-dicts/sword-MAK/sword-MAK-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="MAK"
-
-inherit sword-module
-
-DESCRIPTION="Matthias Ansorgs Kommentar"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MAK"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MHC/Manifest b/app-dicts/sword-MHC/Manifest
deleted file mode 100644
index 44bd582367c5..000000000000
--- a/app-dicts/sword-MHC/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MHC-2.0.zip 15165443 BLAKE2B 730384cd47e5c48745111dedfd784c95b1837947a1aa9c2b26ff71b0fc9eb45d680a29159c88374602a37050e2c786379e3d2505efc03f52a2177fa7657acebd SHA512 32b102a895bc81530337b79e5a7fb5e438583c83cbdf293fd618f7f3078f89881364d8ac00f5160120f4ed5edd3967b2b3fbbaae04dd6e1fdfef26b85f900186
diff --git a/app-dicts/sword-MHC/metadata.xml b/app-dicts/sword-MHC/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-MHC/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-MHC/sword-MHC-2.0.ebuild b/app-dicts/sword-MHC/sword-MHC-2.0.ebuild
deleted file mode 100644
index 0efb38a40aa0..000000000000
--- a/app-dicts/sword-MHC/sword-MHC-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Matthew Henry's Complete Commentary on the Whole Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MHC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MHCC/Manifest b/app-dicts/sword-MHCC/Manifest
deleted file mode 100644
index 6f2529319332..000000000000
--- a/app-dicts/sword-MHCC/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MHCC-2.0.zip 1773039 BLAKE2B f5293507149b0dafa84f2a13086d66f8b38a3d33d175f2091e5af3f2b380c720b983596c6fd2e08d1864554bfcfd0c7fe49643305bf01b6cf15497a374666b58 SHA512 7a1f5c2749dfd33d24d387987d5acf76544c2059b791f424360c8abb7a99c02a89e175232bd57584cabe75e77bf9171c3152434d109d479ad123e5b9bd1c249a
diff --git a/app-dicts/sword-MHCC/metadata.xml b/app-dicts/sword-MHCC/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-MHCC/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-MHCC/sword-MHCC-2.0.ebuild b/app-dicts/sword-MHCC/sword-MHCC-2.0.ebuild
deleted file mode 100644
index ae1879cea046..000000000000
--- a/app-dicts/sword-MHCC/sword-MHCC-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Matthew Henry's Concise Commentary on the Whole Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MHCC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MKJV/Manifest b/app-dicts/sword-MKJV/Manifest
deleted file mode 100644
index 1764f64ff414..000000000000
--- a/app-dicts/sword-MKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MKJV-1.4.zip 1443590 BLAKE2B e4650b622ba7dccfa1443e2bcdd40933290fb670ddb32ddd84f4ecca89adc9edd06ca4b0a805ae462ee1c7e6ed10b312cabd8e8643c7911ee11758be43605934 SHA512 7f0c88f76b28f03c705f122289e574a3906a11847fde0f0737cfb7f7adc04cbe68cb9d501c854734fb4fc949528c5136aa75a68eda7ed3e8c3807e10ee09cfd6
diff --git a/app-dicts/sword-MKJV/metadata.xml b/app-dicts/sword-MKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-MKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-MKJV/sword-MKJV-1.4.ebuild b/app-dicts/sword-MKJV/sword-MKJV-1.4.ebuild
deleted file mode 100644
index f3be7e3f1832..000000000000
--- a/app-dicts/sword-MKJV/sword-MKJV-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Green's Modern King James Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MKJV"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MLStrong/Manifest b/app-dicts/sword-MLStrong/Manifest
deleted file mode 100644
index 64517a33215a..000000000000
--- a/app-dicts/sword-MLStrong/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MLStrong-1.0.1.zip 1111512 BLAKE2B dc13ee00d33ff8794f1769d4e1570604bd5e444938637efda1866c16d0e5f251f862a44801c88c0c1dc5f04ae8d67c767d8fc5b0180ac71ad4b1048f0f841220 SHA512 442ece11580b0f7f2b761c7205a094b69ce5aac194842de8c444c728f78453fa587ada552cad6acccb769f2a9346633871b766fd3343a04234f8be85dab0a887
diff --git a/app-dicts/sword-MLStrong/metadata.xml b/app-dicts/sword-MLStrong/metadata.xml
deleted file mode 100644
index 275f6881cb8b..000000000000
--- a/app-dicts/sword-MLStrong/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This lexicon is an abridgement of the Perseus Digital Library's edition of An Intermediate Greek-English Lexicon by Henry George Liddell and Robert Scott (Middle Liddell). The entries are keyed to Strong's numbers, and only those entries that match headwords found in Strong's Dictionary appear in this edition. Accordingly, many words from Strong's Dictionary do not appear here, either because their headwords differ from those of Liddell &amp; Scott or because they are proper nouns, which do not appear in Liddell &amp; Scott.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-MLStrong/sword-MLStrong-1.0.1.ebuild b/app-dicts/sword-MLStrong/sword-MLStrong-1.0.1.ebuild
deleted file mode 100644
index 9c3da146e3df..000000000000
--- a/app-dicts/sword-MLStrong/sword-MLStrong-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="An Intermediate Greek-English Lexicon Keyed to Strong's Numbers"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MLStrong"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Mal1910/Manifest b/app-dicts/sword-Mal1910/Manifest
deleted file mode 100644
index 7ffbce68cfd9..000000000000
--- a/app-dicts/sword-Mal1910/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Mal1910-1.1.1.zip 2063642 BLAKE2B d5c2e53b700cc99ed1148b25137fa5c670792b877cae3e8c31a4229821e6006a85825675633438518ffc080729616c805d8a8c784713b5d3ed3d6cac62eb818b SHA512 1947611c283aa40d52a02dbc8bb8860837b99750d493de3907a3feca8315fb3960691e21cf04374aed510a505ea47750f956338a27c47a3bfc9a4e0dffe5ea73
diff --git a/app-dicts/sword-Mal1910/metadata.xml b/app-dicts/sword-Mal1910/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Mal1910/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Mal1910/sword-Mal1910-1.1.1.ebuild b/app-dicts/sword-Mal1910/sword-Mal1910-1.1.1.ebuild
deleted file mode 100644
index fa12b29ecb95..000000000000
--- a/app-dicts/sword-Mal1910/sword-Mal1910-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Sathyavedapusthakam (Malayalam Bible) published in 1910"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mal1910"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ManxGaelic/Manifest b/app-dicts/sword-ManxGaelic/Manifest
deleted file mode 100644
index fe68415c10aa..000000000000
--- a/app-dicts/sword-ManxGaelic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ManxGaelic-1.1.zip 152306 BLAKE2B d38d790aa31e6d7f936c409d232bf0009bdb45c6e2a4dcc8dc0f15365e00adc56dfb3aab047b28bcfe1f2b9f525ebcc45c7c9229ed917e17b359e30ee9fcb80a SHA512 1d164c71bb04c57ec9347552904f46863d1596f56819217fbe20aa1a359d386224d02ddf4867fb412b932ab6ec2841f77b623f4bd6fd74f8a4b95ea0e108413b
diff --git a/app-dicts/sword-ManxGaelic/metadata.xml b/app-dicts/sword-ManxGaelic/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ManxGaelic/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ManxGaelic/sword-ManxGaelic-1.1.ebuild b/app-dicts/sword-ManxGaelic/sword-ManxGaelic-1.1.ebuild
deleted file mode 100644
index ffafab71de56..000000000000
--- a/app-dicts/sword-ManxGaelic/sword-ManxGaelic-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="ManxGaelic"
-
-inherit sword-module
-
-DESCRIPTION="Manx Gaelic Scripture Portions"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ManxGaelic"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Maori/Manifest b/app-dicts/sword-Maori/Manifest
deleted file mode 100644
index f7c0991f6be6..000000000000
--- a/app-dicts/sword-Maori/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Maori-1.1.zip 1397374 BLAKE2B f443a1008acccfd9b9c48171e9102da58a85bd97ce9ac8b6035a6d9aee07ebb20b97de5791c821bcfda371acae739d2dcb36bc57c39767e88fccd4479cefc647 SHA512 3a634eb0e785c43b0d6909d079cc9555f2fcb01735f6a8a80a904306567bc35c1490800024d56bbb194f7d0b78e9f984df068aa128f9bcc6c1fb99fed2bfa0a0
diff --git a/app-dicts/sword-Maori/metadata.xml b/app-dicts/sword-Maori/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Maori/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Maori/sword-Maori-1.1.ebuild b/app-dicts/sword-Maori/sword-Maori-1.1.ebuild
deleted file mode 100644
index 5e4e239881e7..000000000000
--- a/app-dicts/sword-Maori/sword-Maori-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Maori Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MapM/Manifest b/app-dicts/sword-MapM/Manifest
deleted file mode 100644
index 74161a36a8cc..000000000000
--- a/app-dicts/sword-MapM/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MapM-1.0.zip 1731033 BLAKE2B c5cfed8330f00acae5d38486e70efa258732959427fc3b5f01f9b1cb36c4b880199e9db5e971d7eaa5e546ce628c827d275d4bcde9567b9719b2920ca8ef05bd SHA512 c960def4b825bc491dc294ba968126a08f5b3ee3e30bfa1cd00d7bcc88c00fd7e97475d14cf2c8d3d93306a855a11edc5de3972973bfefc8557d3dd5302f2d80
diff --git a/app-dicts/sword-MapM/metadata.xml b/app-dicts/sword-MapM/metadata.xml
deleted file mode 100644
index f58d232897b1..000000000000
--- a/app-dicts/sword-MapM/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Miqra `al pi ha-Mesorah is a new experimental edition of the Tanakh in digital online format, now available as a carefully corrected draft of the entire Tanakh. It is based on the Aleppo Codex and related manuscripts, and consults the full range of masoretic scholarship.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-MapM/sword-MapM-1.0.ebuild b/app-dicts/sword-MapM/sword-MapM-1.0.ebuild
deleted file mode 100644
index 1060e36d4111..000000000000
--- a/app-dicts/sword-MapM/sword-MapM-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Miqra according to the Mesorah"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MapM"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Mg1865/Manifest b/app-dicts/sword-Mg1865/Manifest
deleted file mode 100644
index c7fdedf4793d..000000000000
--- a/app-dicts/sword-Mg1865/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Mg1865-2.0.zip 1559132 BLAKE2B 776ff166e8882d49f3946a871100a2e1ec5ad69eaaa380951683ced1d718c91b9456f82b32bc384f9bd6b64774bddbed7011e1a9e0e5ce57adf3dc84316aaa70 SHA512 8d31b8b07c7f42f40db2611c54c509a4cb9ed2090345a2980a779ac8d6d4216697fbcf5e41021919d2aa72ce94a6b53f9a1263b14835ab52be8b1c97b670bfe2
diff --git a/app-dicts/sword-Mg1865/metadata.xml b/app-dicts/sword-Mg1865/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Mg1865/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Mg1865/sword-Mg1865-2.0.ebuild b/app-dicts/sword-Mg1865/sword-Mg1865-2.0.ebuild
deleted file mode 100644
index 4ff0bc14f67e..000000000000
--- a/app-dicts/sword-Mg1865/sword-Mg1865-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Baiboly Malagasy (1865)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mg1865"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MollColossians/Manifest b/app-dicts/sword-MollColossians/Manifest
deleted file mode 100644
index 30a320a7c9bc..000000000000
--- a/app-dicts/sword-MollColossians/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MollColossians-1.0.zip 34449 BLAKE2B 22cb5d0cd3f45b364f5b00025b8699921e6bfdba4e2d4538cc6ed931c28fe0fa0d66d8280f6db183946920a525d70cad4c9f584e2205a13aadf59ed0481b8b57 SHA512 c4a365892cc14191e34fdfd4f41e486277445fb95e3b5c7bc3f6a267203c265e38888342fadae014940fe17f004738a0cb2136ac471082db1765cd5a6f503b36
diff --git a/app-dicts/sword-MollColossians/metadata.xml b/app-dicts/sword-MollColossians/metadata.xml
deleted file mode 100644
index ff8f1356cf83..000000000000
--- a/app-dicts/sword-MollColossians/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Paul's Letter to the Believers at Colosse - A Series of Devotions by Pastor Randy Moll. Scripture quotations are from the King James Version of the Bible.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-MollColossians/sword-MollColossians-1.0.ebuild b/app-dicts/sword-MollColossians/sword-MollColossians-1.0.ebuild
deleted file mode 100644
index d1e19fe0c26e..000000000000
--- a/app-dicts/sword-MollColossians/sword-MollColossians-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Paul's Letter to the Believers at Colosse - A Series of Devotions by Pr R. Moll"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MollColossians"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MonKJV/Manifest b/app-dicts/sword-MonKJV/Manifest
deleted file mode 100644
index d840fdb85ea0..000000000000
--- a/app-dicts/sword-MonKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MonKJV-1.4.zip 684932 BLAKE2B 2bd51fc94363201857b963d05b4d4871481ed0c7383a087e220e34bbaf2199426ae4352fec974b5d60abad7eca5e5290d9e82d907a5a4880e190022f518be291 SHA512 777dd0916ed2cbe211d561f237afcfb036e6f7a792fac9f43738ba97de87c248064b234cd77023ae478b3b59180cb41948443143c7a1a26fda83a6a76aa2449a
diff --git a/app-dicts/sword-MonKJV/metadata.xml b/app-dicts/sword-MonKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-MonKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-MonKJV/sword-MonKJV-1.4.ebuild b/app-dicts/sword-MonKJV/sword-MonKJV-1.4.ebuild
deleted file mode 100644
index a696b8b14974..000000000000
--- a/app-dicts/sword-MonKJV/sword-MonKJV-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Mongolian King James Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MonKJV"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Montgomery/Manifest b/app-dicts/sword-Montgomery/Manifest
deleted file mode 100644
index aa512d40b283..000000000000
--- a/app-dicts/sword-Montgomery/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Montgomery-1.3.zip 385461 BLAKE2B 945090c8a527c97aee35b05c2c640ab85f1a44f3f77bbba75e6fd091c256185e77c02fbeb27c502ccb07ce3124d3210c2acf6b1dc9eab64ec21e39bdb17c281d SHA512 29b434a1904c37d80b4d7f9da23f0fdc680b77341753bb35a3ad3e0c687683f1ee6cb2516b56761cec61366a606847784aa6336df6cff2e930b36726427f1b43
diff --git a/app-dicts/sword-Montgomery/metadata.xml b/app-dicts/sword-Montgomery/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Montgomery/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Montgomery/sword-Montgomery-1.3.ebuild b/app-dicts/sword-Montgomery/sword-Montgomery-1.3.ebuild
deleted file mode 100644
index ee8532c03dc0..000000000000
--- a/app-dicts/sword-Montgomery/sword-Montgomery-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Montgomery"
-
-inherit sword-module
-
-DESCRIPTION="Montgomery New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Montgomery"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-MorphGNT/Manifest b/app-dicts/sword-MorphGNT/Manifest
deleted file mode 100644
index 53638b817bb6..000000000000
--- a/app-dicts/sword-MorphGNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MorphGNT-2.0.zip 1327923 BLAKE2B 9833022838334ffbca6e9dcae52262d1539d5d19ab55d471afa55a3df30f6da673a02e38d36b8ea247ee002ef805cc7650bced3ca35fa36abd26a5cb6cbe9ec8 SHA512 02cbb90efa3c4fc45bcda9745511fc426922ada5287a0f5742903d528f3a9c037f6d3be5fc8c719c5f945ee31ab99a14043751dc32a638769491cd9d1cb4524f
diff --git a/app-dicts/sword-MorphGNT/metadata.xml b/app-dicts/sword-MorphGNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-MorphGNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-MorphGNT/sword-MorphGNT-2.0.ebuild b/app-dicts/sword-MorphGNT/sword-MorphGNT-2.0.ebuild
deleted file mode 100644
index 173b19d50315..000000000000
--- a/app-dicts/sword-MorphGNT/sword-MorphGNT-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Morphologically Parsed Greek New Testament based on the SBLGNT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MorphGNT"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Murdock/Manifest b/app-dicts/sword-Murdock/Manifest
deleted file mode 100644
index c9623c2bf44a..000000000000
--- a/app-dicts/sword-Murdock/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Murdock-1.2.zip 396395 BLAKE2B 9b14f7879a1754f1addb1e85024a873a084d560a2179e21124d59cd8ae5eb16fdb972241fd3c2eb786c3c17e81a9a64d6605459c96c631f5092c1d23ca3fb21c SHA512 a6d06a5157c6ebcb0b3d7689e76b5d04765a602f334b937d65260a4ed89cd92b316f0d792071a574364a501b55a449f9bb1af123abd05a49f2af7d87dddc5d02
diff --git a/app-dicts/sword-Murdock/metadata.xml b/app-dicts/sword-Murdock/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Murdock/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Murdock/sword-Murdock-1.2.ebuild b/app-dicts/sword-Murdock/sword-Murdock-1.2.ebuild
deleted file mode 100644
index 2349f616dd22..000000000000
--- a/app-dicts/sword-Murdock/sword-Murdock-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Murdock"
-
-inherit sword-module
-
-DESCRIPTION="James Murdock's Translation of the Syriac Peshitta"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Murdock"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NETfree/Manifest b/app-dicts/sword-NETfree/Manifest
deleted file mode 100644
index 27641cfcc178..000000000000
--- a/app-dicts/sword-NETfree/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NETfree-1.0.1.zip 3408528 BLAKE2B e5456499d99567750e1891688e59cb651bdc0a8a88bd455031ed51d3682952cd41b27749c533e46badb683002b48f430a83cc6131c25ab6ce464dbc84a284209 SHA512 bd444870d72d169573218594897709d4bde602bc8ad2b07cd2952ce35077de01c643fd4ae8ed6d757afc237b9c2e542e1b6ec795007343610d48d25cfd98d645
diff --git a/app-dicts/sword-NETfree/metadata.xml b/app-dicts/sword-NETfree/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NETfree/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NETfree/sword-NETfree-1.0.1.ebuild b/app-dicts/sword-NETfree/sword-NETfree-1.0.1.ebuild
deleted file mode 100644
index 29bde3740731..000000000000
--- a/app-dicts/sword-NETfree/sword-NETfree-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Free version of New English Translation with limited notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETfree"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NETnotesfree/Manifest b/app-dicts/sword-NETnotesfree/Manifest
deleted file mode 100644
index 5e44ffa13294..000000000000
--- a/app-dicts/sword-NETnotesfree/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NETnotesfree-1.0.1.zip 2384042 BLAKE2B 68f66d747eb5b86bb076552304873c0bb5ced3f78e5430f613e9ad8945ca24cd5be3782aa3764ae474924968f6b00b33168b26fc2e488892aec79267b095b0e0 SHA512 426367f0e7a2afe831d03c30952f6189aae24c51d83d611b8ff4cbad06840ba2bca687dde5c7793aa1ecab5c224ed4afd1d8170518e3713d4abe2596dcf6dd37
diff --git a/app-dicts/sword-NETnotesfree/metadata.xml b/app-dicts/sword-NETnotesfree/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NETnotesfree/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NETnotesfree/sword-NETnotesfree-1.0.1.ebuild b/app-dicts/sword-NETnotesfree/sword-NETnotesfree-1.0.1.ebuild
deleted file mode 100644
index c30f71138af6..000000000000
--- a/app-dicts/sword-NETnotesfree/sword-NETnotesfree-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Free version of NET Bible Footnotes with limited notes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETnotesfree"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NETtext/Manifest b/app-dicts/sword-NETtext/Manifest
deleted file mode 100644
index b7c5b8b51f86..000000000000
--- a/app-dicts/sword-NETtext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NETtext-1.0.0.zip 2019471 BLAKE2B 53a2af043990c92dc5261afa0c6c7a5fb7e537a30cab2fecbbe992f2403b1a970b2430d8bc3b6c1ab065cbeb660ec8a100bc5cc070c3e0c5b80820c5ef69e121 SHA512 6b6a178bc7b50ed7ea907d4ca85e4e6b51c8e59a8875943f0fd94129fe7084af52c8085f26042a7ddf473376fa3ff0fb61ad07af1f87a4875b4c5f9adf75d7e8
diff --git a/app-dicts/sword-NETtext/metadata.xml b/app-dicts/sword-NETtext/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NETtext/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NETtext/sword-NETtext-1.0.0.ebuild b/app-dicts/sword-NETtext/sword-NETtext-1.0.0.ebuild
deleted file mode 100644
index 0b2551b7bc4b..000000000000
--- a/app-dicts/sword-NETtext/sword-NETtext-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="New English Translation text only with footnote markers"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETtext"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NHEB/Manifest b/app-dicts/sword-NHEB/Manifest
deleted file mode 100644
index 228a23ac146e..000000000000
--- a/app-dicts/sword-NHEB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NHEB-2.1.zip 1707586 BLAKE2B 0de8ccff1afb296a3537ab5b190840db51004dca81bb3d03dbb927cbe7e1254f54742187350f92a4c5bab5a65331e5f88eed571fd016a341fe11abf8b77c8542 SHA512 159e8b4ff4a40aadcb377c8a0711dac6a63262579579cbea2858282a31815fd21d1f8767ffbdbcffadfb8016be1e0971faa487672f338efdba7164fcb4475cab
diff --git a/app-dicts/sword-NHEB/metadata.xml b/app-dicts/sword-NHEB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NHEB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NHEB/sword-NHEB-2.1.ebuild b/app-dicts/sword-NHEB/sword-NHEB-2.1.ebuild
deleted file mode 100644
index 6ab37d824eb9..000000000000
--- a/app-dicts/sword-NHEB/sword-NHEB-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="New Heart English Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NHEBJE/Manifest b/app-dicts/sword-NHEBJE/Manifest
deleted file mode 100644
index ac06b37657e3..000000000000
--- a/app-dicts/sword-NHEBJE/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NHEBJE-2.1.zip 1707083 BLAKE2B a5ab00760653a6529e9406b8bdc118d205e22f3619c7bba5aeae652c65c5e6ff7ddac2e65b86306f4574524597c04738462983d56bddbfe27ff192eabed864cb SHA512 69e3944974120837a1361b29326a4fd0093ca20cc52fa8c7d27a3107a994947c67f0e367433b81da4afaa0c1c307920634542a4350222e904ffd71a57e4ecf58
diff --git a/app-dicts/sword-NHEBJE/metadata.xml b/app-dicts/sword-NHEBJE/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NHEBJE/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NHEBJE/sword-NHEBJE-2.1.ebuild b/app-dicts/sword-NHEBJE/sword-NHEBJE-2.1.ebuild
deleted file mode 100644
index 846c6f83502e..000000000000
--- a/app-dicts/sword-NHEBJE/sword-NHEBJE-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="New Heart English Bible: Jehovah Edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBJE"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NHEBME/Manifest b/app-dicts/sword-NHEBME/Manifest
deleted file mode 100644
index 30f8d822d5b4..000000000000
--- a/app-dicts/sword-NHEBME/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NHEBME-2.1.zip 1707965 BLAKE2B 39c487f6ae62efd2da25d043da7930016375a0f9f52fbc96db70d05149f1850d41b5aa86cb01544f75353c3e921cbc55e618f2d5dac5da2f0ae959d3867d52a9 SHA512 3c8b6a8a79d75f3f5f65773e6e76342a31a4310eb7f25533e65f3252167a05b64dc2c230b0f0bfb729a611b12bd2c1fc4390d008689ad6bfaa0fb13dc6fface8
diff --git a/app-dicts/sword-NHEBME/metadata.xml b/app-dicts/sword-NHEBME/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NHEBME/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NHEBME/sword-NHEBME-2.1.ebuild b/app-dicts/sword-NHEBME/sword-NHEBME-2.1.ebuild
deleted file mode 100644
index 7e537a206a49..000000000000
--- a/app-dicts/sword-NHEBME/sword-NHEBME-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="New Heart English Bible: Messianic Edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBME"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Nave/Manifest b/app-dicts/sword-Nave/Manifest
deleted file mode 100644
index d6a11934fc0f..000000000000
--- a/app-dicts/sword-Nave/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Nave-3.0.zip 1300879 BLAKE2B 353a34fa884ec02a350f0bf545a728f6892349d32a38cd0bdbe5c9e8d07c8814b54fb833468ef70cdf14ea29358487f7ba6982aca94292a70d80e13be808438a SHA512 38d11006209ac8bffd80754bd3452b900a3a14c43ec760f79a61a901f322dcbc000b2d8c8b6bd51864b2afd00977e4e8be1416f2e1536c30347f3e13385ff290
diff --git a/app-dicts/sword-Nave/metadata.xml b/app-dicts/sword-Nave/metadata.xml
deleted file mode 100644
index 9d27c529c551..000000000000
--- a/app-dicts/sword-Nave/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Nave's Topics were originaly produced by Orville J. Nave, A.M., D.D., LL.D.
-		while serving as a chaplain in the United States Army. He referred to this
-		work as "the result of fourteen years of delightful and untiring study of the
-		Word of God." Nave's topics were originally published in the early 1900's,
-		and a photo-offset reproduction is currently published by Hendrickson,
-		ISBN 0-917006-02-X. The title page states that this work consists of 20,000+
-		topics and subtopics, and 100,000 references to the Scriptures.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Nave/sword-Nave-3.0.ebuild b/app-dicts/sword-Nave/sword-Nave-3.0.ebuild
deleted file mode 100644
index 64a45630a07f..000000000000
--- a/app-dicts/sword-Nave/sword-Nave-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Nave's Topical Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nave"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Ndebele/Manifest b/app-dicts/sword-Ndebele/Manifest
deleted file mode 100644
index 70c7be510db0..000000000000
--- a/app-dicts/sword-Ndebele/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Ndebele-1.2.zip 2670226 BLAKE2B efe7ed577c72b75b6233983587c58ac0e0d91209f640a6eb43855e2901b62d7ea39c9f28fb2828d791a801b10c26fc200ce8b8e7c50ab9b99dc4ab58eb6dabf7 SHA512 851819012bc89887ec9f7b0434ac3444e35f079ed368e6288e7263b6720c022c482db62347c889661e3ed9eee508237780b8b6caddf7c5f108de03761e3da6cb
diff --git a/app-dicts/sword-Ndebele/metadata.xml b/app-dicts/sword-Ndebele/metadata.xml
deleted file mode 100644
index 6cce6d068eca..000000000000
--- a/app-dicts/sword-Ndebele/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		The Ndebele Bible that is offered here to you is partly completed and partly a work in progress at the time of writing, 2018.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Ndebele/sword-Ndebele-1.2.ebuild b/app-dicts/sword-Ndebele/sword-Ndebele-1.2.ebuild
deleted file mode 100644
index 4220881af844..000000000000
--- a/app-dicts/sword-Ndebele/sword-Ndebele-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Ndebele Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ndebele"
-LICENSE="FDL-1.3+"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Nestle1904/Manifest b/app-dicts/sword-Nestle1904/Manifest
deleted file mode 100644
index 79bf2287e4a2..000000000000
--- a/app-dicts/sword-Nestle1904/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Nestle1904-1.3.zip 596868 BLAKE2B 4679dddc07e65fa2208964ef5259683604c71f8298b170fb0e6a08a9c98abdd9d1e7dc4156bf977dcd84543cd9c985a5145588b36e0d4b15668baa2de2c0a6be SHA512 0b147de7f040dde759dcc34579b0b26a5856a894f483365cd5f16f1cceda84b5ec92b0bcf55e270964361bc0c094883e526e11d7fbbdb26fd6c864671a02ed84
diff --git a/app-dicts/sword-Nestle1904/metadata.xml b/app-dicts/sword-Nestle1904/metadata.xml
deleted file mode 100644
index 0ecbb401d776..000000000000
--- a/app-dicts/sword-Nestle1904/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Eberhard Nestle's edition of the Greek New Testament, published in 1904 by the British and Foreign Bible Society. Based on the 1904 (http://www.archive.org/details/biblentgreektext00nestuoft) and 1913 (www.archive.org/details/hkainediathekete00lond) editions of the Eberhard Nestle\'s Greek New Testament.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Nestle1904/sword-Nestle1904-1.3.ebuild b/app-dicts/sword-Nestle1904/sword-Nestle1904-1.3.ebuild
deleted file mode 100644
index 7fe0e08bbadd..000000000000
--- a/app-dicts/sword-Nestle1904/sword-Nestle1904-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Nestle GNT 1904"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nestle1904"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NlCanisius1939/Manifest b/app-dicts/sword-NlCanisius1939/Manifest
deleted file mode 100644
index e01ae4b91e1a..000000000000
--- a/app-dicts/sword-NlCanisius1939/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NlCanisius1939-1.0.zip 1790561 BLAKE2B 7fa3bdbb20e6423691710adb2fc033a8343eb89953f19de46ebbe3459614477d04fb906b6682f15845bb5d00ef0ff3e29eaea64d26a737bce270b9f042c2450c SHA512 047f587a17df5d64e46cfb915ab7def8f8800c3dd912c5ab34b03fdd7409aa2107189642e677f0fbe9322b302a7ac1770cd179e069854059cf28cd13d555422e
diff --git a/app-dicts/sword-NlCanisius1939/metadata.xml b/app-dicts/sword-NlCanisius1939/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NlCanisius1939/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NlCanisius1939/sword-NlCanisius1939-1.0.ebuild b/app-dicts/sword-NlCanisius1939/sword-NlCanisius1939-1.0.ebuild
deleted file mode 100644
index 1b453423bc63..000000000000
--- a/app-dicts/sword-NlCanisius1939/sword-NlCanisius1939-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Petrus Canisius Translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NlCanisius1939"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NorBroed/Manifest b/app-dicts/sword-NorBroed/Manifest
deleted file mode 100644
index 6cd7bf815c88..000000000000
--- a/app-dicts/sword-NorBroed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NorBroed-1.0.1.zip 372307 BLAKE2B 6bb696b466a100eb9dce5d9338aedcbdd0a797163ed606a18d5a3118e4a3a77116cd3561957a3d89ca487b766f56fe1472fa98de3965221d96e47f9006b706db SHA512 d22077c943b9cfe90cce35253787f6b5508f34c9c4c1675333744a6c90ae04cbda79dc7ade96c7ba12861ff878abf9c65285df393b59bff9b8e240cd7cab94dd
diff --git a/app-dicts/sword-NorBroed/metadata.xml b/app-dicts/sword-NorBroed/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NorBroed/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NorBroed/sword-NorBroed-1.0.1.ebuild b/app-dicts/sword-NorBroed/sword-NorBroed-1.0.1.ebuild
deleted file mode 100644
index 7ba7553d86fe..000000000000
--- a/app-dicts/sword-NorBroed/sword-NorBroed-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Bread Norwegian NT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorBroed"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NorSMB/Manifest b/app-dicts/sword-NorSMB/Manifest
deleted file mode 100644
index 1d4a6968afae..000000000000
--- a/app-dicts/sword-NorSMB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NorSMB-1.0.zip 1477046 BLAKE2B 1df96807c1e8359898adbed199c1c23aa2fd74deea78794bd8bffbdaab8580eb9c7ec785a231de3eedd1b10c250a16fa9f0a5d07b545821e4773915203c925be SHA512 fd5af2b1c31a61a27a9b57dac2a732a8056d89ec525c8fd9c9cdc033a8bce5e212ad88aec33dde1a442cb8047656c3a615de7a2808768c2c0894ef0ee2470438
diff --git a/app-dicts/sword-NorSMB/metadata.xml b/app-dicts/sword-NorSMB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NorSMB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NorSMB/sword-NorSMB-1.0.ebuild b/app-dicts/sword-NorSMB/sword-NorSMB-1.0.ebuild
deleted file mode 100644
index e5ecf84b16a3..000000000000
--- a/app-dicts/sword-NorSMB/sword-NorSMB-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Studentmållagsbibelen, first complete Nynorsk Bible translation (1921)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorSMB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Norsk/Manifest b/app-dicts/sword-Norsk/Manifest
deleted file mode 100644
index 6d4ce41ec773..000000000000
--- a/app-dicts/sword-Norsk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Norsk-2.0.zip 1509279 BLAKE2B e6819ad66b3925b8844061a60989b8d17e0dfd85807f9042fcd0db610f57aadf5442511fa5e494bb7c31253c49e03f5e087eeb9e2b76b907864b30abbe1fc97c SHA512 5793934f37deb1ee8fe9a6916741f99ce24dfd8bb6d1d3cba851b2d7e9882949a6548fcdd8f7a6add0002ce93f7c0f0fd4e0b8b6eec7959df43e7aa7b0caf27b
diff --git a/app-dicts/sword-Norsk/metadata.xml b/app-dicts/sword-Norsk/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Norsk/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Norsk/sword-Norsk-2.0.ebuild b/app-dicts/sword-Norsk/sword-Norsk-2.0.ebuild
deleted file mode 100644
index 4bf43392286b..000000000000
--- a/app-dicts/sword-Norsk/sword-Norsk-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Den Norske Bibelen"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Norsk"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-NorthernAzeri/Manifest b/app-dicts/sword-NorthernAzeri/Manifest
deleted file mode 100644
index 8853be515f06..000000000000
--- a/app-dicts/sword-NorthernAzeri/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NorthernAzeri-1.0.1.zip 2057321 BLAKE2B e9bff39550a74d874f4d4e2ea6cfd74b9fdd22d71374785a9681e7240cdda47e1ee7b0c232600656c5531179fee920ff23049ed5d05ff59ef9ca1c61cd43850e SHA512 67664d07e5fa861613078a8a64bfe5d1faedeb322fb54aa9b61956d4ce10142e2415ef5a19be39d671944d44115d249a73771b7f9727240952425cf4e5fe7440
diff --git a/app-dicts/sword-NorthernAzeri/metadata.xml b/app-dicts/sword-NorthernAzeri/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-NorthernAzeri/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-NorthernAzeri/sword-NorthernAzeri-1.0.1.ebuild b/app-dicts/sword-NorthernAzeri/sword-NorthernAzeri-1.0.1.ebuild
deleted file mode 100644
index f9db336e25f8..000000000000
--- a/app-dicts/sword-NorthernAzeri/sword-NorthernAzeri-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.10"
-
-inherit sword-module
-
-DESCRIPTION="Northern Azeri Translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorthernAzeri"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Noyes/Manifest b/app-dicts/sword-Noyes/Manifest
deleted file mode 100644
index 55a4f539da29..000000000000
--- a/app-dicts/sword-Noyes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Noyes-1.2.zip 827202 BLAKE2B ec7c4dbd78fd004dff6d9f2390e32b00f240abb59df2dd8b8aab88577b0948261aafa4e638d337bf0ee3527d9ee15fd8cf6da2657faa0f61a023477518875b4b SHA512 17ab608ca2e8951f5654ff667100f9b13cbdd530155f39c0e82fc52e9c7a9ac81914f3497c05130794e6a8323b6bed444e72332db674a7c9edfad6b5c1d085f4
diff --git a/app-dicts/sword-Noyes/metadata.xml b/app-dicts/sword-Noyes/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Noyes/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Noyes/sword-Noyes-1.2.ebuild b/app-dicts/sword-Noyes/sword-Noyes-1.2.ebuild
deleted file mode 100644
index 3bcd6c4328d2..000000000000
--- a/app-dicts/sword-Noyes/sword-Noyes-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1869 Noyes Translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Noyes"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-OEB/Manifest b/app-dicts/sword-OEB/Manifest
deleted file mode 100644
index 643cf87b71b5..000000000000
--- a/app-dicts/sword-OEB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OEB-1.1.zip 613627 BLAKE2B e44f56c20eb195af7238e9c0aa5cbf3c5c27c09a450c693181971d65d9ecff32813b600313da4222e8c09c703e5c17b14cbafc9dff8bb460b0f3058685d9a03a SHA512 c0782ba1429c91097f0a632e77f696cfb0ec8c0a1dbe4a38f9b2585413a6d17d78eaad2da4bb5a9f97ae68856691215e4ebe50c79ff41374ddd41f015e237277
diff --git a/app-dicts/sword-OEB/metadata.xml b/app-dicts/sword-OEB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-OEB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-OEB/sword-OEB-1.1.ebuild b/app-dicts/sword-OEB/sword-OEB-1.1.ebuild
deleted file mode 100644
index 0f619cc25c0d..000000000000
--- a/app-dicts/sword-OEB/sword-OEB-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Open English Bible (US Spelling)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEB"
-LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-OEBcth/Manifest b/app-dicts/sword-OEBcth/Manifest
deleted file mode 100644
index c6a2869758f9..000000000000
--- a/app-dicts/sword-OEBcth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OEBcth-1.1.zip 613615 BLAKE2B d077e9dc435fd4c626032d3f1cd82427596ed7569f66b5080b6ce16e923912f055bdab8798243bd42eb57cd983d6927703a772cb33879a959cc7e7fb72db2560 SHA512 b52dace0949ff9f9cf154bba6e549209fbc002d0f810be0ec06d3e0f1f3afed9ad0ab544e3a1102f225bf034b391b8410f64537f8b92d423344a8d8735305b9c
diff --git a/app-dicts/sword-OEBcth/metadata.xml b/app-dicts/sword-OEBcth/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-OEBcth/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-OEBcth/sword-OEBcth-1.1.ebuild b/app-dicts/sword-OEBcth/sword-OEBcth-1.1.ebuild
deleted file mode 100644
index 50bcd40d125c..000000000000
--- a/app-dicts/sword-OEBcth/sword-OEBcth-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Open English Bible (Commonwealth Spelling)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEBcth"
-LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-OSHB/Manifest b/app-dicts/sword-OSHB/Manifest
deleted file mode 100644
index f6b4e8bdf586..000000000000
--- a/app-dicts/sword-OSHB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OSHB-2.1.2.zip 3135045 BLAKE2B c5bbe48b76c594b4d32a97718b27adcdc688a5360977e7351c754d2cf84831f42755cfc58a5cb2b30ec4f65e42dfd7ac4020b38035ae32088d3ef0eb0e21567c SHA512 ea5d5fc70d67fd21e9a7badc5244411d1f1561a9487dee9acc589cb5861123032af5d822e9a931dc56d48dd8ef47cb7f24d537b1bc5dd7db3177d97aff7d1329
diff --git a/app-dicts/sword-OSHB/metadata.xml b/app-dicts/sword-OSHB/metadata.xml
deleted file mode 100644
index e56208a0eed3..000000000000
--- a/app-dicts/sword-OSHB/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This text is based on the Westminster Leningrad Codex, tagged with Strong's numbers, and maintained by OpenScriptures.org. OpenScriptures is currently adding morphology tagging. To contribute to this effort or follow its progress, see https://groups.google.com/forum/#!forum/openscriptures-hb.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-OSHB/sword-OSHB-2.1.2.ebuild b/app-dicts/sword-OSHB/sword-OSHB-2.1.2.ebuild
deleted file mode 100644
index 05cff473a5c5..000000000000
--- a/app-dicts/sword-OSHB/sword-OSHB-2.1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Open Scriptures Hebrew Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHB"
-LICENSE="CC-BY-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-OSHM/Manifest b/app-dicts/sword-OSHM/Manifest
deleted file mode 100644
index 4c2908274c22..000000000000
--- a/app-dicts/sword-OSHM/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OSHM-2.1.zip 99375 BLAKE2B e56e9a9c797687e7b5c257283b6a0e2b1e9994de0255595a1140f42115873f4cec34652a28734c2b5462cf1d73317c3e87dbfb3f5449ad3bc3a77571b7a1776b SHA512 676b1bb0e30da004c7103ca3cb0992874cd644cbb6141635d5f6477179e8c2869cc17c4fec3acf2073ffb64dbfaae6fe451bc59f0ce8122459f9f9a43dd328fe
diff --git a/app-dicts/sword-OSHM/metadata.xml b/app-dicts/sword-OSHM/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-OSHM/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-OSHM/sword-OSHM-2.1.ebuild b/app-dicts/sword-OSHM/sword-OSHM-2.1.ebuild
deleted file mode 100644
index fc9e1daa70a0..000000000000
--- a/app-dicts/sword-OSHM/sword-OSHM-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.7.4"
-
-inherit sword-module
-
-DESCRIPTION="Open Scriptures Hebrew Morphology Key"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHM"
-LICENSE="CC-BY-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-OrthJBC/Manifest b/app-dicts/sword-OrthJBC/Manifest
deleted file mode 100644
index bf2d70092a9c..000000000000
--- a/app-dicts/sword-OrthJBC/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OrthJBC-1.1.zip 562457 BLAKE2B 7bc6839b146b21f9b6194a437a08575cf5d15a490f4430ed4538a1a932ea9b33880de86cdf4fb97da7b861e253622343ee06a056f2f5f6101a03cfa1ac45247b SHA512 5744b13c98d51c92567d794203d2db6ef01297d0b094abe507853a0d6226635cdc2c6a7ee2ec5f4fb0e96ae8d591cc40731bad9f9081ce1a33142943828c98b8
diff --git a/app-dicts/sword-OrthJBC/metadata.xml b/app-dicts/sword-OrthJBC/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-OrthJBC/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-OrthJBC/sword-OrthJBC-1.1.ebuild b/app-dicts/sword-OrthJBC/sword-OrthJBC-1.1.ebuild
deleted file mode 100644
index 2368dbb926d3..000000000000
--- a/app-dicts/sword-OrthJBC/sword-OrthJBC-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The Orthodox Jewish Brit Chadasha"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OrthJBC"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Orthodoxy/Manifest b/app-dicts/sword-Orthodoxy/Manifest
deleted file mode 100644
index e98d0d02c31d..000000000000
--- a/app-dicts/sword-Orthodoxy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Orthodoxy-1.0.zip 130248 BLAKE2B 1da096a0c35c12e83bbd33daf0ee6ad0a4410b316a53e8aeda32f95fe36a7a385b85784a1b127bec0aa1eea8b0a409802aff62dbb32b4ee461a0e24b5501e620 SHA512 64f411ec2bfc44ddedc47281a52e9ede255c6cf67ad90b8f98d1047bd9db295f7974f196f25da728179926b147cac3f2303f55760daab97dc5f7aee56cb33116
diff --git a/app-dicts/sword-Orthodoxy/metadata.xml b/app-dicts/sword-Orthodoxy/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Orthodoxy/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Orthodoxy/sword-Orthodoxy-1.0.ebuild b/app-dicts/sword-Orthodoxy/sword-Orthodoxy-1.0.ebuild
deleted file mode 100644
index 4f5d77a0a36a..000000000000
--- a/app-dicts/sword-Orthodoxy/sword-Orthodoxy-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Orthodoxy"
-
-inherit sword-module
-
-DESCRIPTION="Orthodoxy by Gilbert K. Chesterton (1874-1936)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Orthodoxy"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-OxfordTR/Manifest b/app-dicts/sword-OxfordTR/Manifest
deleted file mode 100644
index 107efbf58f7a..000000000000
--- a/app-dicts/sword-OxfordTR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OxfordTR-1.0.zip 39844 BLAKE2B ce58ddd0bc23b13105c8bdaadb986f8a30b81d0c614d6087b33a182fd6e42f184d3ac87820ea60d4ea6df4632bce94e9c7869f26f4bb254ade33ea172d4a302b SHA512 6cc3155e7424253320f163b253e8c5c0d7b6b854306f360b6348006dddbee6a32f3e49393bed58516f86117a4d44bccc148f0c437281b4c48fb4a8a8762852a6
diff --git a/app-dicts/sword-OxfordTR/metadata.xml b/app-dicts/sword-OxfordTR/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-OxfordTR/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-OxfordTR/sword-OxfordTR-1.0.ebuild b/app-dicts/sword-OxfordTR/sword-OxfordTR-1.0.ebuild
deleted file mode 100644
index 9b1ef2ea76a4..000000000000
--- a/app-dicts/sword-OxfordTR/sword-OxfordTR-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1873 Oxford Textus Receptus Gospel of John"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OxfordTR"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PNT/Manifest b/app-dicts/sword-PNT/Manifest
deleted file mode 100644
index 97abd3b6bc7b..000000000000
--- a/app-dicts/sword-PNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PNT-1.1.zip 871337 BLAKE2B c5e71dacaf6560c27966d9889ba4a24c95e1fc83dcb85707faa395fea1204cba2c971db9afa9baa2b2ef958e89b76c8ec4068aac02dd736696e41dbd4b4ed5ba SHA512 22bf6934d126f83b2ddbf3a585373adf55dc6d582ed223ded3d52b2c957fec644874273c8c1d2d6ffb09c671485df8bc2e8b9d388ef49a70c772ffc2c2ff5ca3
diff --git a/app-dicts/sword-PNT/metadata.xml b/app-dicts/sword-PNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-PNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-PNT/sword-PNT-1.1.ebuild b/app-dicts/sword-PNT/sword-PNT-1.1.ebuild
deleted file mode 100644
index b5fefd287307..000000000000
--- a/app-dicts/sword-PNT/sword-PNT-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="PNT"
-
-inherit sword-module
-
-DESCRIPTION="The People's New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PNT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Packard/Manifest b/app-dicts/sword-Packard/Manifest
deleted file mode 100644
index 5b9d60ecfaab..000000000000
--- a/app-dicts/sword-Packard/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Packard-1.2.zip 27893 BLAKE2B 7722b24e15080e932da5852fdc73ffaa77db6bb2a5435ca1b1a185eb83c67332e7bc44b6d00c975b78f114f16b990f0d30c8705ef0b20e85e65357283bbf61fc SHA512 b1e93cbcc385856cfc0bb98d223fbc2e47c800e9ab1b50ac64d9ccdc792ca8d61ba4000811fa5de64970766a44996a69b87c9825d79aa539af34857da0ee82c4
diff --git a/app-dicts/sword-Packard/metadata.xml b/app-dicts/sword-Packard/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Packard/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Packard/sword-Packard-1.2.ebuild b/app-dicts/sword-Packard/sword-Packard-1.2.ebuild
deleted file mode 100644
index 2815686ed6d2..000000000000
--- a/app-dicts/sword-Packard/sword-Packard-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Packard"
-
-inherit sword-module
-
-DESCRIPTION="Packard's Morphological Analysis Codes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Packard"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Passion/Manifest b/app-dicts/sword-Passion/Manifest
deleted file mode 100644
index 45b9124a9ab4..000000000000
--- a/app-dicts/sword-Passion/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Passion-1.0.zip 264741 BLAKE2B d40ee0fc79b098d0539ca2c3da4b75bd6722c28d254262d68408561afdb87849ec426961b67b574c8f552a606069e3959cba681bebd652a8caf76ca134760a96 SHA512 15f01f6639eb97bacda7f272f3eb47ce507e7c2845608a11959ce037f8758dd8080f62eac92bb38a176e9da9b8ee2da63e515e01eaec7e3295bc4ef57d7615fa
diff --git a/app-dicts/sword-Passion/metadata.xml b/app-dicts/sword-Passion/metadata.xml
deleted file mode 100644
index 50ce3b2c67bd..000000000000
--- a/app-dicts/sword-Passion/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Taken from the meditations of St. Anne Katharina Emmerick. Parts of the text served as inspiration for Mel Gibson's film.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Passion/sword-Passion-1.0.ebuild b/app-dicts/sword-Passion/sword-Passion-1.0.ebuild
deleted file mode 100644
index 35b54edc6d7a..000000000000
--- a/app-dicts/sword-Passion/sword-Passion-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Dolorous Passion of Our Lord Jesus Christ"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Passion"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Personal/Manifest b/app-dicts/sword-Personal/Manifest
deleted file mode 100644
index 6a2c315dff24..000000000000
--- a/app-dicts/sword-Personal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Personal-1.0.zip 41316 BLAKE2B 1ef0fef2e3fffad81a6638105f6a0e487d03c1c288fb7753b1d03aa7b67a110e119d821ab70e3243d79fe3f6750c66675c95ce40f6ff37296ece8800242b80fc SHA512 514c61c70493015698752f1c4adcd1030bd87e7457843e50d8ba5583a6cbbabc87a54cb97285de03aa36112dfc689769e867f1ef40d61ef43255a429653b2acd
diff --git a/app-dicts/sword-Personal/metadata.xml b/app-dicts/sword-Personal/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Personal/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Personal/sword-Personal-1.0.ebuild b/app-dicts/sword-Personal/sword-Personal-1.0.ebuild
deleted file mode 100644
index 02a4bd9bb395..000000000000
--- a/app-dicts/sword-Personal/sword-Personal-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Personal"
-
-inherit sword-module
-
-DESCRIPTION="Personal Commentary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Peshitta/Manifest b/app-dicts/sword-Peshitta/Manifest
deleted file mode 100644
index ace89c01172f..000000000000
--- a/app-dicts/sword-Peshitta/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Peshitta-2.0.zip 324100 BLAKE2B ba109b5fbb1ab09c34d8667bd1a0deda3669096f84bcee394ac438517f80ba9f223c4744b9acd851c8ffc6d1690f803bbc198e17525852b1fb1e1ef8e4731fa7 SHA512 af21f0e6fe15a585f82bbc5b29d659612bda5cacbc32739a708a986733c913b70f1197b03d0d97b9e5c0a5f13aefd0d4f932259776511fc9a4a87c6d757f70a0
diff --git a/app-dicts/sword-Peshitta/metadata.xml b/app-dicts/sword-Peshitta/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Peshitta/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Peshitta/sword-Peshitta-2.0.ebuild b/app-dicts/sword-Peshitta/sword-Peshitta-2.0.ebuild
deleted file mode 100644
index ea5bb9365cb6..000000000000
--- a/app-dicts/sword-Peshitta/sword-Peshitta-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Syriac Peshitta"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Peshitta"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Phaistos/Manifest b/app-dicts/sword-Phaistos/Manifest
deleted file mode 100644
index 41763ce840d3..000000000000
--- a/app-dicts/sword-Phaistos/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Phaistos-1.0.zip 1492 BLAKE2B 6e6da400b6f2f3512137dc1b83d095ba39803285ad8e8c59abb52e8d9158464c88a122ab777ceb80e672023cf4f0edd1578b77e70676fe9119e4dba7f50e7534 SHA512 dfb19c009d5dda2dce4276e0b72e675b64b9cde9bd53278c29e53eb5bcf7bdbdb4575fc8c5ce3997b19df50e5593bb62be43a49b8b135051efd121e3e694f67c
diff --git a/app-dicts/sword-Phaistos/metadata.xml b/app-dicts/sword-Phaistos/metadata.xml
deleted file mode 100644
index 1cf85ed52a78..000000000000
--- a/app-dicts/sword-Phaistos/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		A transcriptions of the Phaistos Disk, a clay disk from the 2nd millennium BC in an undeciphered language. The meaning of the text is unknown. Treat this module as a tech demo or font demo.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Phaistos/sword-Phaistos-1.0.ebuild b/app-dicts/sword-Phaistos/sword-Phaistos-1.0.ebuild
deleted file mode 100644
index 47419a2f6e4f..000000000000
--- a/app-dicts/sword-Phaistos/sword-Phaistos-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Phaistos Disk"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Phaistos"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Pilgrim/Manifest b/app-dicts/sword-Pilgrim/Manifest
deleted file mode 100644
index 92a53db640a8..000000000000
--- a/app-dicts/sword-Pilgrim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Pilgrim-1.0.zip 217617 BLAKE2B 26fe745917c62836105d3368a2289523d6be07a85dbce5173ced89afced018fcb41062aeced697d5e0586ceb6a5b450385a007f735d171f5bded2f5f9b80667c SHA512 15d31dbd20ee66ac661f16bf04c41a4fa2f7110c310914d38a80e0e879d8a86a2731056be3e465d416bd6ea5e07c19742f3079eb1245bec08a744527e3e48b56
diff --git a/app-dicts/sword-Pilgrim/metadata.xml b/app-dicts/sword-Pilgrim/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Pilgrim/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Pilgrim/sword-Pilgrim-1.0.ebuild b/app-dicts/sword-Pilgrim/sword-Pilgrim-1.0.ebuild
deleted file mode 100644
index 3f8dafe0f27c..000000000000
--- a/app-dicts/sword-Pilgrim/sword-Pilgrim-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Pilgrim"
-
-inherit sword-module
-
-DESCRIPTION="The Pilgrim's Progress by John Bunyan (1628-1688)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pilgrim"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PohnOld/Manifest b/app-dicts/sword-PohnOld/Manifest
deleted file mode 100644
index 7fc1f90c5ff9..000000000000
--- a/app-dicts/sword-PohnOld/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PohnOld-1.01.zip 424926 BLAKE2B b44d9bb8b9a869473ca7523d18d506810c357c9a0b837690867633736e8b957f82c49333010cf7a4c22f5b78ca9745bf72c45c632d2eba86904b9b0f8b85f0de SHA512 ae10c486b76473ddec22a1809d58f97f1cc54b6509cecf494ff3202e7646989fcfbcb07ac82167f122881450a4ce295ae464319e57505304ed942804625d87d8
diff --git a/app-dicts/sword-PohnOld/metadata.xml b/app-dicts/sword-PohnOld/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-PohnOld/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-PohnOld/sword-PohnOld-1.01.ebuild b/app-dicts/sword-PohnOld/sword-PohnOld-1.01.ebuild
deleted file mode 100644
index 4eb9d53fc192..000000000000
--- a/app-dicts/sword-PohnOld/sword-PohnOld-1.01.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Old Public Domain Pohnpeian Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PohnOld"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Pohnpeian/Manifest b/app-dicts/sword-Pohnpeian/Manifest
deleted file mode 100644
index 8e1ca0b99d6c..000000000000
--- a/app-dicts/sword-Pohnpeian/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Pohnpeian-1.1.1.zip 1986578 BLAKE2B c9fcbcd7b44403b4606cc64891557566bc4e97992c6ec60ed3a0cc6046c1086244f73b147d77a7281ecba56aceeba358629a61d1253193f1e5939b37a93d7760 SHA512 25cac36e86e5f1a92064fe62c4ab908ec066c524474bc8cca151611c5b3dc4176e0dbf95e6cc2a9acf6c9f19121f31446262b45d61f3a0c3a689ce45814ae6e7
diff --git a/app-dicts/sword-Pohnpeian/metadata.xml b/app-dicts/sword-Pohnpeian/metadata.xml
deleted file mode 100644
index 50156da30169..000000000000
--- a/app-dicts/sword-Pohnpeian/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Bible in Pohnpeian language. Copyright 2006 United Bible Societies. We are grateful to UBS via its Australian office to permit us to distribute this Bible text. May it be a blessing to Pohnpeians in Pohnpei and around the world. Dakuma Lucios (dakluc@gmail.com) and Peter von Kaehne (refdoc@crosswire.org)
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Pohnpeian/sword-Pohnpeian-1.1.1.ebuild b/app-dicts/sword-Pohnpeian/sword-Pohnpeian-1.1.1.ebuild
deleted file mode 100644
index bb51e22b873b..000000000000
--- a/app-dicts/sword-Pohnpeian/sword-Pohnpeian-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Bible in Pohnpeian language"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pohnpeian"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PolGdanska/Manifest b/app-dicts/sword-PolGdanska/Manifest
deleted file mode 100644
index 46611ca3e301..000000000000
--- a/app-dicts/sword-PolGdanska/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PolGdanska-1.0.zip 1527305 BLAKE2B 68a368f1ba39fa858c8b318281726eee2aaa39c66af0683db9e055a990d9197c4e8917708e8cbbb26ffb5d5d7c127b676a47419ab6b054df3ff3472214a87d9e SHA512 41cf14babc30f5e94d7891d0ad727f116069617b4f82b81394ac7e8156dd9187f65d92ac2d487259242115540d774c6df876e5d2587dcc608315ca7e12d938cc
diff --git a/app-dicts/sword-PolGdanska/metadata.xml b/app-dicts/sword-PolGdanska/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-PolGdanska/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-PolGdanska/sword-PolGdanska-1.0.ebuild b/app-dicts/sword-PolGdanska/sword-PolGdanska-1.0.ebuild
deleted file mode 100644
index 13cd3a647795..000000000000
--- a/app-dicts/sword-PolGdanska/sword-PolGdanska-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Polish Biblia Gdanska (1881)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolGdanska"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PolUGdanska/Manifest b/app-dicts/sword-PolUGdanska/Manifest
deleted file mode 100644
index 0aa7ba4b351c..000000000000
--- a/app-dicts/sword-PolUGdanska/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PolUGdanska-2.1.1.zip 2250429 BLAKE2B 2ef74cc8f22f6cd3c647fe3e0786c5a0055f6628578e97043e64de3f5353bb535592e2883adf2fb52cbfba2d3b73038006fb29a51de551b5ec39c250a83c63aa SHA512 d5f915f8589cfdd9892e455a171cf7436a8f868c684c5533d6e3882cec319dfb490f3f4f5ee3daf5423648402c0189c532df98a93c6f4ad8dbdfc0a04498b965
diff --git a/app-dicts/sword-PolUGdanska/metadata.xml b/app-dicts/sword-PolUGdanska/metadata.xml
deleted file mode 100644
index 7cb4e891a922..000000000000
--- a/app-dicts/sword-PolUGdanska/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		This project is being undertaken by the Gate of Hope Foundation. Its founders are Brent Riggs and Joe West. Brent and Joe have both been pastors and gospel preachers for more than 30 years. They have worked closely with Polish nationals to update the old grammar and vocabulary of the 1632 Polish Gdansk Bible. The entire Bible is now finished and available in both printed and electronic formats. For more information, visit the website at www.wrotanadziei.org
-	</longdescription>
-	<longdescription lang="pl">
-		Ten projekt jest realizowany przez Fundację Wrota Nadziei. Fundatorami są Brent Riggs i Joe West. Brent and Joe są pastorami i kaznodziejami ewangelii od ponad 30-stu lat. Pracowali ściśle z Polakami, żeby uwspółcześnić archaiczną gramatykę i słownictwo Biblii Gdańskiej z roku 1632. Cała Biblia jest już gotowa i dostępna zarówno w formie drukowanej, jak i elektronicznej. Więcej informacji można uzyskać na stronie www.wrotanadziei.org
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-PolUGdanska/sword-PolUGdanska-2.1.1.ebuild b/app-dicts/sword-PolUGdanska/sword-PolUGdanska-2.1.1.ebuild
deleted file mode 100644
index 290a2e421dbe..000000000000
--- a/app-dicts/sword-PolUGdanska/sword-PolUGdanska-2.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Updated Polish Gdansk Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolUGdanska"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PorAR/Manifest b/app-dicts/sword-PorAR/Manifest
deleted file mode 100644
index 50e1a39e2af6..000000000000
--- a/app-dicts/sword-PorAR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PorAR-1.3.zip 1487651 BLAKE2B 9bdcb4929cf8ae2a2ff2382b2a93ffb7752f56237806616626cc08da90d0dc5a6011e7f7a446acbe80dcaf4a618c80d650700dfdadd7dfa39d673ee8c9bb0e7e SHA512 6dc9db89f9ea7d0137f37b3d89e1acf7ed969696b1623948aa633367a468c33b2988c274b7d05785bb1967d65a305fb62d3eab0ef8ba6926773840c0902a6bd8
diff --git a/app-dicts/sword-PorAR/metadata.xml b/app-dicts/sword-PorAR/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-PorAR/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-PorAR/sword-PorAR-1.3.ebuild b/app-dicts/sword-PorAR/sword-PorAR-1.3.ebuild
deleted file mode 100644
index 3ad957f4b0eb..000000000000
--- a/app-dicts/sword-PorAR/sword-PorAR-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Bíblia Almeida Recebida (AR)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAR"
-LICENSE="CC-BY-ND-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PorAlmeida1911/Manifest b/app-dicts/sword-PorAlmeida1911/Manifest
deleted file mode 100644
index b5433f2aa249..000000000000
--- a/app-dicts/sword-PorAlmeida1911/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PorAlmeida1911-0.2.zip 1485727 BLAKE2B 44e6fc9ee16013220cf1ed9946d85e3167d6b08b9496024e07aa32aaff9238e9fadd46c77a9acfd15f49bf0f3343621ee2e5717e5dbaa793aa1299ed3986671b SHA512 729bbdd5fb1411ea2ddefcdf407c9532aee83f885b89c9e875aaff9bdb375e67c604b6bb3bbef4599e045bc82044bc7981d8b4ef196e55c3b3e8c8b8e180da1a
diff --git a/app-dicts/sword-PorAlmeida1911/metadata.xml b/app-dicts/sword-PorAlmeida1911/metadata.xml
deleted file mode 100644
index 4587f3f60d1a..000000000000
--- a/app-dicts/sword-PorAlmeida1911/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="pt">
-		Da reimpressão de 1911 de uma edição de 1900 da tradução da Bíblia parao português feita por João Ferreira de Almeida no século 17
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-PorAlmeida1911/sword-PorAlmeida1911-0.2.ebuild b/app-dicts/sword-PorAlmeida1911/sword-PorAlmeida1911-0.2.ebuild
deleted file mode 100644
index 41f5cb33948e..000000000000
--- a/app-dicts/sword-PorAlmeida1911/sword-PorAlmeida1911-0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="De 1911 Biblia Sagrada Traduzida em Portuguez Por João Ferreeira D'Almeida"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAlmeida1911"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PorBLivre/Manifest b/app-dicts/sword-PorBLivre/Manifest
deleted file mode 100644
index 607a7f8925e5..000000000000
--- a/app-dicts/sword-PorBLivre/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PorBLivre-1.0.1.zip 1591833 BLAKE2B d189fe440555bf24f8cb6bb8c09cef3078c3d6ab440d6294d925a5393dfe2cbd8295d68d069d9d148dc94e8499a028e34d714d63694bf50588307a15487fd007 SHA512 5bf02a9a29b9af2067de3aa545d2106a35417fbd59928bb68e081376c8a960e85be32986801f509e4d6391e1128050b53bf37bcfd1676b16d9dbe04a4276e2ed
diff --git a/app-dicts/sword-PorBLivre/metadata.xml b/app-dicts/sword-PorBLivre/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-PorBLivre/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-PorBLivre/sword-PorBLivre-1.0.1.ebuild b/app-dicts/sword-PorBLivre/sword-PorBLivre-1.0.1.ebuild
deleted file mode 100644
index a4379cda3dd9..000000000000
--- a/app-dicts/sword-PorBLivre/sword-PorBLivre-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Bíblia Livre"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivre"
-LICENSE="CC-BY-3.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PorBLivreTR/Manifest b/app-dicts/sword-PorBLivreTR/Manifest
deleted file mode 100644
index f506bb2b7461..000000000000
--- a/app-dicts/sword-PorBLivreTR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PorBLivreTR-1.0.1.zip 1585746 BLAKE2B 0e4fbdc0104ec37fb458c39f32b6e317e4d5afb4a5b5ed80c4371814455deac6cf135525fecabf2a7af81a2b07c50be7f5377db73046f01df7a186ff134f8363 SHA512 a196825146e91a287af4c4907988d67936f7f1e20687f7c91a73165a27b2ef2d0e320d1f63490f38fbe1490fac592ad57a53c42e093ab7634d339d60200784d4
diff --git a/app-dicts/sword-PorBLivreTR/metadata.xml b/app-dicts/sword-PorBLivreTR/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-PorBLivreTR/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-PorBLivreTR/sword-PorBLivreTR-1.0.1.ebuild b/app-dicts/sword-PorBLivreTR/sword-PorBLivreTR-1.0.1.ebuild
deleted file mode 100644
index b24f5e908eef..000000000000
--- a/app-dicts/sword-PorBLivreTR/sword-PorBLivreTR-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Bíblia Livre - Textus Receptus"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivreTR"
-LICENSE="CC-BY-3.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PorCap/Manifest b/app-dicts/sword-PorCap/Manifest
deleted file mode 100644
index cbcfaa732564..000000000000
--- a/app-dicts/sword-PorCap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PorCap-2.0.1.zip 2477036 BLAKE2B b42b011833ec8903edeffcdc99a44f6b5c36f8f9a85845ede52d95ee15de3e86b71ebc5a025de77892de0f530d7d61f65c3ba8c40f013622c8f0f5c69d41a67c SHA512 99760ff299c5c5294689527e2bf2879c8618cba5df17d6752ef75485cd9342ef9e9edb3dc8a08025ebf5e5b483049b04d15c91d76d0c5195556957eafa245fda
diff --git a/app-dicts/sword-PorCap/metadata.xml b/app-dicts/sword-PorCap/metadata.xml
deleted file mode 100644
index dc2ce708ac9a..000000000000
--- a/app-dicts/sword-PorCap/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		Bíblia Sagrada, better known as "Bíblia dos Capuchinhos", translation into the Iberian Portuguese by Ordem dos Frades Menores Capuchinhos
-	</longdescription>
-	<longdescription lang="pt">
-		Bíblia Sagrada, 6ª ed., imp. em maio de 2017 para a Difusora Bíblica e a Ordem dos Frades Menores Capuchinhos.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-PorCap/sword-PorCap-2.0.1.ebuild b/app-dicts/sword-PorCap/sword-PorCap-2.0.1.ebuild
deleted file mode 100644
index 0b51c2d27768..000000000000
--- a/app-dicts/sword-PorCap/sword-PorCap-2.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Bíblia Sagrada (Capuchinhos)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorCap"
-LICENSE="crosswire free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PorIBP/Manifest b/app-dicts/sword-PorIBP/Manifest
deleted file mode 100644
index 500bf554fc1d..000000000000
--- a/app-dicts/sword-PorIBP/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PorIBP-1.0.zip 138896 BLAKE2B 302cbea984e5d4949300b4b5bae8805888ec50eaa9c60d6eda89899fab9f6b25dd797b92afa129b51f5c5bd1fc9ffec3a075d11c2734af0126c42b22d8ad0f26 SHA512 4adb5d18c16f136e247d336de20863593a77cc3f99e40f1d9ece0b762de2d54dc00d20ba15c26da2aa4646dc4c7f422207b970bf11e4b324aa5a82439b5d35fa
diff --git a/app-dicts/sword-PorIBP/metadata.xml b/app-dicts/sword-PorIBP/metadata.xml
deleted file mode 100644
index 907317c66d6c..000000000000
--- a/app-dicts/sword-PorIBP/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="pt">
-		Este Índice Bíblico-Pastoral apresenta os principais temas bíblicos, fazendo ressaltar a sua evolução no quadro da Revelação divina.\par A Palavra de Deus foi escrita em três momentos principais: Antigo Testamento, Evangelhos e Cartas. A Liturgia da Palavra dá-lhes a devida importância. Julgamos este Índice muito útil para a escolha dos textos das Celebrações da Palavra, temas de estudo ou oração e reuniões de grupos bíblicos. A citação seguida de (n) tem uma nota explicativa nesta Bíblia dos Capuchinhos, que será bom consultar, assim como o Índice de Notas.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-PorIBP/sword-PorIBP-1.0.ebuild b/app-dicts/sword-PorIBP/sword-PorIBP-1.0.ebuild
deleted file mode 100644
index 864eb364c016..000000000000
--- a/app-dicts/sword-PorIBP/sword-PorIBP-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.1"
-
-inherit sword-module
-
-DESCRIPTION="Índice Bíblico-Pastoral da Bíblia dos Capuchinhos"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorIBP"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-PotLykins/Manifest b/app-dicts/sword-PotLykins/Manifest
deleted file mode 100644
index 9a8ebedc854f..000000000000
--- a/app-dicts/sword-PotLykins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PotLykins-1.0.zip 100068 BLAKE2B 9ca066fc4451309754fb557bae2dd528db626d4c764447553e6fe8dcc59746baab57b14d0263fb510bb90945d72dc78fa905ae8c24c188ff4f8668205be60534 SHA512 5a94d587a820da43749949869be72ae20693eb33f18f881ffe9242d1107d8a655a67598383cdd3a87658a8789212f1339414244a0abd8093fcc53d222cfd90bd
diff --git a/app-dicts/sword-PotLykins/metadata.xml b/app-dicts/sword-PotLykins/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-PotLykins/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-PotLykins/sword-PotLykins-1.0.ebuild b/app-dicts/sword-PotLykins/sword-PotLykins-1.0.ebuild
deleted file mode 100644
index f5e260218d0e..000000000000
--- a/app-dicts/sword-PotLykins/sword-PotLykins-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="1833 Potawatomi Matthew and Acts"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PotLykins"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Practice/Manifest b/app-dicts/sword-Practice/Manifest
deleted file mode 100644
index a94496b396ea..000000000000
--- a/app-dicts/sword-Practice/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Practice-1.0.zip 24766 BLAKE2B 841ee1130900e89f7324c51782fa89d2d1039b7509fa5690d2ce0dcaca370c33cd6ff921095d00d0650627cc952a96491968353a8da2df237a2cc184c58436ce SHA512 fa41824d0534df638920657cf2608d8fb5997036090bd662e6b2cc79085d9d9efd351aa842f86609c90f78f15651c450819564fa01117e98049bd1fe81c4a9e6
diff --git a/app-dicts/sword-Practice/metadata.xml b/app-dicts/sword-Practice/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Practice/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Practice/sword-Practice-1.0.ebuild b/app-dicts/sword-Practice/sword-Practice-1.0.ebuild
deleted file mode 100644
index c40b09532ead..000000000000
--- a/app-dicts/sword-Practice/sword-Practice-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Practice"
-
-inherit sword-module
-
-DESCRIPTION="The Practice of the Presence of God: The Best Rule of Holy Life"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Practice"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-QuotingPassages/Manifest b/app-dicts/sword-QuotingPassages/Manifest
deleted file mode 100644
index c8ee0ecc68e6..000000000000
--- a/app-dicts/sword-QuotingPassages/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QuotingPassages-1.2.zip 74662 BLAKE2B 3722a7335885b8fdd912648113aea7c8822ba78e4bd809c06c012b05813a3a1d7040cbcc0dfddd4bb82e3988b4eec868f373cbbf8010da998ce6c02e86e0791b SHA512 7f0ba6a3892f26318db19c8e1068e547707356e1bc30b41393f279fa49a5342d82781f4b29e3e188f6707172b0b36a4acd4b4e06a2a84129128779c6d775208a
diff --git a/app-dicts/sword-QuotingPassages/metadata.xml b/app-dicts/sword-QuotingPassages/metadata.xml
deleted file mode 100644
index e1e2a3326f84..000000000000
--- a/app-dicts/sword-QuotingPassages/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This module contains a list of examples where scripture passages quote or allude to scripture. The cross references are based on a database compiled by David Troidl, expanded and corrected by Andrew Thule.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-QuotingPassages/sword-QuotingPassages-1.2.ebuild b/app-dicts/sword-QuotingPassages/sword-QuotingPassages-1.2.ebuild
deleted file mode 100644
index 4a27d5fb271f..000000000000
--- a/app-dicts/sword-QuotingPassages/sword-QuotingPassages-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Scripture Passages Quoting Scripture"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=QuotingPassages"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RKJNT/Manifest b/app-dicts/sword-RKJNT/Manifest
deleted file mode 100644
index 2118fa1f2e7c..000000000000
--- a/app-dicts/sword-RKJNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RKJNT-1.0.zip 354676 BLAKE2B 7243eccb792f63312db64cbc36d22da0ee10e2bb952ad6029f0cfebba868a733931ac93cdc87d4ec0ea0685b41814ba5cb7b6c8b82e7af6b39436b03229026e2 SHA512 b33cc6c420740d7dba7d6638bad5275c636f06f561c19bd67bb7b3d004059528e06383cebd63baccced3dbea9ee1879671c432249187dccd5fc1ae987b227218
diff --git a/app-dicts/sword-RKJNT/metadata.xml b/app-dicts/sword-RKJNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RKJNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RKJNT/sword-RKJNT-1.0.ebuild b/app-dicts/sword-RKJNT/sword-RKJNT-1.0.ebuild
deleted file mode 100644
index 712bcdc39104..000000000000
--- a/app-dicts/sword-RKJNT/sword-RKJNT-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="RKJNT"
-
-inherit sword-module
-
-DESCRIPTION="Revised King James New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RKJNT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RNKJV/Manifest b/app-dicts/sword-RNKJV/Manifest
deleted file mode 100644
index fe005c4fc52d..000000000000
--- a/app-dicts/sword-RNKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RNKJV-1.5.zip 1471699 BLAKE2B 24490b0e82393cbe7daef77cf23f3327ee5dac9372f2126324a18df9373357e09dc827f63bc763dfad0dabacbe9dd70976b84b00c7acd7ee5f5e52afa9209c4e SHA512 7d160f0cef81770083ebfc573f2c41ba54fb3b07b944336a7e69bbef848e84678c115f0790ddb3a91a216906a371d6b7069d1470fe30039e9b94ef6c59dad6d7
diff --git a/app-dicts/sword-RNKJV/metadata.xml b/app-dicts/sword-RNKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RNKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RNKJV/sword-RNKJV-1.5.ebuild b/app-dicts/sword-RNKJV/sword-RNKJV-1.5.ebuild
deleted file mode 100644
index 006760e0996d..000000000000
--- a/app-dicts/sword-RNKJV/sword-RNKJV-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="RNKJV"
-
-inherit sword-module
-
-DESCRIPTION="Restored Name King James Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RNKJV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RWP/Manifest b/app-dicts/sword-RWP/Manifest
deleted file mode 100644
index fba9c4934eae..000000000000
--- a/app-dicts/sword-RWP/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RWP-2.0.zip 3210969 BLAKE2B 7ff2b287da26cd98913bf7ccc47f590ad5dccfbc720926a08d964b5fb1d226fc1cf554fd58f235103de12652c866fa4167436762e737fbf8a9c778da146ad8c4 SHA512 d2bcdf48726cc44e3481c4634f417c8e47bf4384d3ed3f8e2f154c9b554bb261f4b21879d851d6b366af47dd8fe0a9f8faa5ed2ef610ba41cb2e9734dcfd1fb7
diff --git a/app-dicts/sword-RWP/metadata.xml b/app-dicts/sword-RWP/metadata.xml
deleted file mode 100644
index 8785cc9cce4a..000000000000
--- a/app-dicts/sword-RWP/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Robertson's Word Pictures in the New Testament
-
-		A.T. Robertson, A.M., D.D., LL. D., Litt.D.
-
-		Vol 1,2,3,4 Public Domain
-
-		Volume 5 (c) 1932.
-		Renewal 1960 Broadman Press. All rights reserved.
-		Used by permission.
-		[Copyright expires Dec. 31, 2006.]
-
-		Volume 6 (c) 1933.
-		Renewal 1960 Broadman Press. All rights reserved.
-		Used by permission.
-		[Copyright expires Dec. 31, 2007.]
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-RWP/sword-RWP-2.0.ebuild b/app-dicts/sword-RWP/sword-RWP-2.0.ebuild
deleted file mode 100644
index bf0c8fe2f5da..000000000000
--- a/app-dicts/sword-RWP/sword-RWP-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Robertson's Word Pictures"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RWP"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RWebster/Manifest b/app-dicts/sword-RWebster/Manifest
deleted file mode 100644
index 2df1ebf177cb..000000000000
--- a/app-dicts/sword-RWebster/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RWebster-1.3.zip 2317707 BLAKE2B 904a6cc65e283c5f29c1e078050748a78cd06cf1c4f5617413aa2f9ea72cefb2b67359d187969855c70853fa9ae81bc7ca434a7784cb73f1855e4f8df655d879 SHA512 21686879638c7bb577c561eb14be30d3decf794996b5ffe2925cf1b0c66d7a6cb775dd08e307f6815b54ff8147e49c8f3fee32b18bb446486c6cc3d636025495
diff --git a/app-dicts/sword-RWebster/metadata.xml b/app-dicts/sword-RWebster/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RWebster/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RWebster/sword-RWebster-1.3.ebuild b/app-dicts/sword-RWebster/sword-RWebster-1.3.ebuild
deleted file mode 100644
index 7f31d2f79bd5..000000000000
--- a/app-dicts/sword-RWebster/sword-RWebster-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="RWebster"
-
-inherit sword-module
-
-DESCRIPTION="Revised Webster Version (1833)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RWebster"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RecVer/Manifest b/app-dicts/sword-RecVer/Manifest
deleted file mode 100644
index faf7d30a6750..000000000000
--- a/app-dicts/sword-RecVer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RecVer-1.0.zip 1514709 BLAKE2B 7b20a173e0a2bb6b0aedb395b96180cb94201cda45c8a86cd725b755b01fc920cd4031ebb9ea9cc399046ea4246e4f1138857cde4e683172bc3dfcdf74997c05 SHA512 ae642dc6b228bc64db937c5691db14338b7859aec296c7070ef2159924055b6b4cadb730d27b2107d094d4be2b74880dd65811930d056a30a98b5a3df106a73e
diff --git a/app-dicts/sword-RecVer/metadata.xml b/app-dicts/sword-RecVer/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RecVer/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RecVer/sword-RecVer-1.0.ebuild b/app-dicts/sword-RecVer/sword-RecVer-1.0.ebuild
deleted file mode 100644
index 0c6f8bbe73b3..000000000000
--- a/app-dicts/sword-RecVer/sword-RecVer-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Text Only Recovery Version (no outlines)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RecVer"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Rieger/Manifest b/app-dicts/sword-Rieger/Manifest
deleted file mode 100644
index 6461ddbca607..000000000000
--- a/app-dicts/sword-Rieger/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Rieger-1.0.zip 859735 BLAKE2B a25a62002ba19f6c66c4016522044771564182e1e81a9a22bcb8f73ce67a8083ba2982ecc90a267e5dae3326e3e37639a5b63563d2015db683323d5ed1ceb19e SHA512 5da6e85ecb335448712befb74a47c9ae21d2cd8d5ed6ba03227ffb8c916f3b4f261f15eb75035ac22dc1e6ec1fa9a0ea466002150eb93048182a19993055cc94
diff --git a/app-dicts/sword-Rieger/metadata.xml b/app-dicts/sword-Rieger/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Rieger/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Rieger/sword-Rieger-1.0.ebuild b/app-dicts/sword-Rieger/sword-Rieger-1.0.ebuild
deleted file mode 100644
index 1ac21e401a52..000000000000
--- a/app-dicts/sword-Rieger/sword-Rieger-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.2"
-
-inherit sword-module
-
-DESCRIPTION="Carl Heinrich Riegers Kommentar"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rieger"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Robinson/Manifest b/app-dicts/sword-Robinson/Manifest
deleted file mode 100644
index 4337671ff903..000000000000
--- a/app-dicts/sword-Robinson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Robinson-2.1.zip 43302 BLAKE2B d91872017f1d4ebed662547fa735ae1ff4771795304f0f9936cad349cab3ecbde428df9d4493194a5e2c3adf4884772adbccbe01703311ec070209e4d6609c4f SHA512 78fe74a701a942cb355e798bc5fad7bf468844603805fd93430330abeb1055ff28ac3df633b14874557495799bdf92494aac64268d5a01cd60d79edd53cb6d9d
diff --git a/app-dicts/sword-Robinson/metadata.xml b/app-dicts/sword-Robinson/metadata.xml
deleted file mode 100644
index e69c64d5cbf7..000000000000
--- a/app-dicts/sword-Robinson/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Produced in accordance with the key at
-		http://www.byztxt.com/download/PARSINGS.TXT, on the basis of numerous Greek
-		texts, and with significant editorial and corrective emendation.
-
-		This text was first created by the CrossWire Bible Society in 2002, and
-		recreated in 2009 using the more recent coding system and numerous
-		additional Greek texts.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Robinson/sword-Robinson-2.1.ebuild b/app-dicts/sword-Robinson/sword-Robinson-2.1.ebuild
deleted file mode 100644
index 224fe8eac720..000000000000
--- a/app-dicts/sword-Robinson/sword-Robinson-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Robinson's Morphological Analysis Codes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Robinson"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RomCor/Manifest b/app-dicts/sword-RomCor/Manifest
deleted file mode 100644
index 66022dda504b..000000000000
--- a/app-dicts/sword-RomCor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RomCor-2.1.zip 3056645 BLAKE2B 884683e5449cbe1f8cc6f2700b7cbd33790620e5477de63f1f009ca9e0d7aefdcba4b1dd6a253b21669c42ee24e6179f81ca286677770c8369337ea5455848ca SHA512 acc2c91819855da717ff43093a5d2e4055700032a48148a533be4e1f8eca81c722bfc325e4c860bebcdffffec0ac8297a39883aa93d5b18d35b4ee1253674cb2
diff --git a/app-dicts/sword-RomCor/metadata.xml b/app-dicts/sword-RomCor/metadata.xml
deleted file mode 100644
index 6e184ed51939..000000000000
--- a/app-dicts/sword-RomCor/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Dumitru Cornilescu (4 April 1891 - 1975), a Romanian orthodox archdeacon, later a Protestant minister created this translation in 1921. It is popular particularly among protestants. Copyright of the Cornilescu Bible © 1924 belongs to British and Foreign Bible Society. Copyright © 2010, 2014 of the revised edition in Romanian language belongs to the Interconfessional Bible Society of Romania, with the approval of the British and Foreign Bible Society. Used by permission.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-RomCor/sword-RomCor-2.1.ebuild b/app-dicts/sword-RomCor/sword-RomCor-2.1.ebuild
deleted file mode 100644
index 00af53cd325e..000000000000
--- a/app-dicts/sword-RomCor/sword-RomCor-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Cornilescu Bible in Romanian language"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Rotherham/Manifest b/app-dicts/sword-Rotherham/Manifest
deleted file mode 100644
index 03608abeaa1b..000000000000
--- a/app-dicts/sword-Rotherham/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Rotherham-1.7.zip 1682887 BLAKE2B bfa0399059943adefefa442b00005e197c4bb9595c9868e48f3d2c5124e179a97bd7e6462debe86c24b1869af0ebc18c54af54265ef9676eab5a1b12e78f342b SHA512 bb192b47eaee4a81e1f643c3e29c5b94664beb5e7eb794f148f52a951425198fc41183dedd526a40d1854967f37cbebb264946b158227749509e55ad69dec2b8
diff --git a/app-dicts/sword-Rotherham/metadata.xml b/app-dicts/sword-Rotherham/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Rotherham/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Rotherham/sword-Rotherham-1.7.ebuild b/app-dicts/sword-Rotherham/sword-Rotherham-1.7.ebuild
deleted file mode 100644
index cebe5fabfa7e..000000000000
--- a/app-dicts/sword-Rotherham/sword-Rotherham-1.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="The Emphasized Bible by J. B. Rotherham"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rotherham"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusCARS/Manifest b/app-dicts/sword-RusCARS/Manifest
deleted file mode 100644
index fb319b24131e..000000000000
--- a/app-dicts/sword-RusCARS/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusCARS-4.1.1.zip 3625042 BLAKE2B 37a799559c84a743638a83f7a9ae12eb3ec58dece748eff0cc8b0d3e396ece1432ff415d40252b14abdbdc068ea61361b2eeeb3c925bbec0e256d21254d5ce23 SHA512 c4e6b38cb522525180d469b7edd0194bc095565c32235fc15ce65804f8fd98e7b9d56512dd382b13c18595fccd171baeef111521b123a35dab83dce4c71b4cd3
diff --git a/app-dicts/sword-RusCARS/metadata.xml b/app-dicts/sword-RusCARS/metadata.xml
deleted file mode 100644
index 0586501564b2..000000000000
--- a/app-dicts/sword-RusCARS/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		The Eastern Russian Scriptures Translation (ERT Project, also known as the CARS Project) was initiated in order to meet the need for a translation of the Holy Scriptures designed for Central Asians and other nationalities of the former Soviet Union who read best in Russian and belong to ethnic groups traditionally considered Islamic. The first edition of this translation was published in 2003 and the second, thoroughly revised and corrected version of this translation came out in 2009.
-	</longdescription>
-	<longdescription lang="ru">
-		Священное Писание. Смысловой перевод Таурата, Книги Пророков, Забура и Инджила. Восточный перевод. Издательство «Стамбул», Атаскадеро.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusCARS/sword-RusCARS-4.1.1.ebuild b/app-dicts/sword-RusCARS/sword-RusCARS-4.1.1.ebuild
deleted file mode 100644
index f8a5604030ac..000000000000
--- a/app-dicts/sword-RusCARS/sword-RusCARS-4.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="Смысловой перевод Таурата, Книги Пророков, Забура и Инджила"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARS"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusCARSA/Manifest b/app-dicts/sword-RusCARSA/Manifest
deleted file mode 100644
index 07fad1047fac..000000000000
--- a/app-dicts/sword-RusCARSA/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusCARSA-4.1.zip 3589059 BLAKE2B cb48dbcbca5d4cbd6b7e1b0ae1b40b3f29dd340a2ece88736090091f988ac1d3e93f1d7b79d2218e339e42f441ce53d6e3c8ac8a42edae6e08e02e4f8e87bef7 SHA512 b6bb2970175116f53b232657a47f66494048d0b78a997a635dbdb963a2994ac43d87229ea345ba3850d5cf4d5c48c4f4c2ccf8480a48119936520176e1c3ce1f
diff --git a/app-dicts/sword-RusCARSA/metadata.xml b/app-dicts/sword-RusCARSA/metadata.xml
deleted file mode 100644
index 06100844e571..000000000000
--- a/app-dicts/sword-RusCARSA/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		A Russian translation of the Bible which translates both elohim and theos as Allah in most contexts. The Eastern Russian Scriptures Translation (ERT Project, also known as the CARS Project) was initiated in order to meet the need for a translation of the Holy Scriptures designed for Central Asians and other nationalities of the former Soviet Union who read best in Russian and belong to ethnic groups traditionally considered Islamic. The first edition of this translation was published in 2003 and the second, thoroughly revised and corrected version of this translation came out in 2009.
-	</longdescription>
-	<longdescription lang="ru">
-		Священное Писание-A – версия, в которой и elohim и theos переведены как Аллах в большинстве контекстов. Смысловой перевод Таурата, Книги Пророков, Забура и Инджила. Восточный перевод. Издательство «Стамбул», Атаскадеро.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSA/sword-RusCARSA-4.1.ebuild b/app-dicts/sword-RusCARSA/sword-RusCARSA-4.1.ebuild
deleted file mode 100644
index 65b3f84cc1ec..000000000000
--- a/app-dicts/sword-RusCARSA/sword-RusCARSA-4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="Смысловой перевод Таурата, Книги Пророков, Забура и Инджила"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSA"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusCARSADICT/Manifest b/app-dicts/sword-RusCARSADICT/Manifest
deleted file mode 100644
index 2bc3cc11f118..000000000000
--- a/app-dicts/sword-RusCARSADICT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusCARSADICT-4.1.zip 208866 BLAKE2B 20ecd33726886388edf45bd51d5a41e79efe2bef415565849a3723a47ea59b10f5bdb93f3a7601118707e91429901bd4d6aa0d8ad902ef4da5464dcd34401356 SHA512 7657f886168c3c972554781a85f9a715c971fb5344e02f71be3d2d5cc0ffd101400679de4723ede546690d978d094a63a1e22aed6c211c5dd09b0533c4978adf
diff --git a/app-dicts/sword-RusCARSADICT/metadata.xml b/app-dicts/sword-RusCARSADICT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RusCARSADICT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSADICT/sword-RusCARSADICT-4.1.ebuild b/app-dicts/sword-RusCARSADICT/sword-RusCARSADICT-4.1.ebuild
deleted file mode 100644
index 2747fc4dce92..000000000000
--- a/app-dicts/sword-RusCARSADICT/sword-RusCARSADICT-4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="A dictionary companion to app-dicts/sword-RusCARSA"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSADICT"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusCARSDict/Manifest b/app-dicts/sword-RusCARSDict/Manifest
deleted file mode 100644
index 3a669a3dc20d..000000000000
--- a/app-dicts/sword-RusCARSDict/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusCARSDict-4.0.zip 4126592 BLAKE2B 46795ab592d369b9ba1d8e758b8a36569ebd2e9378809881a6935b3a0f268755926b37e2657a732efce52fee37f95bf24495283847deae5ba98e36a1eba51469 SHA512 d4521e5b2e961bb2c8247d87a5d7d925477238951e37c2fd2e45594623b3372b1215ac4e39bb5bf4fe5529f3e800f7d43ada2ff70f0272a106006c3a280d92bf
diff --git a/app-dicts/sword-RusCARSDict/metadata.xml b/app-dicts/sword-RusCARSDict/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RusCARSDict/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSDict/sword-RusCARSDict-4.0.ebuild b/app-dicts/sword-RusCARSDict/sword-RusCARSDict-4.0.ebuild
deleted file mode 100644
index a58d97dd7c17..000000000000
--- a/app-dicts/sword-RusCARSDict/sword-RusCARSDict-4.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="A dictionary companion to app-dicts/sword-RusCARS"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSDict"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusCARST/Manifest b/app-dicts/sword-RusCARST/Manifest
deleted file mode 100644
index 531b55ef9067..000000000000
--- a/app-dicts/sword-RusCARST/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusCARST-4.1.zip 3604067 BLAKE2B 41d226fe8eddeb02c238369aac26e800392e18a817a445d48a64e60ab78c977d7b3fe0ccc5f182b065a8d10e7efaedaa01a3aa937481aa156b94d36c954216c1 SHA512 68072e8b8ff3f30b4ee09a9f0256e6622abaad3f03d1accd17caefec5c2873c14ed52db02bf1148435dba4619b29363a9273fece3ba3f232212fc448ab016c22
diff --git a/app-dicts/sword-RusCARST/metadata.xml b/app-dicts/sword-RusCARST/metadata.xml
deleted file mode 100644
index e7123af25bb8..000000000000
--- a/app-dicts/sword-RusCARST/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		Due to the unique linguistic and cultural setting, this version of the Bible uses forms of names specially chosen by a committee in Tajikistan. The Eastern Russian Scriptures Translation (ERT Project, also known as the CARS Project) was initiated in order to meet the need for a translation of the Holy Scriptures designed for Central Asians and other nationalities of the former Soviet Union who read best in Russian and belong to ethnic groups traditionally considered Islamic. The first edition of this translation was published in 2003 and the second, thoroughly revised and corrected version of this translation came out in 2009.
-	</longdescription>
-	<longdescription lang="ru">
-		Священное Писание-T – в связи с уникальными лингвистическими и культурными установками эта версия использует формы имён, специально отобранные комиссией в Таджикистане. Смысловой перевод Таврота, Книги Пророков, Забура и Инджила. Восточный перевод. Издательство «Стамбул», Атаскадеро.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusCARST/sword-RusCARST-4.1.ebuild b/app-dicts/sword-RusCARST/sword-RusCARST-4.1.ebuild
deleted file mode 100644
index e54f957f51c3..000000000000
--- a/app-dicts/sword-RusCARST/sword-RusCARST-4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="Смысловой перевод Таврота, Книги Пророков, Забура и Инджила"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARST"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusCARSTDICT/Manifest b/app-dicts/sword-RusCARSTDICT/Manifest
deleted file mode 100644
index c957634c7806..000000000000
--- a/app-dicts/sword-RusCARSTDICT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusCARSTDICT-4.1.zip 209364 BLAKE2B 12c32e6708f100283c19f124b55fdb3a6d156d38d1e317da4b451e3da0423f4e4610948fa94447c636016fbf9096e772f33029fe698d9acbcc8fe9af737f3b4c SHA512 a46a02126d7afee216727d353e51fc269fa50886b995ae90e31b7496634ea2f244697676bb753b230b09a661f5f6cd7b8145f8124c65906a404cc1664eac65c9
diff --git a/app-dicts/sword-RusCARSTDICT/metadata.xml b/app-dicts/sword-RusCARSTDICT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RusCARSTDICT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSTDICT/sword-RusCARSTDICT-4.1.ebuild b/app-dicts/sword-RusCARSTDICT/sword-RusCARSTDICT-4.1.ebuild
deleted file mode 100644
index c389e986f089..000000000000
--- a/app-dicts/sword-RusCARSTDICT/sword-RusCARSTDICT-4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="A dictionary companion to app-dicts/sword-RusCARST"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSTDICT"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusMakarij/Manifest b/app-dicts/sword-RusMakarij/Manifest
deleted file mode 100644
index b02ba8b0587b..000000000000
--- a/app-dicts/sword-RusMakarij/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusMakarij-2.0.zip 312568 BLAKE2B d60b79beacbbe98ce28f008030c03ccb09b18102171af206f1f5794edfa78ae84cc81f9da140989e7d267d264400074412b18807fb194c7035def6ad813a30a5 SHA512 0b3bc4d40df6af1d8d3a23785df396c7d784b6895735e215b3428156f3edc28bada41539d9d2c8b2816fa63c1e4ba57b6bf501cabda2a30e8cda2ecd7083fdb1
diff --git a/app-dicts/sword-RusMakarij/metadata.xml b/app-dicts/sword-RusMakarij/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RusMakarij/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusMakarij/sword-RusMakarij-2.0.ebuild b/app-dicts/sword-RusMakarij/sword-RusMakarij-2.0.ebuild
deleted file mode 100644
index b28093bdefc8..000000000000
--- a/app-dicts/sword-RusMakarij/sword-RusMakarij-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Pentateuch of Moses in Russian"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusMakarij"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusSynodal/Manifest b/app-dicts/sword-RusSynodal/Manifest
deleted file mode 100644
index 28106b1704c7..000000000000
--- a/app-dicts/sword-RusSynodal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusSynodal-1.9.zip 2119001 BLAKE2B e7956bead0ae44fa7f99149eb8c90e04891e443f98ac188d94a7126a63910a5a8b55749c66a9634a433877709cd1b1b8a7076f55032d4f7b14187801380a058e SHA512 ae76a20aa367503cc5dab9e4f1a14514d987229c017404eab9e2497a036a1438f620e8e3a7dd8f9620672750794e41e81cfd6a7a3b33851b6becb481a1b4b4bf
diff --git a/app-dicts/sword-RusSynodal/metadata.xml b/app-dicts/sword-RusSynodal/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-RusSynodal/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusSynodal/sword-RusSynodal-1.9.ebuild b/app-dicts/sword-RusSynodal/sword-RusSynodal-1.9.ebuild
deleted file mode 100644
index 8d97ed1150c9..000000000000
--- a/app-dicts/sword-RusSynodal/sword-RusSynodal-1.9.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="1876 Russian Synodal Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodal"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusSynodalLIO/Manifest b/app-dicts/sword-RusSynodalLIO/Manifest
deleted file mode 100644
index 52d61c78668f..000000000000
--- a/app-dicts/sword-RusSynodalLIO/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusSynodalLIO-1.0.2.zip 3147693 BLAKE2B 839a505b14df0fa34ea83a265e04cf2e596a37ad241ef5ada1d92d7d0eb1138cfba72ffb5f53bef5ed9334c944a8d58c4b1738bf37b183d59e73b66e476732f1 SHA512 4667410e8050d6984a416646fd4a4473714c505dbe6b56dce4205d319c702f6c487fc1fa05f0aec280a749daf8c4c51faf652b0da45fdf5dfcf35c83b43a934c
diff --git a/app-dicts/sword-RusSynodalLIO/metadata.xml b/app-dicts/sword-RusSynodalLIO/metadata.xml
deleted file mode 100644
index 38579e8b18c7..000000000000
--- a/app-dicts/sword-RusSynodalLIO/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This is the Synodal translation of the Russian Bible in the edition by Licht im Osten. Licht im Osten has carefully digitialised this text, updated spelling and corrected a few glaring translation mistakes. We are grateful to Licht im Osten to allow us to publish this text. The Strong encoding is based on work originally done by Bob Jones university, using corrections and suggestions also from KJV2006 and from Victor R. Zhuromsky's Russian NT with Strongs. Copyright remains with LiO and BJU respectively. Many thanks to both these institutions.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusSynodalLIO/sword-RusSynodalLIO-1.0.2.ebuild b/app-dicts/sword-RusSynodalLIO/sword-RusSynodalLIO-1.0.2.ebuild
deleted file mode 100644
index b74e87ed3a69..000000000000
--- a/app-dicts/sword-RusSynodalLIO/sword-RusSynodalLIO-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="Russian Synodal Bible, Licht im Osten Edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodalLIO"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-RusVZh/Manifest b/app-dicts/sword-RusVZh/Manifest
deleted file mode 100644
index b6b0380325a1..000000000000
--- a/app-dicts/sword-RusVZh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RusVZh-1.0.zip 1918395 BLAKE2B b3d21b9bb4b5c083be0e71cb0260e531b4b86190ed37cfbb7885779713e400979c6055509aba2a57803e90c9767c62c677cc5422ff94e8a12e38334894741bd8 SHA512 4c871f453fc6115a607bc7949ecbaf4eb030de2a1419796efef81d55f1a8bb622e4ff8aef505d2a6acfc89e641875f4aea36c5a45c83122de016bb98c7105f70
diff --git a/app-dicts/sword-RusVZh/metadata.xml b/app-dicts/sword-RusVZh/metadata.xml
deleted file mode 100644
index 1f4ce8a9b92c..000000000000
--- a/app-dicts/sword-RusVZh/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Originally titled as New Testament with Indexing of Each Greek Word According to Strong's Numbers under edition of Victor R. Zhuromsky. This edition contains 143,457 Strong's numbers and is most complete Strong's New Testament edition ever published in hard and electronic copy.  This edition is based on Russian Synodal Translation of 1876 year, and is provided by Victor R. Zhuromsky strictly for use in the SWORD Project.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-RusVZh/sword-RusVZh-1.0.ebuild b/app-dicts/sword-RusVZh/sword-RusVZh-1.0.ebuild
deleted file mode 100644
index da705b746b60..000000000000
--- a/app-dicts/sword-RusVZh/sword-RusVZh-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.3"
-
-inherit sword-module
-
-DESCRIPTION="Russian New Testament with Strong's Numbers under edition of Victor R. Zhuromsky"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusVZh"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SAOA/Manifest b/app-dicts/sword-SAOA/Manifest
deleted file mode 100644
index e46ae2f76dc3..000000000000
--- a/app-dicts/sword-SAOA/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SAOA-1.0.zip 37734 BLAKE2B ce13584b014e7e169720b74feae3e9a8964f5e27c55607465bdc81e300d3ba0d3a726a1dcad01b79d5cb79f601c521047bc77059c7e0487c31f2fc9d73019151 SHA512 dea46677df4e2bd782afe533f55fcd48bfe758a243daead261c4becb74f43f1b3a03285d1602a60f02975b4d6ebf2f078ef13ee6b75cbe5362cb6f2a212ac5a1
diff --git a/app-dicts/sword-SAOA/metadata.xml b/app-dicts/sword-SAOA/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SAOA/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SAOA/sword-SAOA-1.0.ebuild b/app-dicts/sword-SAOA/sword-SAOA-1.0.ebuild
deleted file mode 100644
index d6c0c64aadc5..000000000000
--- a/app-dicts/sword-SAOA/sword-SAOA-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="SAOA"
-
-inherit sword-module
-
-DESCRIPTION="Scripture Alphabet Of Animals"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SAOA"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SBLGNT/Manifest b/app-dicts/sword-SBLGNT/Manifest
deleted file mode 100644
index fa68be42cc61..000000000000
--- a/app-dicts/sword-SBLGNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SBLGNT-1.3.1.zip 602907 BLAKE2B 684e5f4943227acbc4082741a2720a05673e69aa945d0cc1fcca242b24c780fffb56bb8ab5d4c699f483a80cba7329dc385e56e5c87b46bc0de08b6c28d72455 SHA512 8cd6ef20e2f195eb324567a1e2d4124c24b6b69bcb796b21e1d198fcc6dca949003007b326af93b873c210c911a7d8976207f2536d91e7b6e29dfcafb2709d64
diff --git a/app-dicts/sword-SBLGNT/metadata.xml b/app-dicts/sword-SBLGNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SBLGNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SBLGNT/sword-SBLGNT-1.3.1.ebuild b/app-dicts/sword-SBLGNT/sword-SBLGNT-1.3.1.ebuild
deleted file mode 100644
index 50cf1a8f9243..000000000000
--- a/app-dicts/sword-SBLGNT/sword-SBLGNT-1.3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Greek New Testament: SBL Edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNT"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SBLGNTApp/Manifest b/app-dicts/sword-SBLGNTApp/Manifest
deleted file mode 100644
index e17a2472c2ac..000000000000
--- a/app-dicts/sword-SBLGNTApp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SBLGNTApp-1.3.zip 211517 BLAKE2B 46e91b64fdc3d7a0d460968ad9858bccfe8a0c1451d6a9bad73a6fe5997bfaaf69726612854d766cbbe456ae8a4f1c2235bf38eddd8410dbdb6edd00d819d9ae SHA512 9bdf607db57e4448c4999b597b2bef985f5c171c09419cebbbcd8ae3ce1360180977c33229f3a4ed2179b8129c75370f0bef11ae6cfdd9c4d000d017df2deadb
diff --git a/app-dicts/sword-SBLGNTApp/metadata.xml b/app-dicts/sword-SBLGNTApp/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SBLGNTApp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SBLGNTApp/sword-SBLGNTApp-1.3.ebuild b/app-dicts/sword-SBLGNTApp/sword-SBLGNTApp-1.3.ebuild
deleted file mode 100644
index e6b40f4cba04..000000000000
--- a/app-dicts/sword-SBLGNTApp/sword-SBLGNTApp-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="The Greek New Testament: SBL Edition, Apparatus"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNTApp"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SME/Manifest b/app-dicts/sword-SME/Manifest
deleted file mode 100644
index c40529a06735..000000000000
--- a/app-dicts/sword-SME/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SME-1.7.zip 588738 BLAKE2B 67bd2bdc21498265e911ef0cc6f6806a8a7ebb1dbc2ab8ff543881e584b9eecc801fc603f28e33e7990b599774ed6e5e5fb5bba836924a9b6f88d606765e95f5 SHA512 f40f7b04275b90ec74e3bbd91e1b3a139960e3a589c4ccd4a2b427474128410df08dff68284ee7fa0c74ad4f02b01e0b00da16533337063667dbcfbfd7a94368
diff --git a/app-dicts/sword-SME/metadata.xml b/app-dicts/sword-SME/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SME/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SME/sword-SME-1.7.ebuild b/app-dicts/sword-SME/sword-SME-1.7.ebuild
deleted file mode 100644
index abf4039044d3..000000000000
--- a/app-dicts/sword-SME/sword-SME-1.7.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="SME"
-
-inherit sword-module
-
-DESCRIPTION="C. H. Spurgeon's Morning and Evening: Daily Readins"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SME"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SP/Manifest b/app-dicts/sword-SP/Manifest
deleted file mode 100644
index 3a3d51eb3a19..000000000000
--- a/app-dicts/sword-SP/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SP-1.0.zip 1169815 BLAKE2B a01f1fe5b2055068360d9e61aabb23a6a9f9166628edea74309b9a05fa0b32ce372f6064f81562f97abaa6e2518082aad9a2f27955d6ec4012c39eecc1ee37fc SHA512 766d48ee136a093c99a2a58f221e4ec1e0ae68be6b2d95c0e5bc619ee3534dcf61f0ac9be389ce7f2295cba831e2916cfbf54d4ba588302db17ced51ae497b52
diff --git a/app-dicts/sword-SP/metadata.xml b/app-dicts/sword-SP/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SP/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SP/sword-SP-1.0.ebuild b/app-dicts/sword-SP/sword-SP-1.0.ebuild
deleted file mode 100644
index 9ada3db1523d..000000000000
--- a/app-dicts/sword-SP/sword-SP-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.3"
-
-inherit sword-module
-
-DESCRIPTION="Samaritan Pentateuch"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SP"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SPDSS/Manifest b/app-dicts/sword-SPDSS/Manifest
deleted file mode 100644
index 03fcb7bf2db7..000000000000
--- a/app-dicts/sword-SPDSS/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SPDSS-1.0.zip 126280 BLAKE2B a661af321e75bfbcc789236c6e5f9204a35ca6b84c3d13ef462c416c761b0f183e4e9d0247caeb54a3517dfc3abf782d235595d143f810d38079258c0d63b7fc SHA512 5fd67e8f332582c71e1a341e96af9eb6b3d21ab8a75ae5eb1ba08f1947bfa2e60f0f1aec494b706d2397171f6dd5a774abb26fdd5467973b5513d509ca8ca79c
diff --git a/app-dicts/sword-SPDSS/metadata.xml b/app-dicts/sword-SPDSS/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SPDSS/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SPDSS/sword-SPDSS-1.0.ebuild b/app-dicts/sword-SPDSS/sword-SPDSS-1.0.ebuild
deleted file mode 100644
index 999f3b92d92d..000000000000
--- a/app-dicts/sword-SPDSS/sword-SPDSS-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.3"
-
-inherit sword-module
-
-DESCRIPTION="Dead Sea Scrolls variants parallel to the Samaritan Pentateuch"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPDSS"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SPE/Manifest b/app-dicts/sword-SPE/Manifest
deleted file mode 100644
index dc59e42c8ec1..000000000000
--- a/app-dicts/sword-SPE/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SPE-1.0.zip 275090 BLAKE2B 61464838b19677cae2a1ad577fdaf4e242441f119bc9d3029ec196c220f9c40b4139026d9bb120d793f5517a1aa698c699c223b077829d89f94eea5ce76b0f73 SHA512 e04821b9d3321086cb1fb52063b2acbbe649e6177a0ac6cc87d5ef83e31e0cafdc58606a598249462b93e7694d62632bd04e4acf206dd6e212ccb87bf04d1294
diff --git a/app-dicts/sword-SPE/metadata.xml b/app-dicts/sword-SPE/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SPE/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SPE/sword-SPE-1.0.ebuild b/app-dicts/sword-SPE/sword-SPE-1.0.ebuild
deleted file mode 100644
index e2029debfce3..000000000000
--- a/app-dicts/sword-SPE/sword-SPE-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Samaritan Pentateuch in English"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPE"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SPMT/Manifest b/app-dicts/sword-SPMT/Manifest
deleted file mode 100644
index 144dca3b34d1..000000000000
--- a/app-dicts/sword-SPMT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SPMT-1.0.zip 1146260 BLAKE2B e3190a4ee741cca6f275a72a068fe6d41415a2ccdbc2781fb6a4c6abed467724662888f1214474ef7857831038c6f0aaa568f26d27d9991191d36bfb034f3780 SHA512 3099430adc665913c87a214835ea3ccc644fea8b48a4c2f46737c065ea0768ab43547bc5a722034b5018e30b9e46ebd8fa48c3911b3ef68ee79ec0ef8626fff6
diff --git a/app-dicts/sword-SPMT/metadata.xml b/app-dicts/sword-SPMT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SPMT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SPMT/sword-SPMT-1.0.ebuild b/app-dicts/sword-SPMT/sword-SPMT-1.0.ebuild
deleted file mode 100644
index 1ddcb6d9623d..000000000000
--- a/app-dicts/sword-SPMT/sword-SPMT-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.3"
-
-inherit sword-module
-
-DESCRIPTION="Masoretic Text parallel to the Samaritan Pentateuch"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPMT"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SPVar/Manifest b/app-dicts/sword-SPVar/Manifest
deleted file mode 100644
index eded0514e180..000000000000
--- a/app-dicts/sword-SPVar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SPVar-1.0.zip 271904 BLAKE2B f47e155f8149729f6ec836a732c4ed36d9a501cb5e763d80f218c151da3b79be5d19ca8bdc68583030e73e67f1783e95a4a642126f3467e1a54728ba389f78c0 SHA512 76ac4f9ac2fdadf8801ab60e122bda478194f749b549b7686c0cd7e1874cf053dd85d6a59ca3f4b1cc39b8e85bb56f01eb225d3456d217677dcfa269f7de4962
diff --git a/app-dicts/sword-SPVar/metadata.xml b/app-dicts/sword-SPVar/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SPVar/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SPVar/sword-SPVar-1.0.ebuild b/app-dicts/sword-SPVar/sword-SPVar-1.0.ebuild
deleted file mode 100644
index 18134ac0a1ca..000000000000
--- a/app-dicts/sword-SPVar/sword-SPVar-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Samaritan Pentateuch with variant readings"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPVar"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SahidicBible/Manifest b/app-dicts/sword-SahidicBible/Manifest
deleted file mode 100644
index 868d8d96256b..000000000000
--- a/app-dicts/sword-SahidicBible/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SahidicBible-1.1.1.zip 728553 BLAKE2B 8d8b040312efe77c48ba483080883b20a8e3c96d5b709e70cf8f03f3418453b5fff73427e780bdbb6e94f6aa0a69674fcbc17deb3177d411f0682cda00b47f87 SHA512 a7ce839c8ed498fe296218e6eac86f373a0bdb8cfba107bd4c33d4b2557acc02ee2d1cf57a605f096b2367c7d104486565c8a73d111da98ac4d87408a4595955
diff --git a/app-dicts/sword-SahidicBible/metadata.xml b/app-dicts/sword-SahidicBible/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SahidicBible/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SahidicBible/sword-SahidicBible-1.1.1.ebuild b/app-dicts/sword-SahidicBible/sword-SahidicBible-1.1.1.ebuild
deleted file mode 100644
index a2e463d1ee75..000000000000
--- a/app-dicts/sword-SahidicBible/sword-SahidicBible-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Sahidic Bible - Askeland / Schulz"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SahidicBible"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Scofield/Manifest b/app-dicts/sword-Scofield/Manifest
deleted file mode 100644
index f59c2e20b753..000000000000
--- a/app-dicts/sword-Scofield/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Scofield-1.0.zip 404670 BLAKE2B 00e9633956f7ff4b96bf4333c374bd587ed90895249334cae2a7ae2326b7ed8bf03247f7b7667e1fe9741bc8777a105bd17f05f64ddf02536c597eb978ed2988 SHA512 ef2c233354d04abd354711c6dd0ed4c1f59a18c68c23c3d09cd3bf24fd0f78f5525dc8d0c569168159d60fb8fb2d0bd370f4f3411f671f99943e5350fc8d0078
diff --git a/app-dicts/sword-Scofield/metadata.xml b/app-dicts/sword-Scofield/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Scofield/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Scofield/sword-Scofield-1.0.ebuild b/app-dicts/sword-Scofield/sword-Scofield-1.0.ebuild
deleted file mode 100644
index 1b45a9ac5b5c..000000000000
--- a/app-dicts/sword-Scofield/sword-Scofield-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Scofield Reference Notes, 1917 Edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ScotsGaelic/Manifest b/app-dicts/sword-ScotsGaelic/Manifest
deleted file mode 100644
index 662966175649..000000000000
--- a/app-dicts/sword-ScotsGaelic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ScotsGaelic-1.2.zip 34708 BLAKE2B 654e551cc009a703418ec0c7668d3ecd7d94ed2b1100338b0da8475a6a32e177f91c122e7e14d6048121868cb411febb68cfccccd9cbf4538e1cd7b1bb29cf6f SHA512 2b0114b9e98352f11ac0672e334bde5dbfe5441cfcf62f07b806674043270084ca72d582b4e2ad95b4f287d16c71a1fb0603e1e313ef8e37f2237e5fd10c4295
diff --git a/app-dicts/sword-ScotsGaelic/metadata.xml b/app-dicts/sword-ScotsGaelic/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ScotsGaelic/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ScotsGaelic/sword-ScotsGaelic-1.2.ebuild b/app-dicts/sword-ScotsGaelic/sword-ScotsGaelic-1.2.ebuild
deleted file mode 100644
index 4ce917ec2f64..000000000000
--- a/app-dicts/sword-ScotsGaelic/sword-ScotsGaelic-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="ScotsGaelic"
-
-inherit sword-module
-
-DESCRIPTION="Scots Gaelic Gospel of Mark"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ScotsGaelic"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Sentiment/Manifest b/app-dicts/sword-Sentiment/Manifest
deleted file mode 100644
index b85346484ac6..000000000000
--- a/app-dicts/sword-Sentiment/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Sentiment-1.0.zip 409335 BLAKE2B 6f25250cbe97cc3bc7dccc193f494306695f07caa14a9eeaeaa2398ce1ac02fce5c1fbf139c590f5af43cd0b420d2c51abcbe40189807e4061a1a1b07eb9ac8b SHA512 066711b437075176077d18a990c7d61d643b5b33e35f588e5e34d0a7a1e7edc9e738c899ccd7102656fcb640f121bd86a5a9ee1ad1c0ac51d1f5f99b2fb34eb7
diff --git a/app-dicts/sword-Sentiment/metadata.xml b/app-dicts/sword-Sentiment/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Sentiment/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Sentiment/sword-Sentiment-1.0.ebuild b/app-dicts/sword-Sentiment/sword-Sentiment-1.0.ebuild
deleted file mode 100644
index cb79066c02a7..000000000000
--- a/app-dicts/sword-Sentiment/sword-Sentiment-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="Sentiment Analysis of the Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sentiment"
-LICENSE="CC-BY-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Shona/Manifest b/app-dicts/sword-Shona/Manifest
deleted file mode 100644
index 2900c0c465c7..000000000000
--- a/app-dicts/sword-Shona/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Shona-2.1.zip 1433824 BLAKE2B 555b5f956a34e88aee96da0f8a0153e92757cdee6ce7ecd25a2c9463db0d2808b9ac02ed270ba7c093b1f00a13e334b83b5343c67ea6a256686277ba17c74b5d SHA512 043f9e75fa0201cc5850c32f9fc29bfaf2d971e4fac0a77cf7fca7c65d20141303acb43a32522a23a4f525807598dccfb134ab0c2a30892ed2cf7d4463d4160f
diff --git a/app-dicts/sword-Shona/metadata.xml b/app-dicts/sword-Shona/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Shona/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Shona/sword-Shona-2.1.ebuild b/app-dicts/sword-Shona/sword-Shona-2.1.ebuild
deleted file mode 100644
index b60adce6302c..000000000000
--- a/app-dicts/sword-Shona/sword-Shona-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Shona Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Shona"
-LICENSE="FDL-1.3+"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SloKJV/Manifest b/app-dicts/sword-SloKJV/Manifest
deleted file mode 100644
index cd7cd38fc389..000000000000
--- a/app-dicts/sword-SloKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SloKJV-17.0.zip 1925329 BLAKE2B 17c0a4ba89c5edf2e04083aa7e1e088ee3aca78a54559def561d5edb81c7781066bc34d2432ca577c4afdf50834e7807c264d6032e5b44b8a5bd9b440eac9bbb SHA512 16d788c37ed5881d80e22251b0463b75b3d3836e8fd70995b7c28925c51e485f5f9025c36f8a2a37a0c9305a00bc5f8e1a5bfe327ed5861224a669b2881191b8
diff --git a/app-dicts/sword-SloKJV/metadata.xml b/app-dicts/sword-SloKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SloKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SloKJV/sword-SloKJV-17.0.ebuild b/app-dicts/sword-SloKJV/sword-SloKJV-17.0.ebuild
deleted file mode 100644
index 742e502abd61..000000000000
--- a/app-dicts/sword-SloKJV/sword-SloKJV-17.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Slovenian translation of Holy Bible King James Version (1769)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloKJV"
-LICENSE="CC-BY-NC-ND-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SloOjacano/Manifest b/app-dicts/sword-SloOjacano/Manifest
deleted file mode 100644
index 61553270119a..000000000000
--- a/app-dicts/sword-SloOjacano/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SloOjacano-1.0.zip 163348 BLAKE2B 5723462433b70f8946bfe24a79301b026d84381b8ba44a42fac18c72c4a4fdaec345bb880fd12c7db6c2343067e1aff7e784ee2259fb969540b63fc3571c7834 SHA512 202e3f53add5f587b43e2196d4e0ca297283f80adcec40a1b27ff326da6ff039d716bb94c14de6f8b4048424d4329e74f07a8a904b32b6f717885d92efbacbb3
diff --git a/app-dicts/sword-SloOjacano/metadata.xml b/app-dicts/sword-SloOjacano/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SloOjacano/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SloOjacano/sword-SloOjacano-1.0.ebuild b/app-dicts/sword-SloOjacano/sword-SloOjacano-1.0.ebuild
deleted file mode 100644
index a2c3cbc64396..000000000000
--- a/app-dicts/sword-SloOjacano/sword-SloOjacano-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Ojačano Sveto pismo (Ps + Gal)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloOjacano"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SloStritar/Manifest b/app-dicts/sword-SloStritar/Manifest
deleted file mode 100644
index 0f92c47a3c44..000000000000
--- a/app-dicts/sword-SloStritar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SloStritar-1.1.zip 464914 BLAKE2B 43277208d60a534f70ebd5d110d2775744bcce1c9e3b96ecc0b611484afaa3a8cff39edb9ab343bd7afcdaf8a1a2f68d5f6e7a332fd3016b3427e37e9683c2cd SHA512 6246a6b2aecddb72a45b4ee9946560f25d41ed7f517db1776f3786b598f7a7c05812a4429720df8acdb69808a4e766fe92e60e0c7ac3e9b17a338a9547f66a6f
diff --git a/app-dicts/sword-SloStritar/metadata.xml b/app-dicts/sword-SloStritar/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SloStritar/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SloStritar/sword-SloStritar-1.1.ebuild b/app-dicts/sword-SloStritar/sword-SloStritar-1.1.ebuild
deleted file mode 100644
index ad137d262fab..000000000000
--- a/app-dicts/sword-SloStritar/sword-SloStritar-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6"
-
-inherit sword-module
-
-DESCRIPTION="Novi testament in Psalmi Davidovi Josipa Stritarja (1882)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloStritar"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Smith/Manifest b/app-dicts/sword-Smith/Manifest
deleted file mode 100644
index 5569d0be656c..000000000000
--- a/app-dicts/sword-Smith/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Smith-1.3.zip 1209276 BLAKE2B da3a00002eba8ec23dd81812206d65f502f3bc437d167ab12b0b8e7b6f520eba67e1b4e26f824dd0866c93d9d363ffb9ddee2d064ddd59bb7c2d00de2cabff33 SHA512 a6bc89fcb3ca1e5561e03c38d84d46433fb4d3e5766ec0bc8651c4898e057a6437c6c5816bd472a21a5f1a8f1f2d06eb4d442183903dec584ba15fbfe62d600d
diff --git a/app-dicts/sword-Smith/metadata.xml b/app-dicts/sword-Smith/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Smith/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Smith/sword-Smith-1.3.ebuild b/app-dicts/sword-Smith/sword-Smith-1.3.ebuild
deleted file mode 100644
index 4b0324ed9edc..000000000000
--- a/app-dicts/sword-Smith/sword-Smith-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Smith"
-
-inherit sword-module
-
-DESCRIPTION="Smith's Bible Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Smith"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SomKQA/Manifest b/app-dicts/sword-SomKQA/Manifest
deleted file mode 100644
index 828710d2950e..000000000000
--- a/app-dicts/sword-SomKQA/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SomKQA-2.0.zip 1900896 BLAKE2B 7f4162c8f925eafe4ee385dec070f03f58a5e32b7d5ee04859004f130cc01569a60e63427159739c41f4c54644b86a9db92977a110d421da6b14fda72b3e751a SHA512 b420de364fc7f199cefe0bd3b36b873f789e6ba439524c5e6207a8a733c3f557a51ba99107fcc67f59e4595560393b0c9778f91652549857d3efc8bba45f5b2d
diff --git a/app-dicts/sword-SomKQA/metadata.xml b/app-dicts/sword-SomKQA/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SomKQA/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SomKQA/sword-SomKQA-2.0.ebuild b/app-dicts/sword-SomKQA/sword-SomKQA-2.0.ebuild
deleted file mode 100644
index 84d6fda7af05..000000000000
--- a/app-dicts/sword-SomKQA/sword-SomKQA-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Kitaabka Quduuska Ah (Somali Bible)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SomKQA"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Sorani/Manifest b/app-dicts/sword-Sorani/Manifest
deleted file mode 100644
index 50a79045f602..000000000000
--- a/app-dicts/sword-Sorani/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Sorani-2.0.1.zip 526706 BLAKE2B 9a666d6c6a8a34e4f7b57cf57684f0c7b0d3c0560f956d45a34089d6e2fb291e311e6cce6f6dd5825a0e80a2a473e20b3b242aec45ca86c84cd27f51643f1fc5 SHA512 19f2ae307209df9527f3bce37b63ce1118caadf6765bc96324cf206bebc6111d2b69602070cb5268dda0f52d3d172e203a8a93069995dec91053a97e6df71743
diff --git a/app-dicts/sword-Sorani/metadata.xml b/app-dicts/sword-Sorani/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Sorani/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Sorani/sword-Sorani-2.0.1.ebuild b/app-dicts/sword-Sorani/sword-Sorani-2.0.1.ebuild
deleted file mode 100644
index c636cd73b518..000000000000
--- a/app-dicts/sword-Sorani/sword-Sorani-2.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Bible in Sorani Kurdish language"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sorani"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SpaPlatense/Manifest b/app-dicts/sword-SpaPlatense/Manifest
deleted file mode 100644
index 179cccbd4152..000000000000
--- a/app-dicts/sword-SpaPlatense/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SpaPlatense-1.0.zip 4624443 BLAKE2B 6ac25f2b460a2b2cf71e398afd55536dad8e28720eb0e47019dcb6aded433d708152356754feb5bb95b7d3369d93b00f8c8b56ffbe7a86435077730a947a76a5 SHA512 6357bee7b6770e17e86d9de453624cbc8a7f88e4bd3a35566077269ce1b3a2ba85774cea3712b4a733a4399e17a62f7e23b7d1cef03c455c18abf1bf440cebe2
diff --git a/app-dicts/sword-SpaPlatense/metadata.xml b/app-dicts/sword-SpaPlatense/metadata.xml
deleted file mode 100644
index 765ba6b528e2..000000000000
--- a/app-dicts/sword-SpaPlatense/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="en">
-		The Platense Bible, also known as the Commented Bible, is a Catholic translation of the Bible into Spanish by the German Catholic priest Juan Straubinger. It is called Platense for having been done in the city of La Plata, Argentina. Publication Date: 1948. Textual basis: OT: Masoretic text, Nácar-Colunga and Bóver-Cantera bibles. Deuterocanonicals: Vulgate. NT: Textus Receptus, Merk critical edition.
-
-		Msgr. Straubinger (1883-1956) was a German priest exiled in Argentina during World War II. Professor of Holy Scripture, theologian, exegete and Biblical scholastic. Author and translator of the Platense Bible, one of the most recognized versions of the Bible in Spanish. Straubinger's translation took very seriously many ancient and modern versions prior to his work, notably those of Nácar-Colunga (1944) and Bover-Cantera (1947).
-	</longdescription>
-	<longdescription lang="es">
-		La Biblia Platense, también conocida como Biblia Comentada, es una traducción católica de la biblia al español realizada por el sacerdote católico alemán Juan Straubinger. Es llamada Platense por haberse hecho en la ciudad de La Plata, Argentina. Fecha de Publicación: 1948. Base textual: AT: texto masorético, biblias de Nácar-Colunga y Bóver-Cantera. Deuterocanónicos: Vulgata. NT: Textus Receptus, edición crítica de Merk.
-
-		Mons. Straubinger (1883 — 1956) fue un sacerdote alemán exiliado en Argentina durante la II Guerra Mundial. Profesor de Sagrada Escritura, teólogo, exégeta y escolástico bíblico. Autor y traductor de la Biblia Platense, una de las más reconocidas versiones de la Biblia que hay en castellano. La traducción de Straubinger tomó muy seriamente en consideración numerosas versiones antiguas y modernas previas a sus trabajos, entre las que destacan las de Nácar-Colunga (1944) y Bover-Cantera (1947).
-	</longdescription>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SpaPlatense/sword-SpaPlatense-1.0.ebuild b/app-dicts/sword-SpaPlatense/sword-SpaPlatense-1.0.ebuild
deleted file mode 100644
index b96f0e6fb9b2..000000000000
--- a/app-dicts/sword-SpaPlatense/sword-SpaPlatense-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="The Platense Bible (Straubinger)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaPlatense"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SpaRV/Manifest b/app-dicts/sword-SpaRV/Manifest
deleted file mode 100644
index f411f71e124d..000000000000
--- a/app-dicts/sword-SpaRV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SpaRV-2.0.zip 1516994 BLAKE2B ecfb9d95cbf967f6e9a74cab05b540177efc84f96d4b7363e713722a7b36f7b990870c7e1866b33d83d6202be7c1e7fcbdb74226dc8129a6311c66a854d42c25 SHA512 4bc09f1542111251e8c9e7f6e27412a97975e432839234be627de94164fc5f78c16897d063bb980b3382aa89f8cba97178520a45b36c28e8bbae3be3e91e1698
diff --git a/app-dicts/sword-SpaRV/metadata.xml b/app-dicts/sword-SpaRV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SpaRV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SpaRV/sword-SpaRV-2.0.ebuild b/app-dicts/sword-SpaRV/sword-SpaRV-2.0.ebuild
deleted file mode 100644
index 1f8b17853a26..000000000000
--- a/app-dicts/sword-SpaRV/sword-SpaRV-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="La Santa Biblia Reina-Valera (1909)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SpaRV1865/Manifest b/app-dicts/sword-SpaRV1865/Manifest
deleted file mode 100644
index e3d4a0da850e..000000000000
--- a/app-dicts/sword-SpaRV1865/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SpaRV1865-1.1.zip 1530877 BLAKE2B ca53784806d131195f53a48f38fe4e3ed39bc258db123951264bf84943622a129e3d930c84d1411ba5cca1cc407a00d2fec24a142350e2c459aa3769a4b1ae16 SHA512 df6c62ef00407f47a772131533ce73fb94ae5850d24ce6ee4ffe7bc26467b84fb29025172e2ba3a0ddb53fa8edc3f5a2042055fa88ab6f38174f796f8a08ef57
diff --git a/app-dicts/sword-SpaRV1865/metadata.xml b/app-dicts/sword-SpaRV1865/metadata.xml
deleted file mode 100644
index 3474843bbde6..000000000000
--- a/app-dicts/sword-SpaRV1865/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
-		The Holy Bible Containing the Old and the New Testaments. Version of Cipriano de Valera (1602) Revised &amp; corrected (1865) With updated orthography (2018).
-
-		The orthographic rules have changed since the original edition, mainly the rules that affect the accentuation of words. The update consisted in removing the accents in words that ceased accenting orthographically. The result is a text equal to the original but valid according to the current regulations.
-	</longdescription>
-	<longdescription lang="es">
-		La Santa Biblia Que contiene el Antiguo y el Nuevo Testamento. Versión de Cipriano de Valera (1602) Revisada y corregida (1865) Con arreglos ortográficos (2018).
-
-		Las reglas ortográficas han cambiado desde la edición original, principalmente las reglas que afectan la acentuación de las palabras. La actualización consistió en borrar los acentos en palabras que dejaron de acentuarse ortográficamente. El resultado es un texto igual al original pero válido de acuerdo con la normativa vigente.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-SpaRV1865/sword-SpaRV1865-1.1.ebuild b/app-dicts/sword-SpaRV1865/sword-SpaRV1865-1.1.ebuild
deleted file mode 100644
index 3e7aa301f2d6..000000000000
--- a/app-dicts/sword-SpaRV1865/sword-SpaRV1865-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Reina-Valera Bible (1865) with updated orthography"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1865"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SpaRV1909/Manifest b/app-dicts/sword-SpaRV1909/Manifest
deleted file mode 100644
index 25e662b15d96..000000000000
--- a/app-dicts/sword-SpaRV1909/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SpaRV1909-1.0.1.zip 2817495 BLAKE2B 2241138e28c7701c96182bd2ff049e5237c1cc80393f7c80087727f2501c6ef104053e89e97e3c5227ea623640a45f405cee0c8a92a9b3211d7abb7ba0307d2d SHA512 690706dc0a114ededaf7906c8e642fcb0c053b59e0b330e80521592385087aa2567979e55e9527fc905ebcbf324eea481d23fea8daa976321e0e5ef58d3d8fd0
diff --git a/app-dicts/sword-SpaRV1909/metadata.xml b/app-dicts/sword-SpaRV1909/metadata.xml
deleted file mode 100644
index 64b1c62d01c5..000000000000
--- a/app-dicts/sword-SpaRV1909/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="es">
-		Biblia Reina-Valera 1909 con números de Strong v 1.0
-		La Santa Biblia Antiguo y Nuevo Testamento
-		Antigua versión de Casiodoro de Reina (1569), revisada por Cipriano de Valera (1602) y cotejada posteriormente con diversas traducciones, y con los textos hebreo y griego.
-		Sociedad Bíblica Americana Sociedad Bíblica Británica y Extranjera
-		El texto de la Reina-Valera 1909 es de dominio público. Las etiquetas con los números de Strong han sido editadas por Rubén Gómez.
-		Los números de Strong se actualizarán periódicamente. Por favor, informe de cualquier error u omisión al editor de la obra: rubeng{at}infotelecom{dot}es
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-SpaRV1909/sword-SpaRV1909-1.0.1.ebuild b/app-dicts/sword-SpaRV1909/sword-SpaRV1909-1.0.1.ebuild
deleted file mode 100644
index 5fa627648bca..000000000000
--- a/app-dicts/sword-SpaRV1909/sword-SpaRV1909-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Reina-Valera 1909 with Strong's numbers"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1909"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SpaRVG/Manifest b/app-dicts/sword-SpaRVG/Manifest
deleted file mode 100644
index 9f741c767dee..000000000000
--- a/app-dicts/sword-SpaRVG/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SpaRVG-1.3.zip 1880070 BLAKE2B ffed8332ee0064b21a56ce2d76cd5e7b626725de64fabd3e186123f7ca93f543176e357b6ad3959ea6a38900f344e722878dcb227f0bdf70063b0d28966a79d5 SHA512 0ef2fbf51baff50d0ea089de0d24427bffb5b00699833c46ab6a51e10d56fc704cb650c804b3e4448b89059c2b03101d212103ff7e3caa5192570b686a07de1a
diff --git a/app-dicts/sword-SpaRVG/metadata.xml b/app-dicts/sword-SpaRVG/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SpaRVG/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SpaRVG/sword-SpaRVG-1.3.ebuild b/app-dicts/sword-SpaRVG/sword-SpaRVG-1.3.ebuild
deleted file mode 100644
index b0cc27c9f4e7..000000000000
--- a/app-dicts/sword-SpaRVG/sword-SpaRVG-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Reina Valera Gomez Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRVG"
-LICENSE="CC-BY-ND-3.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SpaTDP/Manifest b/app-dicts/sword-SpaTDP/Manifest
deleted file mode 100644
index 3d8f700e5003..000000000000
--- a/app-dicts/sword-SpaTDP/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SpaTDP-1.0.zip 408008 BLAKE2B 1e938511ba68a92d116fe39450cfee3c0358b1588527446d3f10aa0d6c49f1f68eea1966087662cc4664f8aaa3b1eb3f2ba5d0438a7fe8c84fa677ca201294de SHA512 b0806c9a34f5af6b01eb64ac813f41481ca103a59738ee59a46663b715c6a969a93ad61be65f9796488078ba9d15a9c4c58900ce3e54bf415566bac3a7fbb56a
diff --git a/app-dicts/sword-SpaTDP/metadata.xml b/app-dicts/sword-SpaTDP/metadata.xml
deleted file mode 100644
index bd246fe7b91b..000000000000
--- a/app-dicts/sword-SpaTDP/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="es">
-		Traducción de dominio público, abierta a mejoras de los Evangelios Esta traducción se basa especialmente en la biblia World English Bible - WEB (http://www.ebible.org). Así como la biblia World English Bible, esta traducción y sus fuentes se liberan al dominio público. En particular están permitidos por siempre el uso ilimitado, la redistribución, reproducción y retransmisión por cualquier medio conocido o por conocer así como su modificación. Nosotros, los traductores, no ofrecemos garantía alguna, sólo quisiéramos hacer la voluntad de Dios (aunque no estamos seguros de estar haciéndola bien). Sin los conocimientos, ni autoridad que requiere una traducción de un texto inspirado por Dios, nos atrevimos a comenzar porque no habíamos encontrado una versión de este texto en español y de dominio público. Probablemente al traducir hemos introducido errores y eventualmente la versión en la que nos basamos también tenga (aunque hemos procurado comparar con otras traducciones). Quien movido por su fe en Jesús desee mejorar esta traducción está cordialmente invitados al grupo virtual evangelios-dp http://groups.yahoo.com/group/evangelios-dp Puede buscar actualizaciones o citar como fuente de la traducción: http://de.geocities.com/nuestroamigojesus/bdp Lo invitamos a difundir esta traducción, a mejorarla pero sobre todo a colaborar en la construcción del Reino de Dios que creemos se logra haciendo la voluntad de Dios, siguiendo a Jesús.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-SpaTDP/sword-SpaTDP-1.0.ebuild b/app-dicts/sword-SpaTDP/sword-SpaTDP-1.0.ebuild
deleted file mode 100644
index 2c42522f1514..000000000000
--- a/app-dicts/sword-SpaTDP/sword-SpaTDP-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Traducción de dominio público (Mateo a Romanos)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaTDP"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SpaVNT/Manifest b/app-dicts/sword-SpaVNT/Manifest
deleted file mode 100644
index 91de45f11f2b..000000000000
--- a/app-dicts/sword-SpaVNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SpaVNT-1.2.1.zip 367945 BLAKE2B 322cd91b9520c1d0e89d6a2f5500a7fbcf9bfa608e1d927f94d9c83d9eabdb222d733eff9e6762be7081928f680af7814586252fa610364c3197404f752bbe29 SHA512 5341edd4427899d57413e8d595cb22fd4d29f21864d2a41a1a4285f26e26b0bef7b0ba257c8ca2514d5ed84dcb0b72edf5d3222fc00b2ae63aaeaf8dd8e20e01
diff --git a/app-dicts/sword-SpaVNT/metadata.xml b/app-dicts/sword-SpaVNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SpaVNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SpaVNT/sword-SpaVNT-1.2.1.ebuild b/app-dicts/sword-SpaVNT/sword-SpaVNT-1.2.1.ebuild
deleted file mode 100644
index c7f88c06ee0b..000000000000
--- a/app-dicts/sword-SpaVNT/sword-SpaVNT-1.2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Spanish 1858 Reina Valera New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaVNT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Spurious/Manifest b/app-dicts/sword-Spurious/Manifest
deleted file mode 100644
index 8b3946d8caae..000000000000
--- a/app-dicts/sword-Spurious/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Spurious-1.0.zip 4825 BLAKE2B c17b5a54b94a45936bbc8a7f56206f3b08aed046095f1e6e4888072e5bd4e649c9476afc97b84b6acb0a276fb04fb1d8140a6bf46debc280baedffcbaf2f8503 SHA512 08c33a3a5d6a7d0fd04bf22ac2666426cbff347289cbb707644ca77fbe279c8029a37e798315b50db632dce7aa4abd5dc7335bc2a483ea3452473e198fe59260
diff --git a/app-dicts/sword-Spurious/metadata.xml b/app-dicts/sword-Spurious/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Spurious/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Spurious/sword-Spurious-1.0.ebuild b/app-dicts/sword-Spurious/sword-Spurious-1.0.ebuild
deleted file mode 100644
index d462b5f2c561..000000000000
--- a/app-dicts/sword-Spurious/sword-Spurious-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Spurious"
-
-inherit sword-module
-
-DESCRIPTION="Tischendorf's Spurious Passages of the GNT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Spurious"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SrKDEkavski/Manifest b/app-dicts/sword-SrKDEkavski/Manifest
deleted file mode 100644
index f0d2a1e1fbe5..000000000000
--- a/app-dicts/sword-SrKDEkavski/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SrKDEkavski-1.0.zip 1609954 BLAKE2B 98fd1edd87512d5ee6c0a7aacc45034109129b3920d1d6e2a01c97a53f97a830252bc07cef2f480f8c8bc345bc75a7bcdae213b8d8cbcbeeb473763c6c275e53 SHA512 fad6a98670657cff8ac427d4ae82eac45fa9b2c91c47a64aef185012b80b9d30663db055b8c5ddb28dc1d529c7708f7d0aaa08a36d237f94f9f35809b8500272
diff --git a/app-dicts/sword-SrKDEkavski/metadata.xml b/app-dicts/sword-SrKDEkavski/metadata.xml
deleted file mode 100644
index 2af6693d4b6e..000000000000
--- a/app-dicts/sword-SrKDEkavski/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Serbian Bible: Vuk Stefanović Karadžić translated the New Testament in 1847, and Đuro Daničić finished his translation of the Old Testament in 1865. This Bible translation is a public domain, Biblija Srpski prevod. Vuk Stefanović Karadžić Novi Zakon 1847, Đuro Daničić Stari Zakon 1865.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-SrKDEkavski/sword-SrKDEkavski-1.0.ebuild b/app-dicts/sword-SrKDEkavski/sword-SrKDEkavski-1.0.ebuild
deleted file mode 100644
index 73a64aeb14ce..000000000000
--- a/app-dicts/sword-SrKDEkavski/sword-SrKDEkavski-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Serbian Bible Daničić-Karadžić Ekavski, NRSV versification"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDEkavski"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SrKDIjekav/Manifest b/app-dicts/sword-SrKDIjekav/Manifest
deleted file mode 100644
index f07ca0a21e52..000000000000
--- a/app-dicts/sword-SrKDIjekav/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SrKDIjekav-1.0.zip 1609798 BLAKE2B 916c704100d5b981be159fdf1d6d5fbd62ab1e443c5464abebebb769a3567d48afb15c6a5be876c59f2092bc9f9152c9fb0430b71ddcd8d68f25fad73e34d473 SHA512 2f4ca321da2bd6b31ed2bd77842de2eabca3a2f892ba2175818e2e1341bc2a6bd18116d59046d80b9b8c1cd106d4c621ef91d9d6979f9e882acf73f7fc89e668
diff --git a/app-dicts/sword-SrKDIjekav/metadata.xml b/app-dicts/sword-SrKDIjekav/metadata.xml
deleted file mode 100644
index a35317061532..000000000000
--- a/app-dicts/sword-SrKDIjekav/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Serbian Bible: Vuk Stefanović Karadžić translated the New Testament in 1847, and Đuro Daničić finished his translation of the Old Testament in 1865. This Bible translation is a public domain. ,"Biblija Srpski prevod. Vuk Stefanović Karadžić Novi Zakon 1847, Đuro Daničić Stari Zakon 1865."
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-SrKDIjekav/sword-SrKDIjekav-1.0.ebuild b/app-dicts/sword-SrKDIjekav/sword-SrKDIjekav-1.0.ebuild
deleted file mode 100644
index ef93f03a1fd4..000000000000
--- a/app-dicts/sword-SrKDIjekav/sword-SrKDIjekav-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.8.0"
-
-inherit sword-module
-
-DESCRIPTION="Serbian Bible Daničić-Karadžić Ijekavski, Calvin versification"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDIjekav"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-StrongsGreek/Manifest b/app-dicts/sword-StrongsGreek/Manifest
deleted file mode 100644
index 5dfae5a85656..000000000000
--- a/app-dicts/sword-StrongsGreek/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST StrongsGreek-1.2.zip 356388 BLAKE2B ff7947f2aaebc9bb925c9a2ac07950db39d34399fec5fded4ca8f726492b20d30d68e767fe70fa0e89662d76377f289c9a956203b984ce5c6b90b9b7710335d1 SHA512 0a8451f70d9cfed8fcec8ada100274d07080de448c9d7593fbacf3c3f12c471865213555a8678918730d32ca7d93ec5bcd86923c68e384bf1bdd43a88c87e545
diff --git a/app-dicts/sword-StrongsGreek/metadata.xml b/app-dicts/sword-StrongsGreek/metadata.xml
deleted file mode 100644
index 5258f5604008..000000000000
--- a/app-dicts/sword-StrongsGreek/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Dictionary of Greek Words taken from Strong's Exhaustive Concordance by James Strong, S.T.D., LL.D. 1890
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-StrongsGreek/sword-StrongsGreek-1.2.ebuild b/app-dicts/sword-StrongsGreek/sword-StrongsGreek-1.2.ebuild
deleted file mode 100644
index ccfa89ab64ee..000000000000
--- a/app-dicts/sword-StrongsGreek/sword-StrongsGreek-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Strong's Greek Bible Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-StrongsHebrew/Manifest b/app-dicts/sword-StrongsHebrew/Manifest
deleted file mode 100644
index 074123c06600..000000000000
--- a/app-dicts/sword-StrongsHebrew/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST StrongsHebrew-1.2.zip 532334 BLAKE2B 835ea32b57fa78071676161137e95afe5d6a480cab72cc47e83820370189b08e936e12673022bbf129e391074689945615d1fdafb8a582c4f914066f2ec1bbaa SHA512 c32917ddc876403fb696aed492963b0325e64cb234cfd3f657f1436ca0cb1fa9b8aab09f8ac20da13d7e46135048a6d08ff2fda097a159fa5f5cfe65d96a434f
diff --git a/app-dicts/sword-StrongsHebrew/metadata.xml b/app-dicts/sword-StrongsHebrew/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-StrongsHebrew/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-StrongsHebrew/sword-StrongsHebrew-1.2.ebuild b/app-dicts/sword-StrongsHebrew/sword-StrongsHebrew-1.2.ebuild
deleted file mode 100644
index 4a8aeebadab5..000000000000
--- a/app-dicts/sword-StrongsHebrew/sword-StrongsHebrew-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="StrongsHebrew"
-
-inherit sword-module
-
-DESCRIPTION="Strong's Hebrew Bible Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsHebrew"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Swahili/Manifest b/app-dicts/sword-Swahili/Manifest
deleted file mode 100644
index 5776b7614a86..000000000000
--- a/app-dicts/sword-Swahili/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Swahili-1.1.zip 365719 BLAKE2B dcb4ea202a0a622464f7c3ff2ea49822deb10f9976f65817f6eeae1bb2a6b8abb112cc54afc0aacdebb56329a0866d417dd78109947150e86b26f407c3aa35f8 SHA512 0508324f47224bbe28a6214d98916ca6f3e0213287e119934d80c71c3891c95e8a99bcabf6f3395d28992262c6ae09ff6ae7440dde3c48c4b896958f31417380
diff --git a/app-dicts/sword-Swahili/metadata.xml b/app-dicts/sword-Swahili/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Swahili/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Swahili/sword-Swahili-1.1.ebuild b/app-dicts/sword-Swahili/sword-Swahili-1.1.ebuild
deleted file mode 100644
index addd9f22dae1..000000000000
--- a/app-dicts/sword-Swahili/sword-Swahili-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Swahili"
-
-inherit sword-module
-
-DESCRIPTION="Swahili New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swahili"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Swe1917/Manifest b/app-dicts/sword-Swe1917/Manifest
deleted file mode 100644
index fa8838ba56b9..000000000000
--- a/app-dicts/sword-Swe1917/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Swe1917-2.0.zip 2375221 BLAKE2B 339c07519f283dffede8d9ee35af180dfa4e6ff0b7ad9fa5fe36d00e628547bbb6aa4ec2ced9fbebad7fa2a897e99d0b6c4ec310cdfc7001c2e4b9e54c972eb4 SHA512 40d14d09389cc6655f691afd767f0633f1456d54368a922b8578b652311b99ba2dbb15e6b29f435955e77f9adb24f65358f32335d468c9fb095983988729f696
diff --git a/app-dicts/sword-Swe1917/metadata.xml b/app-dicts/sword-Swe1917/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Swe1917/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Swe1917/sword-Swe1917-2.0.ebuild b/app-dicts/sword-Swe1917/sword-Swe1917-2.0.ebuild
deleted file mode 100644
index fdc9d741d631..000000000000
--- a/app-dicts/sword-Swe1917/sword-Swe1917-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Swedish Bible (1917)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Swe1917Of/Manifest b/app-dicts/sword-Swe1917Of/Manifest
deleted file mode 100644
index 9419d015571f..000000000000
--- a/app-dicts/sword-Swe1917Of/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Swe1917Of-1.1.zip 61369 BLAKE2B f61b354cd25e31925cfc4d64d96421540255cbe521416786165c9a25a604feb04ea86e569ddbc235ecf83d75132a0e5067dbb587af04c51486f2c85f54ae8b9f SHA512 dc38fc33fa813e94f09de94d2a9e1230236440b200fd489576fecd7d5b50745d3a383ed640f130a593453ba16d3246acb119c561bfb8b5242173f7f8cd3009d8
diff --git a/app-dicts/sword-Swe1917Of/metadata.xml b/app-dicts/sword-Swe1917Of/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Swe1917Of/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Swe1917Of/sword-Swe1917Of-1.1.ebuild b/app-dicts/sword-Swe1917Of/sword-Swe1917Of-1.1.ebuild
deleted file mode 100644
index 485a21991a34..000000000000
--- a/app-dicts/sword-Swe1917Of/sword-Swe1917Of-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Ordförklaringar och sakupplysningar från 1917 års översättning av bibeln"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917Of"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SweFolk1998/Manifest b/app-dicts/sword-SweFolk1998/Manifest
deleted file mode 100644
index 8a530b36263d..000000000000
--- a/app-dicts/sword-SweFolk1998/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SweFolk1998-1.2.zip 1633828 BLAKE2B cfdd4df8998d942c4358f5ad7625968d50fc9f8f0c1181faca4db2718105615140587782f07ea9262fd016de9ad079e8e109e4d2b03d609747f1d4490bd22599 SHA512 ae2e2f51512c2ab7e7fac1d1366b1e9f59d2aeeffe93ef5077a84bdc8581dd09fa690be7fc37f4e3fa2554e546f88444fc804d31090b732aa03f36b61f72a620
diff --git a/app-dicts/sword-SweFolk1998/metadata.xml b/app-dicts/sword-SweFolk1998/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-SweFolk1998/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-SweFolk1998/sword-SweFolk1998-1.2.ebuild b/app-dicts/sword-SweFolk1998/sword-SweFolk1998-1.2.ebuild
deleted file mode 100644
index 62260cb60d5c..000000000000
--- a/app-dicts/sword-SweFolk1998/sword-SweFolk1998-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Svenska Folkbibeln (1998)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweFolk1998"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SweKarlXII/Manifest b/app-dicts/sword-SweKarlXII/Manifest
deleted file mode 100644
index e09212517c38..000000000000
--- a/app-dicts/sword-SweKarlXII/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SweKarlXII-1.0.zip 1051209 BLAKE2B 16a8fd29310ad5bd83d1de25181bef571bc76cccb8ab92d9313203031e319db3ff497a13af591535b81ee584b1d386eacd4a947d9447c64e297005fd3e1f1760 SHA512 1822468c6ab0a441f3c262f81a606864e4eca77de0cad92d19e6b989bf90084d733ab01f6b0fcea16fa7f1b234d4376f57578713b47bead0042ed99dc53c3008
diff --git a/app-dicts/sword-SweKarlXII/metadata.xml b/app-dicts/sword-SweKarlXII/metadata.xml
deleted file mode 100644
index 92fe275d31d9..000000000000
--- a/app-dicts/sword-SweKarlXII/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="se">
-		Karl XII:s bibel är den reviderade utgåvan av den svenska bibelöversättningen från 1541 (Gustav Vasas bibel). Den trycktes 1703 och var den officiella svenska kyrkobibeln fram till 1917. Denna modul är inte fullständig. Se http://bibeltemplet.net/bibelnonline/KarlXII/ för detaljer.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-SweKarlXII/sword-SweKarlXII-1.0.ebuild b/app-dicts/sword-SweKarlXII/sword-SweKarlXII-1.0.ebuild
deleted file mode 100644
index 448c16436e6e..000000000000
--- a/app-dicts/sword-SweKarlXII/sword-SweKarlXII-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Svenska Karl XII:s Bibel (1703)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-SweKarlXII1873/Manifest b/app-dicts/sword-SweKarlXII1873/Manifest
deleted file mode 100644
index 5a796e64d9be..000000000000
--- a/app-dicts/sword-SweKarlXII1873/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SweKarlXII1873-1.0.zip 1495180 BLAKE2B a1babb97a0e9bb7e19e7b247a400f18138a3b057bfc1ea6562ec0058781e0fd468d5e3b2a8f3463d11a776342c01a7a4e672d128bb71a5e9b66657d8dd4898b5 SHA512 45ae34a1b943800863f6ee9a1b199f396dbee2d9e15e6216fc12a816cd44292c9db48a83e6814fe8555b635335cae45ebe29c48ffd77fbde16454f16ade4ae68
diff --git a/app-dicts/sword-SweKarlXII1873/metadata.xml b/app-dicts/sword-SweKarlXII1873/metadata.xml
deleted file mode 100644
index bd7602837654..000000000000
--- a/app-dicts/sword-SweKarlXII1873/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		According to 19th Century Orthography, Morphology &amp; Syntax of Late Modern Swedish used 1732-1906.
-
-		Text from an OCR of the British and Foreign Bible Societies printed edition from 1873 and spell-checked against a re-print from 1976.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-SweKarlXII1873/sword-SweKarlXII1873-1.0.ebuild b/app-dicts/sword-SweKarlXII1873/sword-SweKarlXII1873-1.0.ebuild
deleted file mode 100644
index dbfb99bb199b..000000000000
--- a/app-dicts/sword-SweKarlXII1873/sword-SweKarlXII1873-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Svenska Karl XII:s Bibel (1873)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII1873"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TCR/Manifest b/app-dicts/sword-TCR/Manifest
deleted file mode 100644
index 8bbfc1e1dc66..000000000000
--- a/app-dicts/sword-TCR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TCR-1.1.zip 270366 BLAKE2B 3419c5f47b93bf6c28ba94f1a80fd0b0262e512be3e651b3b605ddaa96eca0a0990c6cfb644d0fe827d48acf4aea0ec92353f529a1dae56339e2915188b10bd9 SHA512 c95faa93654751ab5c133e906ba7f8ebda3125c30dfa381551c04ba521bda898d3b2cdf43c969bba436ffef60c9922d6fd1486032bddc9a5f39409ce35b1b5d0
diff --git a/app-dicts/sword-TCR/metadata.xml b/app-dicts/sword-TCR/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TCR/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TCR/sword-TCR-1.1.ebuild b/app-dicts/sword-TCR/sword-TCR-1.1.ebuild
deleted file mode 100644
index 12df20a34452..000000000000
--- a/app-dicts/sword-TCR/sword-TCR-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="TCR"
-
-inherit sword-module
-
-DESCRIPTION="Thompson Chain Topics"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TCR"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TDavid/Manifest b/app-dicts/sword-TDavid/Manifest
deleted file mode 100644
index 15e3e6a3dfb1..000000000000
--- a/app-dicts/sword-TDavid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TDavid-2.0.zip 4375073 BLAKE2B b63051165bc8ef7668436be480d6f764a68711d2402d077bd677b2b93a26a2271cf4f3c9f8449cbebb14ed5d2c24d9eea6db68c10c8466ef2a731ab602f3b3c1 SHA512 d299f25b9cd1fc3f4b4cbbc1772a14e7a6edef8d47921f10df3bb66a7a40f3e223508195549e5ba80731bf716194572f8809f126d8471acb3afdd6380167fe63
diff --git a/app-dicts/sword-TDavid/metadata.xml b/app-dicts/sword-TDavid/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TDavid/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TDavid/sword-TDavid-2.0.ebuild b/app-dicts/sword-TDavid/sword-TDavid-2.0.ebuild
deleted file mode 100644
index 0e6add1641f3..000000000000
--- a/app-dicts/sword-TDavid/sword-TDavid-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="C. H. Spurgeon's Treasury of David"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TDavid"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TFG/Manifest b/app-dicts/sword-TFG/Manifest
deleted file mode 100644
index 1f24dba40c34..000000000000
--- a/app-dicts/sword-TFG/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TFG-1.5.zip 1031265 BLAKE2B 313a55b5e0f4aebfd58354ff9ceb0e78428f62d966d45eba4a045f5c857c6a3d008a60fe1423c9baf26d97264c086a6a081c9a9146606811f0d23b3a3088f76d SHA512 9377a6467192e23f97f12b7e7139a731c3a08bebd723e8f38f22099f9d4ee4b21de77ae72a1477d21ddb7cdf4238f94c1303bd10589b7142d69eed829ac4d299
diff --git a/app-dicts/sword-TFG/metadata.xml b/app-dicts/sword-TFG/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TFG/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TFG/sword-TFG-1.5.ebuild b/app-dicts/sword-TFG/sword-TFG-1.5.ebuild
deleted file mode 100644
index f941a0d4bdc4..000000000000
--- a/app-dicts/sword-TFG/sword-TFG-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="TFG"
-
-inherit sword-module
-
-DESCRIPTION="The Fourfold Gospel and Commentary on Acts of Apostles"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TFG"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TNT/Manifest b/app-dicts/sword-TNT/Manifest
deleted file mode 100644
index fa7e3d2c0247..000000000000
--- a/app-dicts/sword-TNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TNT-2.0.zip 511100 BLAKE2B 457c492e5d9e28985a26f55204dcf6ad22f1da5f5c9b9f76a0fc4149ab70b5e5b5c96f1e322cfb584c4cef5ad4465ff1ccffa5c87b4a4929d1b15999a967e72a SHA512 f70575d04fb02e89eae53a7c92ee79bc994c947ee9ad57327df5b0b81b18ef233a7640a7ee1308b97bfca2a513c27885b77264d3c0edb78fa2baec9dfabf1c3a
diff --git a/app-dicts/sword-TNT/metadata.xml b/app-dicts/sword-TNT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TNT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TNT/sword-TNT-2.0.ebuild b/app-dicts/sword-TNT/sword-TNT-2.0.ebuild
deleted file mode 100644
index b46ed47c02aa..000000000000
--- a/app-dicts/sword-TNT/sword-TNT-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Tregelles' Greek New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TNT"
-LICENSE="CC-BY-NC-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TR/Manifest b/app-dicts/sword-TR/Manifest
deleted file mode 100644
index 8bab0e2224bf..000000000000
--- a/app-dicts/sword-TR/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TR-3.0.zip 964573 BLAKE2B 5417bd0dc13d5d2155ae026ef3d4fef17d3bd69c64430c5da0b18732550e4188138d55d7276e2d8013bfeab2de6a6485eb35a9097caa1532e4585c69aa2b0be4 SHA512 e9a69058952a647ab1d8d9321b1923cd830a3eb81ec9d8b7234fa5ecce3e71c17cda8b73d27594ddc6f9a30072f774e1e3736ef3986a4c9e25c9236fc8749fc7
diff --git a/app-dicts/sword-TR/metadata.xml b/app-dicts/sword-TR/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TR/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TR/sword-TR-3.0.ebuild b/app-dicts/sword-TR/sword-TR-3.0.ebuild
deleted file mode 100644
index 5a3f140aeb5d..000000000000
--- a/app-dicts/sword-TR/sword-TR-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Textus Receptus (1550/1894)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TR"
-LICENSE="CC-BY-NC-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TSK/Manifest b/app-dicts/sword-TSK/Manifest
deleted file mode 100644
index 2ac91c7ad9e9..000000000000
--- a/app-dicts/sword-TSK/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TSK-1.4.zip 2643723 BLAKE2B bf4dc47a09c615d2a2d92505ac3fa454a3282487386babd92a98b154461fd72f3b17dfd6b6b80d3497a5a8a698cdeab2e932165a181cbce2d2dba87524810ced SHA512 ed70671352204e9bbb32ba7f277546303152d543c931be07a628faad8f49a178c7c320a11f10dfc36786d6f93aaeb0d2b077a68315648563253886075f01872b
diff --git a/app-dicts/sword-TSK/metadata.xml b/app-dicts/sword-TSK/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TSK/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TSK/sword-TSK-1.4.ebuild b/app-dicts/sword-TSK/sword-TSK-1.4.ebuild
deleted file mode 100644
index c0c84f027a3b..000000000000
--- a/app-dicts/sword-TSK/sword-TSK-1.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="TSK"
-
-inherit sword-module
-
-DESCRIPTION="Treasury of Scripture Knowledge"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TSK"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TagAngBiblia/Manifest b/app-dicts/sword-TagAngBiblia/Manifest
deleted file mode 100644
index fa249f29bdb0..000000000000
--- a/app-dicts/sword-TagAngBiblia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TagAngBiblia-1.2.zip 1489402 BLAKE2B 099f7690037ded93a19495b44482003aa822c3992edde5c650bb33725693806dd111d032b7f62e87d812784394fe68f5270931acba1d4b2148149406c627e461 SHA512 762150c09ec07225d25c3861cd572781c1ead0f8726bb8e93d2f0343da57616ae6a51272c2d0ebd6eef37b1a2ed88c4c13992eae667d1e09de8644f09cf7472a
diff --git a/app-dicts/sword-TagAngBiblia/metadata.xml b/app-dicts/sword-TagAngBiblia/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TagAngBiblia/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TagAngBiblia/sword-TagAngBiblia-1.2.ebuild b/app-dicts/sword-TagAngBiblia/sword-TagAngBiblia-1.2.ebuild
deleted file mode 100644
index 28da0a473263..000000000000
--- a/app-dicts/sword-TagAngBiblia/sword-TagAngBiblia-1.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="'Ang Biblia' in Tagalog by Philippine Bible Society, 1905"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TagAngBiblia"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Tagalog/Manifest b/app-dicts/sword-Tagalog/Manifest
deleted file mode 100644
index 070e2eede926..000000000000
--- a/app-dicts/sword-Tagalog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Tagalog-1.1.zip 43336 BLAKE2B 187fc284faa69f525ed82327d02d1797b7d82465b911e79dbaadf70238871afeb335868f5572b70191049e51c2a4c2def2b9710bcb057f17565c6f0825a4107f SHA512 9208073f7547ecb7dcda2d6a9016a8ff75a2fcc5827b4992c1d2a9b918a6a62e697a1bbd783d0a559e71a7b544eb2f73ef66261b6b6d288420dc9a97d932f9b9
diff --git a/app-dicts/sword-Tagalog/metadata.xml b/app-dicts/sword-Tagalog/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Tagalog/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Tagalog/sword-Tagalog-1.1.ebuild b/app-dicts/sword-Tagalog/sword-Tagalog-1.1.ebuild
deleted file mode 100644
index b7cfe3b2e1ad..000000000000
--- a/app-dicts/sword-Tagalog/sword-Tagalog-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Tagalog"
-
-inherit sword-module
-
-DESCRIPTION="Tagalog (John & James)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tagalog"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Tausug/Manifest b/app-dicts/sword-Tausug/Manifest
deleted file mode 100644
index d50487c43102..000000000000
--- a/app-dicts/sword-Tausug/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Tausug-1.1.zip 645228 BLAKE2B a36e610ba87e1fa2ea3040ee2cec32e9e9b081d19efd3a44d9c51e35e864bb2be3131cf6a4c9e3b592a4fbd7b5f7d146a7f65993e7f6e530bc40697f9a67ef4f SHA512 90f9a73f07394a29cf1e03af6f4b18a64ee9c95eec2f5eac4a28c7b81c17d423dc6e69a87b3179a755b25e68d3f202d17d02940106dcef1911dd9c2ba159409a
diff --git a/app-dicts/sword-Tausug/metadata.xml b/app-dicts/sword-Tausug/metadata.xml
deleted file mode 100644
index 3a2faaf7941b..000000000000
--- a/app-dicts/sword-Tausug/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		The New Testament in the Tausug language. © International Bible Society. First Edition 1985. Revised Edition 1998.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Tausug/sword-Tausug-1.1.ebuild b/app-dicts/sword-Tausug/sword-Tausug-1.1.ebuild
deleted file mode 100644
index 114f541c444d..000000000000
--- a/app-dicts/sword-Tausug/sword-Tausug-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Tausug Kitab Injil"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tausug"
-LICENSE="CC-BY-ND-3.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ThaiKJV/Manifest b/app-dicts/sword-ThaiKJV/Manifest
deleted file mode 100644
index 31c9d63b0ea3..000000000000
--- a/app-dicts/sword-ThaiKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ThaiKJV-2.0.zip 2168169 BLAKE2B 1088e9301b5f09b37d3ac3e90c36d95e9ea9074c8cd828255b7bd2291003d3cec304ff865ae6923115230df7349bfca7381cb0bff26592f038c61c423e1bf046 SHA512 6d6a7b2a036378ba62e946397958885fb76966027445be6d1d1ee8045f9d57e43c166a879c781536265212693f56cbd96076bcba49ba7601689a9d2f2d0c451f
diff --git a/app-dicts/sword-ThaiKJV/metadata.xml b/app-dicts/sword-ThaiKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ThaiKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ThaiKJV/sword-ThaiKJV-2.0.ebuild b/app-dicts/sword-ThaiKJV/sword-ThaiKJV-2.0.ebuild
deleted file mode 100644
index 4228a1def238..000000000000
--- a/app-dicts/sword-ThaiKJV/sword-ThaiKJV-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Thai King James Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ThaiKJV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Tisch/Manifest b/app-dicts/sword-Tisch/Manifest
deleted file mode 100644
index 087f7b754a04..000000000000
--- a/app-dicts/sword-Tisch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Tisch-2.5.zip 1480224 BLAKE2B 8fcc55bf16bf383bae2ae61d5b7021470fe5770f669ac6efbb5aff2b894d4cfe1710f5883b3445ee9292dae0ee460f96270ece80e8e54effdd1de683999e744f SHA512 48037098f556694fd0ad0fbc103039df529d984672faca77e8fad4e4abec0cb61bde4cad3c6a8e0f0297b3d2fad184491671d6427b07047c757c5cabc8d1943a
diff --git a/app-dicts/sword-Tisch/metadata.xml b/app-dicts/sword-Tisch/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Tisch/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Tisch/sword-Tisch-2.5.ebuild b/app-dicts/sword-Tisch/sword-Tisch-2.5.ebuild
deleted file mode 100644
index 9ed74a9eae20..000000000000
--- a/app-dicts/sword-Tisch/sword-Tisch-2.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Tischendorf's 8th edition GNT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tisch"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Torrey/Manifest b/app-dicts/sword-Torrey/Manifest
deleted file mode 100644
index 8d8c7146d6e5..000000000000
--- a/app-dicts/sword-Torrey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Torrey-1.3.zip 422449 BLAKE2B aff495007ac023915cc177d982604a92ad062346b23ebe0b3f58228e648a635a2ad840c70d0866742dd77cb0cfc39ce7ebcb7e0f204766ed737ba428c58386e2 SHA512 581327653b08bc712104ea2645c8a2f80abb551c9455390623e8afa4aae48061dde7b1897c6e0322da5561ec354798d5923c25a26bc9c6f81191d13c9bf4dc33
diff --git a/app-dicts/sword-Torrey/metadata.xml b/app-dicts/sword-Torrey/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Torrey/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Torrey/sword-Torrey-1.3.ebuild b/app-dicts/sword-Torrey/sword-Torrey-1.3.ebuild
deleted file mode 100644
index fce180ec83e4..000000000000
--- a/app-dicts/sword-Torrey/sword-Torrey-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Torrey"
-
-inherit sword-module
-
-DESCRIPTION="R. A. Torrey's New Topical Textbook"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Torrey"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TurHADI/Manifest b/app-dicts/sword-TurHADI/Manifest
deleted file mode 100644
index 5a47f9c06993..000000000000
--- a/app-dicts/sword-TurHADI/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TurHADI-1.1.1.zip 548110 BLAKE2B 346acfbe730d6e8c1ef6f0e42d8d25cc8ed9169958a5871d56e1c5be61aa11f94a660b45f657dcc6da270b3f2f99e52a17037ea96e6dae41644338adde244c4d SHA512 48ce8d47e90ab560b112e380bd6dc2e9d2a6827c1509357751ab2f9702040f63e8db07b5fd06341d884ec4ba88de39bc6889fa0cdbd342b1d9229092039c7bea
diff --git a/app-dicts/sword-TurHADI/metadata.xml b/app-dicts/sword-TurHADI/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TurHADI/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TurHADI/sword-TurHADI-1.1.1.ebuild b/app-dicts/sword-TurHADI/sword-TurHADI-1.1.1.ebuild
deleted file mode 100644
index 533fe2742f16..000000000000
--- a/app-dicts/sword-TurHADI/sword-TurHADI-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Turkish Easy-to-Read Translation (HADI)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurHADI"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-TurNTB/Manifest b/app-dicts/sword-TurNTB/Manifest
deleted file mode 100644
index 5c8bd12e709b..000000000000
--- a/app-dicts/sword-TurNTB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TurNTB-2.1.1.zip 2132224 BLAKE2B 50dea0e56b120d66d9a0dba88e916ca02995c665b22e3afb9220c0218b183cfab47c37796f2745858c691ab45c808c4cef1f0e15b232fe26a7df8e8051c4ed1e SHA512 1cbedf1eb264b68cd72780810f36c4cadc70e70c14efdd0a4b50a594cae874058935c836b3f768342817492d6f4d327439e65bc522dd9dd69df2f2a4210c100f
diff --git a/app-dicts/sword-TurNTB/metadata.xml b/app-dicts/sword-TurNTB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-TurNTB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-TurNTB/sword-TurNTB-2.1.1.ebuild b/app-dicts/sword-TurNTB/sword-TurNTB-2.1.1.ebuild
deleted file mode 100644
index 11c2b28f2e7f..000000000000
--- a/app-dicts/sword-TurNTB/sword-TurNTB-2.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Kutsal Kitap (New Turkish Bible)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurNTB"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Twenty/Manifest b/app-dicts/sword-Twenty/Manifest
deleted file mode 100644
index 8b6d04b657cc..000000000000
--- a/app-dicts/sword-Twenty/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Twenty-1.1.zip 395147 BLAKE2B 7b5b798b4d9daf398530b7b791e1b04303d0e75be41ef19477567c02836151b1f76afb7cd12a701c85d0123f4ae854443b6599635fa0a37d44ba600d9de38779 SHA512 5a2449facec4426a60ea6ecfd87328930306e87e6221b0363128ede632e820629fc8aaa28c56e6f82c74a86ef23c47126709fc68ce9ccc1ea6f12e160ebe81bc
diff --git a/app-dicts/sword-Twenty/metadata.xml b/app-dicts/sword-Twenty/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Twenty/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Twenty/sword-Twenty-1.1.ebuild b/app-dicts/sword-Twenty/sword-Twenty-1.1.ebuild
deleted file mode 100644
index 37c500f518aa..000000000000
--- a/app-dicts/sword-Twenty/sword-Twenty-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Twenty"
-
-inherit sword-module
-
-DESCRIPTION="Twentieth Century New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Twenty"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Tyndale/Manifest b/app-dicts/sword-Tyndale/Manifest
deleted file mode 100644
index 378d254d7ff5..000000000000
--- a/app-dicts/sword-Tyndale/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Tyndale-1.0.zip 351631 BLAKE2B e0565795f757ee9b963c545ec206806ff1596da95a2b1ba08974745aa456acebf21c50af924c06f7e177f459d6f1b07124f9943a132a4193a76a0da2e0779e99 SHA512 9318a0997e3199f1b74f26521209e591ea945af1ac3c0652df18688186b990fddc55812807275b2ee55f42a867f9b7593032191fbdbbfce8b663bd75de1a08e4
diff --git a/app-dicts/sword-Tyndale/metadata.xml b/app-dicts/sword-Tyndale/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Tyndale/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Tyndale/sword-Tyndale-1.0.ebuild b/app-dicts/sword-Tyndale/sword-Tyndale-1.0.ebuild
deleted file mode 100644
index 20fc76b4a746..000000000000
--- a/app-dicts/sword-Tyndale/sword-Tyndale-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Tyndale"
-
-inherit sword-module
-
-DESCRIPTION="William Tyndale Bible (1525/1530)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tyndale"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-UKJV/Manifest b/app-dicts/sword-UKJV/Manifest
deleted file mode 100644
index ac69b449ea41..000000000000
--- a/app-dicts/sword-UKJV/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST UKJV-1.1.1.zip 1584279 BLAKE2B e9fcad269272293a3f43d58b74fe10c9693e2bc4734bf6dd7e904b8b908fcf0974ccdbf12a080059f07501c3d0daf7e139f4101439893818f355af1e0806ab4e SHA512 d3dbbb07545f039637705062533a8c9fe68d6b06f4f175b6b435c63f8778fc30dc46ddc4036a58477a55934bedcd55695478fe93b1650f0786461a92d2b7d133
diff --git a/app-dicts/sword-UKJV/metadata.xml b/app-dicts/sword-UKJV/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-UKJV/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-UKJV/sword-UKJV-1.1.1.ebuild b/app-dicts/sword-UKJV/sword-UKJV-1.1.1.ebuild
deleted file mode 100644
index 8fb6e61197e7..000000000000
--- a/app-dicts/sword-UKJV/sword-UKJV-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.6"
-
-inherit sword-module
-
-DESCRIPTION="Updated King James Version"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UKJV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-UkrKulish/Manifest b/app-dicts/sword-UkrKulish/Manifest
deleted file mode 100644
index f4067e525d17..000000000000
--- a/app-dicts/sword-UkrKulish/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST UkrKulish-1.1.zip 428367 BLAKE2B 1d1c55d0fc54ed55b55e11bef31e3aaa463480d2058923f3591279002511d05636ec069d23f0687e6b4fe705fbbb72f0a0fb567bf2cfd9325c2af5607b42bdf2 SHA512 4a8d15ec0e62c1affe69c49e1b10b8c72c6a0790cb93924b11b82136d9809399764a42c25fab46927bee27f360935b7ee73350033ca309ccb14ac021b017af2d
diff --git a/app-dicts/sword-UkrKulish/metadata.xml b/app-dicts/sword-UkrKulish/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-UkrKulish/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-UkrKulish/sword-UkrKulish-1.1.ebuild b/app-dicts/sword-UkrKulish/sword-UkrKulish-1.1.ebuild
deleted file mode 100644
index 3e475f97518b..000000000000
--- a/app-dicts/sword-UkrKulish/sword-UkrKulish-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Ukrainian New Testament translated by P. Kulish (1871)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UkrKulish"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Ukrainian/Manifest b/app-dicts/sword-Ukrainian/Manifest
deleted file mode 100644
index 93e029e54723..000000000000
--- a/app-dicts/sword-Ukrainian/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Ukrainian-1.4.zip 1763758 BLAKE2B dcc12d53abf7fd98f31a244aed9f49c7016fc8eb0dec53c2afe0fcbe5acf3933c66509c5c7eacb7900c06242ff7c5e8ff338f2d5060564d5215734238b1f6c0b SHA512 fa78ecbf167364fb79b6fe1afc74974c5248a6a0d16799ebbb65f954e9e6e6d5340ffff534d66ddd358b1386dc74cfd59c117bc979a198ff04383ea031fb3968
diff --git a/app-dicts/sword-Ukrainian/metadata.xml b/app-dicts/sword-Ukrainian/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Ukrainian/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Ukrainian/sword-Ukrainian-1.4.ebuild b/app-dicts/sword-Ukrainian/sword-Ukrainian-1.4.ebuild
deleted file mode 100644
index 4249bab738d4..000000000000
--- a/app-dicts/sword-Ukrainian/sword-Ukrainian-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Ivan Ogienko Ukrainian Bible, 1930"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ukrainian"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Uma/Manifest b/app-dicts/sword-Uma/Manifest
deleted file mode 100644
index 2b2506037b26..000000000000
--- a/app-dicts/sword-Uma/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Uma-1.2.zip 431726 BLAKE2B 23b8531a7b42699b8a48c04209557c75401d5256ba13528d5034796e0b20d57fadcdb8ad80c777b94f132eaeac7291dd5f8658942922efa6d7a0764ff72be3ea SHA512 b9ff117f0064e8d2a4175c9e53039048db8d07ac9d512f07c746231c705b461c7859bdf4f5d0162d7ca6bc314ff8590ab5eca498826d524c5be3d9b76e1ac3bd
diff --git a/app-dicts/sword-Uma/metadata.xml b/app-dicts/sword-Uma/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Uma/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Uma/sword-Uma-1.2.ebuild b/app-dicts/sword-Uma/sword-Uma-1.2.ebuild
deleted file mode 100644
index aaf29fde4729..000000000000
--- a/app-dicts/sword-Uma/sword-Uma-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Uma"
-
-inherit sword-module
-
-DESCRIPTION="Uma New Testament"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Uma"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-UrduGeo/Manifest b/app-dicts/sword-UrduGeo/Manifest
deleted file mode 100644
index 86a12fcbbc35..000000000000
--- a/app-dicts/sword-UrduGeo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST UrduGeo-1.10.zip 2182505 BLAKE2B e9f9f525def6868b5ff392c2272895f8fc0b867e63c10e000376e04c67d06472fcb88bbd4bcc8672f86467ecb98f1c2add833223491e4fbb7bd763f7bcc6a49c SHA512 f7026977250158787055c4a4a3a3091d8806d26a0d738d2cd26c578531385bf5159964049dda4335378093cf61d00304165e64a61518b0044749fe262426d018
diff --git a/app-dicts/sword-UrduGeo/metadata.xml b/app-dicts/sword-UrduGeo/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-UrduGeo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-UrduGeo/sword-UrduGeo-1.10.ebuild b/app-dicts/sword-UrduGeo/sword-UrduGeo-1.10.ebuild
deleted file mode 100644
index 042b490613c2..000000000000
--- a/app-dicts/sword-UrduGeo/sword-UrduGeo-1.10.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Urdu Geo Version (UGV) of the Bible, Urdu script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeo"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-UrduGeoDeva/Manifest b/app-dicts/sword-UrduGeoDeva/Manifest
deleted file mode 100644
index 96e404f820fb..000000000000
--- a/app-dicts/sword-UrduGeoDeva/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST UrduGeoDeva-1.9.zip 2405436 BLAKE2B 9c3564213aecf3d6de565f571ab92ed56a38201c47a2df4fb2ae6488d36f97252b99dba762f51c3e3792cb445d4cf233a26e9ac148d98585e222bae7a60db1d5 SHA512 ee24134104f4dfe5a929ed3e98e698e113ec7891d0d6abb06580bdd607620d08e7794253c90c427f7a115147d3fb297e03383ea04e4dde46ed3d50b25da24b8e
diff --git a/app-dicts/sword-UrduGeoDeva/metadata.xml b/app-dicts/sword-UrduGeoDeva/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-UrduGeoDeva/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-UrduGeoDeva/sword-UrduGeoDeva-1.9.ebuild b/app-dicts/sword-UrduGeoDeva/sword-UrduGeoDeva-1.9.ebuild
deleted file mode 100644
index 13a61e189bac..000000000000
--- a/app-dicts/sword-UrduGeoDeva/sword-UrduGeoDeva-1.9.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Urdu Geo Version (UGV) Bible, Devanagari script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoDeva"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-UrduGeoRoman/Manifest b/app-dicts/sword-UrduGeoRoman/Manifest
deleted file mode 100644
index 5de743d0311e..000000000000
--- a/app-dicts/sword-UrduGeoRoman/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST UrduGeoRoman-1.4.zip 2050232 BLAKE2B b373a763e5f235de02490ebf27d251c7704f59328ebfb8000cdbaa2036de371390ecc35895815df11bae965769a1982f951441e1ac8a3b41357937abbd6da57e SHA512 d76a1a7a053fd762548df3472605e58193be8ee9704f094d5fd9608cc7ff3d04ba5ddf464a749553c9f32fa4713c69012d9b13ec666ec0777933bbfc5be9b8a5
diff --git a/app-dicts/sword-UrduGeoRoman/metadata.xml b/app-dicts/sword-UrduGeoRoman/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-UrduGeoRoman/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-UrduGeoRoman/sword-UrduGeoRoman-1.4.ebuild b/app-dicts/sword-UrduGeoRoman/sword-UrduGeoRoman-1.4.ebuild
deleted file mode 100644
index 2cd881527fcf..000000000000
--- a/app-dicts/sword-UrduGeoRoman/sword-UrduGeoRoman-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Urdu Geo Version (UGV) of the Bible, Latin script"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoRoman"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-UyCyr/Manifest b/app-dicts/sword-UyCyr/Manifest
deleted file mode 100644
index 96f09fca578a..000000000000
--- a/app-dicts/sword-UyCyr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST UyCyr-1.1.zip 1958778 BLAKE2B 56d10db568b790bfbc9969be6ccf5f2abb1926ee778846cf8bc02e235fbf53321083021101777b051ef7dfc373b6de1d5cd52bbe71206d209f3f30f31beb5324 SHA512 b1e1393c5774d485b700b7d2b0ece24b600ec40a82b0859310c2c99190b1a5e19740afc0ad8cc1e2569c4f7b7d28b18e3d6d12ca048fc48652ebd5376c5a9935
diff --git a/app-dicts/sword-UyCyr/metadata.xml b/app-dicts/sword-UyCyr/metadata.xml
deleted file mode 100644
index 7a19662dd55e..000000000000
--- a/app-dicts/sword-UyCyr/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="ug">
-Муқəддəс Китап, Инҗил (Йеңи Келишим), Тəврат, Зəбур, Пəйғəмбəрлəрниң Язмилири (Кона Келишим талланмилар), Һазирқи заман уйғурчə тəрҗимиси
-Священное Писание, Современный уйгурский перевод
-Һөрмәтлик китапхан:
-Сиз «Тәврат» вә «Инҗил» қатарлиқлардин тәркип тапқан «Муқәддәс Китап» һәққидә аңлиған болушиңиз мүмкин. «Муқәддәс Китап» барлиқ инсанларға Яратқучи Худа тәрипидин берилгәндур.
-«Муқәддәс Китап» «Кона келишим» вә «Йеңи келишим» дәп икки қисимға бөлүнгән. 39 қисимдин тәшкил тапқан «Кона келишим» Муса пәйғәмбәр арқилиқ чүширилгән «Тәвраттин» ибарәт бәш қисим, шуниңдәк Зәбур вә башқа пәйғәмбәрләрниң қисимлирини өз ичигә алиду. Қолуңиздики Китапқа «Тәвратниң» алдинқи икки қисми, йәни «Аләмниң яритилиши» вә «Мисирдин чиқиш» киргүзүлгән болуп, буларда дуния вә инсанларниң яритилиши, шундақла Нуһ, Ибраһим, Яқуп, Йүсүп, Муса қатарлиқ пәйғәмбәр вә исраил хәлқиниң әҗдатлири һәққидә хатириләнгән.
-«Йеңи келишим» дәпму аталған «Инҗил» болса Әйса Мәсиһтин кейин йезилған болуп, у 27 қисимни өз ичигә алған. Қолуңиздики толуқ «Инҗилни» мәзмун җәһәттин үчкә бөлүшкә болиду:
-1. «Мәтта», «Маркус», «Луқа» вә «Юһаннадин» ибарәт бу төрт қисимда Әйса Мәсиһниң дунияға келиши, яратқан мөҗүзилири, тәлимлири, қәстән чапрас яғачқа миқлинип өлтүрүлүши вә тирилиш җәриянлири баян қилиниду.
-2. «Һәзрити Әйса әлчилириниң паалийәтлиридә» Әйса Мәсиһниң шагиртлириниң Хуш Хәвәр йәткүзүш җәрияни баян қилиниду. Буниңда Худаниң Муқәддәс Роһиниң улар билән биллә болғанлиғидин уларниңму Әйса Мәсиһкә охшаш мөҗүзиләрни яратқанлиғи һәм һәр қандақ қийин әһвал вә җапа-мәшәқәтләргә учриған болсиму, қәйсәрлик билән кишиләрни Әйса Мәсиһкә ишинишкә йетәклигәнлиги, нәтиҗидә мәсиһийләрниң саниниң зор көпийип, мәсиһийләр җамаәтлириниңму мәйданға кәлгәнлити баян қилиниду.
-3. Салам хәтләр Әйса Мәсиһниң әлчилириниң йеңи қурулған мәсиһийләр җамаәтлиригә язған хәтлири болуп, бу хәтләрдә Әйса Мәсиһкә ишиниш йолиниң асаси чүшәндүрүлиду һәм мәсиһийләргә нәсиһәт, илһам вә тәсәлла берилиду.
-«Муқәддәс Китап» дунияда сетилиш сани әң көп болған китап болуп, төрт йүздин артуқ тилға тәрҗимә қилинған. «Инҗилниң» өзила миңдин артуқ тилға тәрҗимә қилинған. «Муқәддәс Китапниң» биринчи түркчә нусхиси 1666-жили Түркияниң султани Мәһмәтниң тәрҗимани тәрипидин тәрҗимә қилинған. Әң йеңи нусхиси болса 2001-жили нәширдин чиққан. Ушбу китапниң ахирида көрситилгинидәк, «Инҗилниң» уйғурлар арисиға тарқалғиниға кам дегәндә миң жил болған болуп, кейинки жилларда Турпан вә башқа қедимий шәһәрләрдин тепилған ядикарлиқлар бу нуқтини испатлайду. «Инҗилниң» 20-әсирдики биринчи уйғурчә тәрҗимиси 1914-жили, «Муқәддәс Китапниң» толуқ уйғурчә тәрҗимиси 1950-жили нәшир қилинған.
-«Инҗил» тәхминән икки миң жил бурун қедимки грек тилида йезилған болса, «Тәвратниң» көп қисми униңдинму кона болған ибраний тилида йезилған. Шуңа, уларни тәрҗимә қилиш һәқиқәтән асан әмәс. Әйни чағдики тилларни бүгүнки тилимизға тоғра, раван вә чүшинишлик қилип тәрҗимә қилиш тәрҗиманлардин зор әмгәк вә алаһидә җавапкәрчилик тәләп қилиду, әлвәттә. қолуңиздики бу китап ялғуз бир кишиниң әмәс, бәлки бир қанчә кишиләрниң әтраплиқ издиниши, чоңқур тәтқиқ қилиши билән вуҗутқа кәлди. «Инҗил» әдәбий грек тилида әмәс, бәлки һәммә адәм чүшинидиған аммибап грек тилида йезилған. Шу сәвәптин, тәрҗиманлар «Инҗилниң» әйни тилиға садиқ болуш үчүн, һазирқи заман аммибап уйғур тилини қоллинишқа тиришти.
-Худа «Муқәддәс Китап» арқилиқ Өзини инсанларға намайән қилип, уларға болған меһир-муһәббитини вә қутқузуш планини көрсәткән. Биз китапханларниң бу китапни оқуп чиқип, Худаниң ирадисини вә униң ата қилған қутқузулуш йолини тонуп йетишини үмүт қилимиз.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-UyCyr/sword-UyCyr-1.1.ebuild b/app-dicts/sword-UyCyr/sword-UyCyr-1.1.ebuild
deleted file mode 100644
index 2b2db51a0508..000000000000
--- a/app-dicts/sword-UyCyr/sword-UyCyr-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Modern Uyghur Cyrillic translation of the Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UyCyr"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VarApp/Manifest b/app-dicts/sword-VarApp/Manifest
deleted file mode 100644
index 42f52f9c2fc9..000000000000
--- a/app-dicts/sword-VarApp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VarApp-1.0.zip 925096 BLAKE2B 51051e5c529dcaaacf426cd9182902a7b99ac1e54a98bf3711ed9a37cc0f23c7e3ebd20965552fcb129b4c3be86d0d9f6b550b0304d720b30f38e35ed6398428 SHA512 512030bc6ed288b1fbb356d52b2e33cfa73a392dfd64777402b84d9bfe58336e6df7fddd04fab393b98f7ede21293e696d7540394d07f832d9f2254b9292f1ee
diff --git a/app-dicts/sword-VarApp/metadata.xml b/app-dicts/sword-VarApp/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-VarApp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-VarApp/sword-VarApp-1.0.ebuild b/app-dicts/sword-VarApp/sword-VarApp-1.0.ebuild
deleted file mode 100644
index 4798b0bcb9fe..000000000000
--- a/app-dicts/sword-VarApp/sword-VarApp-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.2"
-
-inherit sword-module
-
-DESCRIPTION="NT Manuscript Variant Apparatus"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VarApp"
-LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VieRobinson/Manifest b/app-dicts/sword-VieRobinson/Manifest
deleted file mode 100644
index c717259e46fa..000000000000
--- a/app-dicts/sword-VieRobinson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VieRobinson-1.0.zip 51177 BLAKE2B 7c6b9117684e4a8c06ba005ecff5757138aee19751ebe8ddfe3d51243ce0be3af5233d26d68840b918949d158f90943286697a0eb11f98dd8cad6b3476cb5d8c SHA512 df218e02aae6f622cf369df8591d6cd95b7b4fb81489984dcbb462e6fbfe986d8b09bd5a344ad3469e4e8fa82c07ff7b5e06bbdc235c7357c946e83d1a59e3a8
diff --git a/app-dicts/sword-VieRobinson/metadata.xml b/app-dicts/sword-VieRobinson/metadata.xml
deleted file mode 100644
index b641839d6c27..000000000000
--- a/app-dicts/sword-VieRobinson/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Produced in accordance with the key at http://www.byztxt.com/download/PARSINGS.TXT,
-		on the basis of numerous Greek texts, and with significant editorial and
-		corrective emendation.
-		This text was first created by the CrossWire Bible Society in 2002, and recreated
-		in 2009 using the more recent coding system and numerous additional Greek texts.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-VieRobinson/sword-VieRobinson-1.0.ebuild b/app-dicts/sword-VieRobinson/sword-VieRobinson-1.0.ebuild
deleted file mode 100644
index 1e388613e066..000000000000
--- a/app-dicts/sword-VieRobinson/sword-VieRobinson-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Vietnamese translation of Robinson's Morphological Codes"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VieRobinson"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VieStrongsGreek/Manifest b/app-dicts/sword-VieStrongsGreek/Manifest
deleted file mode 100644
index 3dfff2a07008..000000000000
--- a/app-dicts/sword-VieStrongsGreek/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VieStrongsGreek-1.1.zip 554614 BLAKE2B 6588ca5b56fdadfe5ff2dc55a466fa84653c31fb3820366dba692ed451d2303a85c7762cc097f7b19d7bcbe5a9cfd9a210571334a974f396e309eafd9d836b72 SHA512 b307a1a742fccec639b0be6529fee1a568892cfb5e787bc1215599cdfed4bf6d3bc14f790ac5fdb1142701bdb6eca8a04fca7ccc34860b8e52212eaa0ac9e454
diff --git a/app-dicts/sword-VieStrongsGreek/metadata.xml b/app-dicts/sword-VieStrongsGreek/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-VieStrongsGreek/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-VieStrongsGreek/sword-VieStrongsGreek-1.1.ebuild b/app-dicts/sword-VieStrongsGreek/sword-VieStrongsGreek-1.1.ebuild
deleted file mode 100644
index e94ba7ffcb0b..000000000000
--- a/app-dicts/sword-VieStrongsGreek/sword-VieStrongsGreek-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Richard Helleme’s Greek-English-Vietnamese Dictionary in Vietnamese"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VieStrongsGreek"
-LICENSE="CC-BY-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Viet/Manifest b/app-dicts/sword-Viet/Manifest
deleted file mode 100644
index 9bfbeeb4ddfc..000000000000
--- a/app-dicts/sword-Viet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Viet-1.4.1.zip 1557474 BLAKE2B 3826bf444b9bab0d685a540796aa7bbd032df597453e4de66a5e7749ba36c87501340cbd6bf3be1f7e26f76b2b4d7b5ec43168984c014ec719e6306470254e0c SHA512 ffa89c972243108390db78051556159abd6023f849fc22ce87a100cf05515a6a18e0124c1e477a7bd11412498af1328f4527b533e86d01946ffbe28d6a0dbb66
diff --git a/app-dicts/sword-Viet/metadata.xml b/app-dicts/sword-Viet/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Viet/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Viet/sword-Viet-1.4.1.ebuild b/app-dicts/sword-Viet/sword-Viet-1.4.1.ebuild
deleted file mode 100644
index 9e0617a64f66..000000000000
--- a/app-dicts/sword-Viet/sword-Viet-1.4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.2"
-
-inherit sword-module
-
-DESCRIPTION="Vietnamese Bible (1934)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Viet"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VietLCCMN/Manifest b/app-dicts/sword-VietLCCMN/Manifest
deleted file mode 100644
index 56e5b89246cf..000000000000
--- a/app-dicts/sword-VietLCCMN/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VietLCCMN-1.0.zip 1958369 BLAKE2B 44802e1037f5c6a5df982e3f3d07f49215d0f8eb192113bc95bb695edce0afe12636c589311065eb51f0b99e36ea3f8a1d009f6a4f7d5f2fb5d4feb11c76d689 SHA512 9e2fa69ec54b2e3b77c124d84b4b1ca4facdcdecf84bbb891b2bac7b99c12e7cb9c4e8bbc75f66389866022181bcbb1eca9c241a11c45f7a9f636c45d3461edf
diff --git a/app-dicts/sword-VietLCCMN/metadata.xml b/app-dicts/sword-VietLCCMN/metadata.xml
deleted file mode 100644
index decc2146dbe3..000000000000
--- a/app-dicts/sword-VietLCCMN/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="vi">
-		Lời Chúa Cho Mọi Người, Bản dịch do Nhóm Phiên Dịch Các Giờ Kinh Phụng Vụ thực hiện. Dẫn nhập và chú thích : Bernard Hurault, Louis Hurault. Hà Nội: Nhà Xuất Bản Tôn Giáo, 2007.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-VietLCCMN/sword-VietLCCMN-1.0.ebuild b/app-dicts/sword-VietLCCMN/sword-VietLCCMN-1.0.ebuild
deleted file mode 100644
index 56204c673882..000000000000
--- a/app-dicts/sword-VietLCCMN/sword-VietLCCMN-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Lời Chúa Cho Mọi Người"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMN"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VietLCCMNCT/Manifest b/app-dicts/sword-VietLCCMNCT/Manifest
deleted file mode 100644
index bfa4f3065933..000000000000
--- a/app-dicts/sword-VietLCCMNCT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VietLCCMNCT-1.0.zip 887742 BLAKE2B 25f6c1531bb807c71d4226e9114f35e144493918b9db4602dc8392cc308ad30532d9e62ee68e227652ceb51c442c21f3e4f7fd597c6ba45f84673c74ba1e5d86 SHA512 e890df3d2adb1b8d359326151217117d083bcfd7ff80c61c4c6d608c157ce5709384dd24eed0ce71edf484c8f20941ad4717f795e0974becb7b9d48c8abd3ff8
diff --git a/app-dicts/sword-VietLCCMNCT/metadata.xml b/app-dicts/sword-VietLCCMNCT/metadata.xml
deleted file mode 100644
index decc2146dbe3..000000000000
--- a/app-dicts/sword-VietLCCMNCT/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="vi">
-		Lời Chúa Cho Mọi Người, Bản dịch do Nhóm Phiên Dịch Các Giờ Kinh Phụng Vụ thực hiện. Dẫn nhập và chú thích : Bernard Hurault, Louis Hurault. Hà Nội: Nhà Xuất Bản Tôn Giáo, 2007.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-VietLCCMNCT/sword-VietLCCMNCT-1.0.ebuild b/app-dicts/sword-VietLCCMNCT/sword-VietLCCMNCT-1.0.ebuild
deleted file mode 100644
index 3ff779cfdc8d..000000000000
--- a/app-dicts/sword-VietLCCMNCT/sword-VietLCCMNCT-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Lời Chúa Cho Mọi Người Chú Thích"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMNCT"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VietNVB/Manifest b/app-dicts/sword-VietNVB/Manifest
deleted file mode 100644
index 873f5a5e6d63..000000000000
--- a/app-dicts/sword-VietNVB/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VietNVB-1.4.zip 1914442 BLAKE2B 8ec207b384f7823a3c6aaebfbf8fa3c7de04f3ba6ed46a691432856171ebd44a4d4d51e00c3534d08ae7bbcb9499dc02aa41f72318d63b1a405c4eafd8a56885 SHA512 628fa49425f12bc8c6309e9244b0042f58a13803b869cd8b2b7015c6f7c10226472145885163bbf193cf745aec1c5265ba9bb9bd7f57029963a4cabbe2b45821
diff --git a/app-dicts/sword-VietNVB/metadata.xml b/app-dicts/sword-VietNVB/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-VietNVB/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-VietNVB/sword-VietNVB-1.4.ebuild b/app-dicts/sword-VietNVB/sword-VietNVB-1.4.ebuild
deleted file mode 100644
index 609fdf0391e0..000000000000
--- a/app-dicts/sword-VietNVB/sword-VietNVB-1.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="New Vietnamese Bible (2002)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietNVB"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VulgClementine/Manifest b/app-dicts/sword-VulgClementine/Manifest
deleted file mode 100644
index 49d4c6dc52b0..000000000000
--- a/app-dicts/sword-VulgClementine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VulgClementine-2.0.1.zip 2075201 BLAKE2B 6e3ea414bd1b6299d0152f6bd8aaa77878329a5eb4a5558b7f517058273a5de487b64107e30b966dbc81b31a4572ad568e88f1c9c130f951ee693a2946cee709 SHA512 e1cbe11884c361e2934c9f872a3b4116734259c2f4cfc5a8b90ff1c8d7c757d48eb8362c4cef0759c23e793e76a58c0e17edc724e24c2bb9fe486ba18916b918
diff --git a/app-dicts/sword-VulgClementine/metadata.xml b/app-dicts/sword-VulgClementine/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-VulgClementine/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-VulgClementine/sword-VulgClementine-2.0.1.ebuild b/app-dicts/sword-VulgClementine/sword-VulgClementine-2.0.1.ebuild
deleted file mode 100644
index 854305858028..000000000000
--- a/app-dicts/sword-VulgClementine/sword-VulgClementine-2.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Clementine Vulgate"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgClementine"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VulgConte/Manifest b/app-dicts/sword-VulgConte/Manifest
deleted file mode 100644
index a257c8ccafee..000000000000
--- a/app-dicts/sword-VulgConte/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VulgConte-1.0.2.zip 1641941 BLAKE2B bc725367f449d0d864641040d73eca08e17199f393e85d266f75e905328d977648d6306f35fb22e936118aa421b0a4fb8139132cd90478258b65f15ad5d2f61c SHA512 d648b7843252ebcc946bccac69db9fcabd3417cfffe25ef0f7f7ba1cbcb2a38bc460ca4dcd92cc1273c7c523cba5d5630fc152454f2149005c42b3618e329500
diff --git a/app-dicts/sword-VulgConte/metadata.xml b/app-dicts/sword-VulgConte/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-VulgConte/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-VulgConte/sword-VulgConte-1.0.2.ebuild b/app-dicts/sword-VulgConte/sword-VulgConte-1.0.2.ebuild
deleted file mode 100644
index 9a881328106d..000000000000
--- a/app-dicts/sword-VulgConte/sword-VulgConte-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Vulgata Clementina, Conte editore"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgConte"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VulgGlossa/Manifest b/app-dicts/sword-VulgGlossa/Manifest
deleted file mode 100644
index c1628046f0af..000000000000
--- a/app-dicts/sword-VulgGlossa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VulgGlossa-1.0.1.zip 2148186 BLAKE2B 5d24b1b10e3847776cadd041d53982a2555d6330fdbcffbad466db76ab12cc95e5af00c748c0f7a46b7c79399e3a5ac66e8fe5602cdeb6d42e28719abea03473 SHA512 b184d3d33d4ede0d7e836e7adefd473f6e8793048c1c10da4eafcfb891a82d1ec46b1bf3bea2ccd858fd879e6479aaaf2a620d0645d7a6f2f51d4453c937daca
diff --git a/app-dicts/sword-VulgGlossa/metadata.xml b/app-dicts/sword-VulgGlossa/metadata.xml
deleted file mode 100644
index a7763ad887af..000000000000
--- a/app-dicts/sword-VulgGlossa/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Glossa ordinara (Ordinary Glosses), edited by Jacques-Paul Migne (1800-1875), published in 1879. Electronic text prepared by Steven Killings for VulSearch.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-VulgGlossa/sword-VulgGlossa-1.0.1.ebuild b/app-dicts/sword-VulgGlossa/sword-VulgGlossa-1.0.1.ebuild
deleted file mode 100644
index 7d2fc440a64c..000000000000
--- a/app-dicts/sword-VulgGlossa/sword-VulgGlossa-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Glossa ordinaria, ed. Migne"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgGlossa"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VulgHetzenauer/Manifest b/app-dicts/sword-VulgHetzenauer/Manifest
deleted file mode 100644
index 4aa9c86406ae..000000000000
--- a/app-dicts/sword-VulgHetzenauer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VulgHetzenauer-1.0.2.zip 1641511 BLAKE2B 8f1254308b050e3665a9e63e587d0f7316636281bfae0417f87f1f2663fcd5c7c9ec31e1ce4eb849257720add59cf29c0d9b46d7d8868a2db2b689f0173f39fa SHA512 66870e298235047d4a9d295e670ad7713c273248ae31231630d01cb10a9d227f02485f485d6699bce991c843041dbf416d687fb74e343414e9e7d3c8405d9c80
diff --git a/app-dicts/sword-VulgHetzenauer/metadata.xml b/app-dicts/sword-VulgHetzenauer/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-VulgHetzenauer/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-VulgHetzenauer/sword-VulgHetzenauer-1.0.2.ebuild b/app-dicts/sword-VulgHetzenauer/sword-VulgHetzenauer-1.0.2.ebuild
deleted file mode 100644
index e18f47fc759b..000000000000
--- a/app-dicts/sword-VulgHetzenauer/sword-VulgHetzenauer-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Vulgata Clementina, Hetzenauer editore"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgHetzenauer"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-VulgSistine/Manifest b/app-dicts/sword-VulgSistine/Manifest
deleted file mode 100644
index e32e68beab74..000000000000
--- a/app-dicts/sword-VulgSistine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VulgSistine-1.0.2.zip 1632044 BLAKE2B f11f8b11280bc872de85cdb227b9f349332719f263272f0d7b4ba724f854e292031b3d197297cafd6a82516b2d54601469e2a273eb26630c81950e9c73e847ce SHA512 b53f5a452716f39ac93de0ab0356b4177160608c37e8d5fcc4452f8212f57d76875ee69ab1447ae66c9188c4eb8cf9889147f0b76a686a703cbef12634da30e9
diff --git a/app-dicts/sword-VulgSistine/metadata.xml b/app-dicts/sword-VulgSistine/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-VulgSistine/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-VulgSistine/sword-VulgSistine-1.0.2.ebuild b/app-dicts/sword-VulgSistine/sword-VulgSistine-1.0.2.ebuild
deleted file mode 100644
index 2bfd3b9a8ba4..000000000000
--- a/app-dicts/sword-VulgSistine/sword-VulgSistine-1.0.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Vulgata Sistina"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgSistine"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Vulgate/Manifest b/app-dicts/sword-Vulgate/Manifest
deleted file mode 100644
index 03f55e9bb2d6..000000000000
--- a/app-dicts/sword-Vulgate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Vulgate-2.1.zip 1982681 BLAKE2B aca6f25bc48cdf353279b4d438502825a06621839292403a1dc95f94c6f61900dbee4807c5a10a249b0260d649e979732e000954737004760e2783923da01856 SHA512 c9fa98b179c34a2377b9f42350a6d3220667993dc75ead62c56788e6db7d5b4fdb83b48e075935f620fbffaf5141edd8f47e38ddc8635bfb8a6e9d16b6d8069d
diff --git a/app-dicts/sword-Vulgate/metadata.xml b/app-dicts/sword-Vulgate/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Vulgate/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Vulgate/sword-Vulgate-2.1.ebuild b/app-dicts/sword-Vulgate/sword-Vulgate-2.1.ebuild
deleted file mode 100644
index 2524a96e4d85..000000000000
--- a/app-dicts/sword-Vulgate/sword-Vulgate-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="Latin Vulgate"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Vulgate_HebPs/Manifest b/app-dicts/sword-Vulgate_HebPs/Manifest
deleted file mode 100644
index 203d66fd3365..000000000000
--- a/app-dicts/sword-Vulgate_HebPs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Vulgate_HebPs-1.1.zip 79573 BLAKE2B ae7b4f8a83fa632b3054024b2e10b0b167837f312389e98738f6193525f09d64445cfabc280e0c21a1f8c65d9bc331ba05954193e9426e61d73ece2319d3a523 SHA512 3b07164f867d26baac1aac311371206abfeaac17f8e680456eec6be0cf458c1172e1d31a7b2a17dceb4c44bfdad183fd2a9b46aec61488cf28f78ce0f97073de
diff --git a/app-dicts/sword-Vulgate_HebPs/metadata.xml b/app-dicts/sword-Vulgate_HebPs/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Vulgate_HebPs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Vulgate_HebPs/sword-Vulgate_HebPs-1.1.ebuild b/app-dicts/sword-Vulgate_HebPs/sword-Vulgate_HebPs-1.1.ebuild
deleted file mode 100644
index 7e0fdf21d834..000000000000
--- a/app-dicts/sword-Vulgate_HebPs/sword-Vulgate_HebPs-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Vulgate_HebPs"
-
-inherit sword-module
-
-DESCRIPTION="Latin Vulgate Psalms from Hebrew"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate_HebPs"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-WHNU/Manifest b/app-dicts/sword-WHNU/Manifest
deleted file mode 100644
index 179de1db8c7f..000000000000
--- a/app-dicts/sword-WHNU/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST WHNU-2.4.zip 975858 BLAKE2B 870b87b3250a5aa8aed4c9a26f11f78460177e1ac49c399580747c9ec459ac76cd7a51266ca68d6cfa879c5435ab393bd0414660cfaf876ae1527bed625a32d5 SHA512 46390bf6c2a9344b98cfb43f096d3d476d6fa4d40e66bc070e8cb5a5efee71e7265c8ff9c42a1eaee458e912618fc843a4b28ebb239d2f09e3ba9f51353d2ad5
diff --git a/app-dicts/sword-WHNU/metadata.xml b/app-dicts/sword-WHNU/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-WHNU/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-WHNU/sword-WHNU-2.4.ebuild b/app-dicts/sword-WHNU/sword-WHNU-2.4.ebuild
deleted file mode 100644
index 3dcb92491ede..000000000000
--- a/app-dicts/sword-WHNU/sword-WHNU-2.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Westcott-Hort with NA27/UBS4 variants (1881)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=WHNU"
-LICENSE="CC-BY-NC-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-WLC/Manifest b/app-dicts/sword-WLC/Manifest
deleted file mode 100644
index 0ca97fe4d1ad..000000000000
--- a/app-dicts/sword-WLC/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST WLC-1.9.zip 2165983 BLAKE2B 5373681d2935a3ecf750efca110b53d4764dff3bbc972f20d26ae2f31de816e90363051ffee425e79b3c63a1f73901533befe01e3292739938b8faf1d3843074 SHA512 c5c35a39b27b23684448840c2605964fa201b718e018c7c7ef26276679b06f57a77f062596d95a60d86ac4ac4f87fa8e55c65c1cd635a640aa7d79c6fbe2e725
diff --git a/app-dicts/sword-WLC/metadata.xml b/app-dicts/sword-WLC/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-WLC/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-WLC/sword-WLC-1.9.ebuild b/app-dicts/sword-WLC/sword-WLC-1.9.ebuild
deleted file mode 100644
index 72c27007fcb8..000000000000
--- a/app-dicts/sword-WLC/sword-WLC-1.9.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="Westminster Leningrad Codex"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=WLC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Webster/Manifest b/app-dicts/sword-Webster/Manifest
deleted file mode 100644
index 3e8084fd49bb..000000000000
--- a/app-dicts/sword-Webster/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Webster-1.2.zip 1481353 BLAKE2B d88881b42fa878f70a807541f2942917a1054baa0342512ccbf7e460bcf39e37e792d0f007646c2853971a660fe1c0ce0ee3420f27ee6da12f8300ea868cb89a SHA512 a02b6e192b7c82f5ab6015a3c77743b40a930af6e4dddec634a8f6b8099c8b5c6d9915ebb035adf5540bd7834e70b1168468a8259edc688e50d13d5fca9267ee
diff --git a/app-dicts/sword-Webster/metadata.xml b/app-dicts/sword-Webster/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Webster/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Webster/sword-Webster-1.2.ebuild b/app-dicts/sword-Webster/sword-Webster-1.2.ebuild
deleted file mode 100644
index b23a54e4488d..000000000000
--- a/app-dicts/sword-Webster/sword-Webster-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Webster"
-
-inherit sword-module
-
-DESCRIPTION="Webster Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Webster1806/Manifest b/app-dicts/sword-Webster1806/Manifest
deleted file mode 100644
index c2df317eaa62..000000000000
--- a/app-dicts/sword-Webster1806/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Webster1806-1.0.zip 1953871 BLAKE2B af39baefd2d1ab5e3975f52fb45afb9eff2d20fb0b5d077f0047eae5b0cc6c00176adbcb6dc6a2dde4a8a6bf09353281bfbe03d4eb600a02d25388cc22d1a1e4 SHA512 d6926297f5edd0f20141341119c2ca89ddc8025d6717f9825d1d34e6be73a7576ff05e4bd5bf84e053011faee5c2ca2fbba3d0fae8f566ff181601d2671557ab
diff --git a/app-dicts/sword-Webster1806/metadata.xml b/app-dicts/sword-Webster1806/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Webster1806/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Webster1806/sword-Webster1806-1.0.ebuild b/app-dicts/sword-Webster1806/sword-Webster1806-1.0.ebuild
deleted file mode 100644
index a6ff15876e5d..000000000000
--- a/app-dicts/sword-Webster1806/sword-Webster1806-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Webster's 1806 A Compendious Dictionary of the English Language"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1806"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Webster1913/Manifest b/app-dicts/sword-Webster1913/Manifest
deleted file mode 100644
index da40bc418264..000000000000
--- a/app-dicts/sword-Webster1913/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Webster1913-2.0.zip 19537950 BLAKE2B fa6115554235864d8ba9b05922495697073a189ee59d3337ff9871357ec147d2df2c5b40e1c0a43d2eac69775a012b166dbbd3282b27b4ff5f101bd2ebd68534 SHA512 75b74bfcc3bff01ac34edaf799957b8d9e60258f3ed8a9ea2a4e5503a73c203fbc99695e7f8fc1b5cfce87178d1052f4d1960357a113c6a829e9b720c5956cf1
diff --git a/app-dicts/sword-Webster1913/metadata.xml b/app-dicts/sword-Webster1913/metadata.xml
deleted file mode 100644
index 367a7672d8f8..000000000000
--- a/app-dicts/sword-Webster1913/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Webster's Revised Unabridged Dictionary.
-		Version published 1913 by the C. &amp; G. Merriam Co., Springfield, MA, USA
-		under the direction of Noah Porter, D.D., LL.D.
-		This electronic version was prepared by MICRA, Inc. of Plainfield, NJ, USA.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-Webster1913/sword-Webster1913-2.0.ebuild b/app-dicts/sword-Webster1913/sword-Webster1913-2.0.ebuild
deleted file mode 100644
index 2bb21b67ff56..000000000000
--- a/app-dicts/sword-Webster1913/sword-Webster1913-2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.11"
-
-inherit sword-module
-
-DESCRIPTION="Webster's English Dictionary, 1913 edition"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1913"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-WelBeiblNet/Manifest b/app-dicts/sword-WelBeiblNet/Manifest
deleted file mode 100644
index a691fcad7a36..000000000000
--- a/app-dicts/sword-WelBeiblNet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST WelBeiblNet-3.0.1.zip 2297861 BLAKE2B 8fa3dd8e467116b448dbc9bb6b968bf360bfccfd43647f6b5cb5150cc27f087cd725276d4eae2645f95cdbbde1a660ffd9b64714c223af8ffa9c6cab11c2aef1 SHA512 4edec993ab177ca0a12ecbc870b9bf16b74ef2a9679fbdb5c3adfafd9e09b8d99a237954fc500e3c20ff998c4afed380ab389cce534ec6659494b2d7fea3d393
diff --git a/app-dicts/sword-WelBeiblNet/metadata.xml b/app-dicts/sword-WelBeiblNet/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-WelBeiblNet/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-WelBeiblNet/sword-WelBeiblNet-3.0.1.ebuild b/app-dicts/sword-WelBeiblNet/sword-WelBeiblNet-3.0.1.ebuild
deleted file mode 100644
index 0f2ccec124ed..000000000000
--- a/app-dicts/sword-WelBeiblNet/sword-WelBeiblNet-3.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="beibl.net translation of the Bible into colloquial Welsh by Arfon Jones"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=WelBeiblNet"
-LICENSE="crosswire"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Wesley/Manifest b/app-dicts/sword-Wesley/Manifest
deleted file mode 100644
index 0feef0e6b22c..000000000000
--- a/app-dicts/sword-Wesley/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Wesley-1.1.zip 1895926 BLAKE2B 8d2d0c3bd41186941717dd8b8e71c092b4bd3d7f6eff1b53d663445cb065d3ead4c0bd5b74a171815062059a72b1565f6a332e20d85430df42b9204adeecf5a2 SHA512 0ed6138ab9c21c400beea6b44ef60cfb10960963760e6fa2a90c95ecd03621ce6548c8f846eb4454c5a9bf30e63684ea1e10ec36538935df8c05db69ec26b9cc
diff --git a/app-dicts/sword-Wesley/metadata.xml b/app-dicts/sword-Wesley/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Wesley/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Wesley/sword-Wesley-1.1.ebuild b/app-dicts/sword-Wesley/sword-Wesley-1.1.ebuild
deleted file mode 100644
index 32dd69753533..000000000000
--- a/app-dicts/sword-Wesley/sword-Wesley-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Wesley"
-
-inherit sword-module
-
-DESCRIPTION="John Wesley's Notes on the Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wesley"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Westminster/Manifest b/app-dicts/sword-Westminster/Manifest
deleted file mode 100644
index 87ebb233c382..000000000000
--- a/app-dicts/sword-Westminster/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Westminster-1.0.1.zip 444333 BLAKE2B e12f3f5de0666dbe4a64dede65d14c06cc03fa134fe3c47b7cda5c21f98f2bf3434c65c543a495b088ef41b4159ec02e63c70779736d643aaab0f22af4c2ef25 SHA512 8d11a793fdeccd04f75073129e5a695733d3b73c4396e54c51bdaa283f3847c295e041d81c04f4c30565206ec793e5a8f32ff1ccdd1611c419d08b32a2a58de3
diff --git a/app-dicts/sword-Westminster/metadata.xml b/app-dicts/sword-Westminster/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Westminster/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Westminster/sword-Westminster-1.0.1.ebuild b/app-dicts/sword-Westminster/sword-Westminster-1.0.1.ebuild
deleted file mode 100644
index aba560af405f..000000000000
--- a/app-dicts/sword-Westminster/sword-Westminster-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.9"
-
-inherit sword-module
-
-DESCRIPTION="Westminster Confession & Catechisms"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Westminster21/Manifest b/app-dicts/sword-Westminster21/Manifest
deleted file mode 100644
index 730d2a59e12b..000000000000
--- a/app-dicts/sword-Westminster21/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Westminster21-1.0.zip 214728 BLAKE2B 465ef32e151c6f0cd9a040175c6358c343ec117dbcc0d50ca4e47bfe3685c64cb19a108f58dcee9b5366ddd8b89d117540701ce638deec046104a01720e8bccd SHA512 63ca88120c26130a0275c724cba205d5e0905d3568df42dcc4026c632f724b950394ce93a6cc7c2288ef8a9a015ebf9e6b9102c545f9bce59884aad34635250a
diff --git a/app-dicts/sword-Westminster21/metadata.xml b/app-dicts/sword-Westminster21/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Westminster21/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Westminster21/sword-Westminster21-1.0.ebuild b/app-dicts/sword-Westminster21/sword-Westminster21-1.0.ebuild
deleted file mode 100644
index 57501dfc889a..000000000000
--- a/app-dicts/sword-Westminster21/sword-Westminster21-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="The Westminster Standards translated into twenty-first century American English"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster21"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Weymouth/Manifest b/app-dicts/sword-Weymouth/Manifest
deleted file mode 100644
index bcf93a3ed021..000000000000
--- a/app-dicts/sword-Weymouth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Weymouth-1.1.zip 419204 BLAKE2B 7061d31a81c0e3c760592145366508290f26f14ba12a2ab4b3673603c0e321f77cbf5c051db2a20d4b5552fb47836eaa6c0ca1a35cdd293660b7c0d734d39e1f SHA512 893174d721386169c26734bce4fe4454323f8b0a64405483b79f0ca0488bbf7f93781a56e829c6211cdda75537e65ab0e449ea04d9ece5f413c13c9918463014
diff --git a/app-dicts/sword-Weymouth/metadata.xml b/app-dicts/sword-Weymouth/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Weymouth/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Weymouth/sword-Weymouth-1.1.ebuild b/app-dicts/sword-Weymouth/sword-Weymouth-1.1.ebuild
deleted file mode 100644
index 37a0585c9c2e..000000000000
--- a/app-dicts/sword-Weymouth/sword-Weymouth-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Weymouth"
-
-inherit sword-module
-
-DESCRIPTION="Weymouth NT (1912)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Weymouth"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Worsley/Manifest b/app-dicts/sword-Worsley/Manifest
deleted file mode 100644
index 9f0e5b8afbe5..000000000000
--- a/app-dicts/sword-Worsley/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Worsley-1.6.zip 407194 BLAKE2B 26a2868fa67dff75cfccef91537c6c7105a62106d50b5344496676620b7f8b35c80021cebea3f08121f908dc85f6f406542640e4f1e229c595f78026deaac369 SHA512 6a88eb8a77207c14548d6ea7322f16a6f88d504e835d6cd90254562c89e539c8c0d9094f447d7db5626a5842b859db9dd5810e1cb6917982103e1e434c0821a6
diff --git a/app-dicts/sword-Worsley/metadata.xml b/app-dicts/sword-Worsley/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Worsley/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Worsley/sword-Worsley-1.6.ebuild b/app-dicts/sword-Worsley/sword-Worsley-1.6.ebuild
deleted file mode 100644
index 05aa4190cf69..000000000000
--- a/app-dicts/sword-Worsley/sword-Worsley-1.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="1770 John Worsley NT"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Worsley"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Wulfila/Manifest b/app-dicts/sword-Wulfila/Manifest
deleted file mode 100644
index 24e52b6e722a..000000000000
--- a/app-dicts/sword-Wulfila/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Wulfila-1.0.1.zip 239022 BLAKE2B a085ad5d8ddc4d2101cc582fb6f1e860bd00fe362b7db5d378c0dbcbf0e3691117e9b5737b40eeb3cf4a5662fb184ff0ccecdccfd115be775050d14d502f7901 SHA512 84ab398110546c31e8743cb99b310e35ffc26e022ce385dc54642b31838b4bd01ea586e40dcb5325cc21b408ed723ed49f0b0effab5e4c3342412bda23941326
diff --git a/app-dicts/sword-Wulfila/metadata.xml b/app-dicts/sword-Wulfila/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Wulfila/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Wulfila/sword-Wulfila-1.0.1.ebuild b/app-dicts/sword-Wulfila/sword-Wulfila-1.0.1.ebuild
deleted file mode 100644
index f8f66ad71a9e..000000000000
--- a/app-dicts/sword-Wulfila/sword-Wulfila-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Bishop Wulfila Gothic Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wulfila"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-Wycliffe/Manifest b/app-dicts/sword-Wycliffe/Manifest
deleted file mode 100644
index d0326501a434..000000000000
--- a/app-dicts/sword-Wycliffe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Wycliffe-2.4.zip 1723790 BLAKE2B de3469fb8c9377b844c2e0ae838e16fecf4ee47be3786e2bf613158de2525770b39bba14ec28cdcd57c4c2c1795ab687d099a4d92fd587f8437536468b52e7ea SHA512 0c4b51300749e2590cb110c61faa18d9cc020f1701b3685e388a97a5ce62aa104eab1c4ece25da2737427bc4bad0f161144d3f002cbf75997911c0ff62e2dedf
diff --git a/app-dicts/sword-Wycliffe/metadata.xml b/app-dicts/sword-Wycliffe/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-Wycliffe/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-Wycliffe/sword-Wycliffe-2.4.ebuild b/app-dicts/sword-Wycliffe/sword-Wycliffe-2.4.ebuild
deleted file mode 100644
index b627646818f4..000000000000
--- a/app-dicts/sword-Wycliffe/sword-Wycliffe-2.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.1"
-
-inherit sword-module
-
-DESCRIPTION="John Wycliffe Bible (c. 1395)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wycliffe"
-LICENSE="CC-BY-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-YLT/Manifest b/app-dicts/sword-YLT/Manifest
deleted file mode 100644
index a73ebd7f7971..000000000000
--- a/app-dicts/sword-YLT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST YLT-1.1.zip 1430863 BLAKE2B e2d6c04c8e83f84f2f0f89599237a958abb09b9a117852b0e92c9d685de26ff61d3416f81ed857e104712cee81d5b20676bad124778d5a8a7f0cc8f63b62032a SHA512 6ff2b321082eb9112df8978e80b68baafc63209d2d6b13432f0b221fedfac5d8c50b6f15261e41b0e3f04634cc286574efec81cae1a5ae0c116f30b8fba9b47e
diff --git a/app-dicts/sword-YLT/metadata.xml b/app-dicts/sword-YLT/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-YLT/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-YLT/sword-YLT-1.1.ebuild b/app-dicts/sword-YLT/sword-YLT-1.1.ebuild
deleted file mode 100644
index 541f2226fe8c..000000000000
--- a/app-dicts/sword-YLT/sword-YLT-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="YLT"
-
-inherit sword-module
-
-DESCRIPTION="Young's Literal Translation (1898)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=YLT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ZhEnglish/Manifest b/app-dicts/sword-ZhEnglish/Manifest
deleted file mode 100644
index 3155b97cf04f..000000000000
--- a/app-dicts/sword-ZhEnglish/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ZhEnglish-1.0.1.zip 1148611 BLAKE2B 9f43eeeafd6c83b9b516fcc9a74b05b33f5926b3aca43dc9ee5cbb82b794ba3632c237cbb95ea49df7765c48e2a10093e59e8047f356c2c93d87a02258c4a03b SHA512 dcb596976899a48c9209d3194d7389f5e97ceef1d0108b490d5e6455c16b59a7de490fbbb69da0039dbc1d64f0fdeab7664cf2d6f961d93be7fbee09b155dbba
diff --git a/app-dicts/sword-ZhEnglish/metadata.xml b/app-dicts/sword-ZhEnglish/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ZhEnglish/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ZhEnglish/sword-ZhEnglish-1.0.1.ebuild b/app-dicts/sword-ZhEnglish/sword-ZhEnglish-1.0.1.ebuild
deleted file mode 100644
index 758477be71a4..000000000000
--- a/app-dicts/sword-ZhEnglish/sword-ZhEnglish-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="CEDICT English/Chinese Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhEnglish"
-LICENSE="CEDICT"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ZhHanzi/Manifest b/app-dicts/sword-ZhHanzi/Manifest
deleted file mode 100644
index 3279e2096082..000000000000
--- a/app-dicts/sword-ZhHanzi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ZhHanzi-1.0.zip 801576 BLAKE2B 773c13c5de6a9064611b1f476e55358bbd4921bb1f8be4ae67f916cbd5dd2e53a4215e1f7031120d6378ea14784dcd4d9b71d8bc723f3736166346333e697b33 SHA512 0cd514d514fafddc70c964210a33018bb219dd1dd97b320f043105b229992f924be171b462b8b56c43c09f8681d4d37ba34c9b3d9ac452a3b012ff8c8ca7b8c9
diff --git a/app-dicts/sword-ZhHanzi/metadata.xml b/app-dicts/sword-ZhHanzi/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ZhHanzi/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ZhHanzi/sword-ZhHanzi-1.0.ebuild b/app-dicts/sword-ZhHanzi/sword-ZhHanzi-1.0.ebuild
deleted file mode 100644
index de0c8b584004..000000000000
--- a/app-dicts/sword-ZhHanzi/sword-ZhHanzi-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="CEDICT Chinese (Hanzi)/English Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhHanzi"
-LICENSE="CEDICT"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-ZhPinyin/Manifest b/app-dicts/sword-ZhPinyin/Manifest
deleted file mode 100644
index beae5880a977..000000000000
--- a/app-dicts/sword-ZhPinyin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ZhPinyin-1.0.zip 644691 BLAKE2B d970905361fbc09217af237118c14854f5b36483314aca19c954710e01ab740479caeabfa414397ded1d0c23624d8d3b0065af11efd1863f9ccab4f4d75c5a37 SHA512 0c96c831d97dd8d7b707e4124b336bb8c6f01338e75fdf4c604371e2f120ceebbb37d3fc28458f86fea74b3accba88689dfb9da6ec8982d721758adfd06c4007
diff --git a/app-dicts/sword-ZhPinyin/metadata.xml b/app-dicts/sword-ZhPinyin/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-ZhPinyin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-ZhPinyin/sword-ZhPinyin-1.0.ebuild b/app-dicts/sword-ZhPinyin/sword-ZhPinyin-1.0.ebuild
deleted file mode 100644
index 9e1c7fb8227b..000000000000
--- a/app-dicts/sword-ZhPinyin/sword-ZhPinyin-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="CEDICT Chinese (Pinyin)/English Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhPinyin"
-LICENSE="CEDICT"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-alzat/Manifest b/app-dicts/sword-alzat/Manifest
deleted file mode 100644
index 8690dc4afbe8..000000000000
--- a/app-dicts/sword-alzat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST alzat-1.0.zip 43100 BLAKE2B aafd0cdd7e31c005335e1c1c77b7fb6fec14cf2ee5d6dfcca5021d4616845c347f6c5d0eddcdd9c87d9d36f79a16af404e07ae50c77e95d2ee2ab9120a5f72fb SHA512 aef7a83aca6a65bffa87750b9f3ca13afabb1369dcdf3beeb5d70556fb9f422e75851675e31566e41751c7e92249c169fca6c53874ff295565546cde4d19606a
diff --git a/app-dicts/sword-alzat/metadata.xml b/app-dicts/sword-alzat/metadata.xml
deleted file mode 100644
index bb151d71ba9e..000000000000
--- a/app-dicts/sword-alzat/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="ar">
-		كتاب الذات للبابا شنودة لثالث 2005 - تم وضعه بهذه الصيغة بواسطة مركز الكمبيوتر بكنيسة السيدة العذراء بالزيتون (Bible@StMaryZtn.org)
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-alzat/sword-alzat-1.0.ebuild b/app-dicts/sword-alzat/sword-alzat-1.0.ebuild
deleted file mode 100644
index d9b1586fda4e..000000000000
--- a/app-dicts/sword-alzat/sword-alzat-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="الذات للبابا شنودة الثالث"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=alzat"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-br_en/Manifest b/app-dicts/sword-br_en/Manifest
deleted file mode 100644
index 683d682379e4..000000000000
--- a/app-dicts/sword-br_en/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST br_en-1.1.zip 7016 BLAKE2B 12264230697b98ed21ce8e0191a2380cc6c10db617e524405d0f64a6fbc6dbd79b05807c0c262ff57bc3c736dc67693c6d08ab66493cce99616cf045b60a383e SHA512 8c5bc58e0e4535192367302cc55a9b7208127bd52d0591f10e3493edfe51a237a69a2992e22f83d49fbbc0f2d04bf56a191d5d2481284dd95d916e5390396cc8
diff --git a/app-dicts/sword-br_en/metadata.xml b/app-dicts/sword-br_en/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-br_en/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
deleted file mode 100644
index 7f5ac278b75f..000000000000
--- a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Breton to English Glossary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-en_eu/Manifest b/app-dicts/sword-en_eu/Manifest
deleted file mode 100644
index a19b037408a6..000000000000
--- a/app-dicts/sword-en_eu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST en_eu-1.1.zip 10034 BLAKE2B a4de449ef3ff7b3e5436dea9f0e5a50545261973eb26ba03efc065c0d863b2a68a87a87e17369e85a6447209794f559488c968f7b17d38f5734b0e9c69811b00 SHA512 684297b7eb438952b2d0dc78be5d2b468da7515d304050fab3cb0023bafe32cf78a9ff9fec9d4e248e07da6f4b9ebf50a21f651f560f8224fd517efc885e4fa4
diff --git a/app-dicts/sword-en_eu/metadata.xml b/app-dicts/sword-en_eu/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-en_eu/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-en_eu/sword-en_eu-1.1.ebuild b/app-dicts/sword-en_eu/sword-en_eu-1.1.ebuild
deleted file mode 100644
index 25bcaf1b0438..000000000000
--- a/app-dicts/sword-en_eu/sword-en_eu-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="English to Basque Glossary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=en_eu"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-f35/Manifest b/app-dicts/sword-f35/Manifest
deleted file mode 100644
index 9aa47833b05d..000000000000
--- a/app-dicts/sword-f35/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST f35-1.0.1.zip 405415 BLAKE2B 1692983807c5f26904cbf35e08f07f574f667738103c60ba4360e2379a06698a14ac4cbce910567ad9588b61e7ead0bd742243763326e3895505f7e33f1adc62 SHA512 a3c686a44d645c11463ab1d52140e9493e4a93aff59132acac7c66d4957fd629e3e9b4b279d8ba6c3fa2b93642c07a4642ff7ac7517783b34ed733af42969039
diff --git a/app-dicts/sword-f35/metadata.xml b/app-dicts/sword-f35/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-f35/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-f35/sword-f35-1.0.1.ebuild b/app-dicts/sword-f35/sword-f35-1.0.1.ebuild
deleted file mode 100644
index 5d9b87b26b84..000000000000
--- a/app-dicts/sword-f35/sword-f35-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.2"
-
-inherit sword-module
-
-DESCRIPTION="Wilbur Pickering's Greek New Testament According to Family 35"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=f35"
-LICENSE="CC-BY-NC-SA-4.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-la_en/Manifest b/app-dicts/sword-la_en/Manifest
deleted file mode 100644
index d25345900b96..000000000000
--- a/app-dicts/sword-la_en/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST la_en-1.1.zip 104210 BLAKE2B f28418e4c1524466930cb4a56b3136e8f2fceb69e9d303b04cc01f7e9edd4a909bd1b190f3821ea1777cd905513edf23689a2d8bea136e52a5223a8dda195a9b SHA512 b4e3128b93d974a0ccd46dac277efcbe661675460a757cbe765a4fd239a24047f18e088cf3d3907d5162d3e2fa0317412863acb71d15aa9ed062a8560591d903
diff --git a/app-dicts/sword-la_en/metadata.xml b/app-dicts/sword-la_en/metadata.xml
deleted file mode 100644
index bc94402fe731..000000000000
--- a/app-dicts/sword-la_en/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
deleted file mode 100644
index 9fffd9b83d54..000000000000
--- a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Latin to English Glossary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-sml_BL_2008/Manifest b/app-dicts/sword-sml_BL_2008/Manifest
deleted file mode 100644
index a18e65b6740b..000000000000
--- a/app-dicts/sword-sml_BL_2008/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sml_BL_2008-1.0.1.zip 925123 BLAKE2B 2004c732396cae332024cb6589fd6de7aa5b28a377ea3a5ddcb8ac0ce03c7d13f63b00b8672894ab988bc706eaba48ab01b7d56ebf7b5d72e982ae919f32015c SHA512 d99af18fc5d1f506f8d5152b0c77d14bd0a09dd3f0258523a35ac8d395e0ff36c2c6735ca714bb5084864703cf4c5f8386d030f4d52a2e714453fafcf30c4ea6
diff --git a/app-dicts/sword-sml_BL_2008/metadata.xml b/app-dicts/sword-sml_BL_2008/metadata.xml
deleted file mode 100644
index 8946fb1b2b99..000000000000
--- a/app-dicts/sword-sml_BL_2008/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		Pudji maka sanglit ni Tuhan dakayu'-kayu', ya magpapanjari maka manglalappas, ya tubus ma pangita'u maka kawasa.  Pinarakayu' maitu Kitab Injil maka Palbahagi'an Kitab Awal-Jaman, kitab sussi bay pamasulat e' Tuhan ma kanabi-nabihan maka saga a'a kawakilan si Isa Al-Masi.  Wajib binassa maka kinahagad saga kitab itu sabab landu' ahap panga'anta pangita'u maka kasannangan maka kalappasan.  Ya tumabeya' ma nionan Kitab Awal-Jaman itu, ya na Kitab Tawrat maka Kitab Jabul.  Luwal palbahagi'anna talapay maitu, subay na tahun sinong bo' tasalin ni bahasa Sinama saga jud takapin.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-sml_BL_2008/sword-sml_BL_2008-1.0.1.ebuild b/app-dicts/sword-sml_BL_2008/sword-sml_BL_2008-1.0.1.ebuild
deleted file mode 100644
index 4294de17d7a9..000000000000
--- a/app-dicts/sword-sml_BL_2008/sword-sml_BL_2008-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.5.1a"
-
-inherit sword-module
-
-DESCRIPTION="Kitab Awal-Jaman maka Kitab Injil"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=sml_BL_2008"
-LICENSE="CC-BY-ND-3.0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-dicts/sword-vlsJoNT/Manifest b/app-dicts/sword-vlsJoNT/Manifest
deleted file mode 100644
index dc6cb949f292..000000000000
--- a/app-dicts/sword-vlsJoNT/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vlsJoNT-1.0.1.zip 419089 BLAKE2B 8b123dee9f2b07fb7800be47c03d835393879152c32e066effc6085ae69a0f90a2a29c1e7ecc9d70882eb56be144e15be695c46277cefc8e5bf1138338c6a5cc SHA512 5adbfe6d67503b7669f9ab65315e63ae4648cde484b9f9d9c4967b96aba3429a257282deeffaa16729f797468e18712e52121487e8aa35ede279e25a01f23c0c
diff --git a/app-dicts/sword-vlsJoNT/metadata.xml b/app-dicts/sword-vlsJoNT/metadata.xml
deleted file mode 100644
index d44c569977c2..000000000000
--- a/app-dicts/sword-vlsJoNT/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This New Testament was published by the *Britsch- en Buitenlandsch Bijbelgenootschap, Antwerpen* in 1890. Nicolaas De Jonge was a Dutch reformed preacher working in Flanders, and adapted the New Testament into a language closer the Flemish dialects. [More info here](http://www.biblianeerlandica.be/biografieen/de-jonge-nicolaas/)
-	</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/sword-vlsJoNT/sword-vlsJoNT-1.0.1.ebuild b/app-dicts/sword-vlsJoNT/sword-vlsJoNT-1.0.1.ebuild
deleted file mode 100644
index b390937b8dea..000000000000
--- a/app-dicts/sword-vlsJoNT/sword-vlsJoNT-1.0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.6.0"
-
-inherit sword-module
-
-DESCRIPTION="Het Nieuwe Testament by Nicolaas De Jonge"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=vlsJoNT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1d3d34d67e71..fd4cc8360f6b 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d3937eae9e55..dcb1a07fa537 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,14 +1,16 @@
 DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 9d14004d5188ec0ffe11099ae1beb431adfe159d220fc1b6f1d0be67da19b88911b66a206386beee9498bdcaa48e40a185755734cad2d60927c79bc8ddf0fa7d SHA512 c82cd8e81acf63addd137716a60191b916ee9ac9f8176661be1e8dd0f347f63f8ca8bf9d4d225141499dcbf4c20444eb6526cc3a3912a2d4136fb2bd295e2c26
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-25.3-patches-4.tar.xz 5164 BLAKE2B 30ef1e7ac6ee9a702678899cb27ea9c321eb0711d55917118ec99ea9e060e79bae179172d0a2dda5821c19902f6e0813e17ac71c198cd814c265838f96883b87 SHA512 ea487de3bb792386510c23c295441438c2fc4eae085fe9d41e5e16181fd4265c1d205b360ce977070a43343feeafac5b9392ea39414f2b170d7051f89ed58502
+DIST emacs-25.3-patches-5.tar.xz 6120 BLAKE2B dc56e5f9bc5368062260bb82123f2874c15daa2b90514db5c1e8b59ac44bfc7cdb590259905b2ffb1e38af00dcf195067d116a1cb5fa1a8eb102904f27b6e949 SHA512 21f2045d1c64151923d62c180f39b3c9eba9e65881096613219df1705f525b8eafa91e0a0dd3688b92b0acc7f41035ee319b09c191131a9e05693d1f25a71750
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3-patches-3.tar.xz 4160 BLAKE2B ae6fac12a2d2d35c31c895f1be9104b54c283cf4385d21e0ccd3825a3349d60495e441a5fa9f535d4b3d4c60da530ee036a475643cb11862f2a6e1bb44dc7deb SHA512 1edfdbbe6a97ffcdb17facc90336dd6f8d3d397bc95cf06fa170a4ca68e653226de8a5c2001d8dc3d3a0144d50421f2208c6fa3a816123ef952cb25df4aace49
-DIST emacs-26.3-patches-4.tar.xz 4520 BLAKE2B 32992d3e3e122fd91ccdde60bcb2f7483033670e4680c6bccdf1f686c444628a1ef325657eb9b50fb6abfddc24c3f59b88ce5a4c142718f33f0efb6a6eff1234 SHA512 47e604a24b950ac019644cac06c40da09b941dde5e4d42bc72f0a256333e38663c79583bda97706e565eca08ac5802b603f3db13ed7075799e7ef24aba6454a9
+DIST emacs-26.3-patches-5.tar.xz 5484 BLAKE2B dc2011b35d948d6106cfa4fd7f2ca5d4591b91e93e2417cee09a5ec5e3ac74e5284c170305e606ee45c9d31b1833ccb10c1ac224f19433a341465298c36165f0 SHA512 f0a6094d72c8879707e914e3cc3526d814216e84e9358e211a4f32e5d4c5958664ce3e3cca217629e2a3324bcb7ac2500d333b1c395f156757210f602d7818d5
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-4.tar.xz 10104 BLAKE2B c4a6651744583ed6d85a8f2f27f86999b6cea76229feb6423679f9b9da88e5ac2606fdb6933b4a5c2ada31ac760f3921721a0fd84912a81b8727c0eef84984ae SHA512 fd16fa75e2453c6d3562ff3e98cebc24960774fdc8f0e72ae838376cec090308934e11be8df98fc7a100e14125cb096f23bcb29955e7c809090105ddc51495d6
-DIST emacs-27.2-patches-5.tar.xz 10460 BLAKE2B 045d9b8af154510d5780c0e3623d6839180cf395a88df1e40f9bb168f84df636e36f02681051ecd4e66a5095a7e9004005faf4c7047253fca22b9e3d8cc61570 SHA512 137a6a4f7f2c5511d001edc4386b7a9b00901faa49c9f69978f74ead838b686fe8f076da44780987ffb5e064f8a76f23f6887dfd9b5f1dec3b35b17d594d5c33
+DIST emacs-27.2-patches-6.tar.xz 11600 BLAKE2B ed8bfb8b2c086423e7bf9f8de5ffb929aa63d8b2781361a8a9d274124a9df52ececdb38c3d4d7d0f0d0fa3a8eaea337c0078929967b073a70209ecdb2bb4cb58 SHA512 11f8af976148c957aebaa5fd2edd46b12ffe24036c09c20a61c47e65d8a2febe6480636be2a7f8f3f7c70a8da7091c2a7c254fd853bde56ec45d7db6a9ca94f5
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.2-patches-1.tar.xz 3404 BLAKE2B af0ea87f8406b3fe646bc32fea5866c1c7bdeeb5bb5ef733a361cf31f96b72b0dc6a7afb9a166f6182b7835cadd7b0b25f61a79abed241788f35a74d5937513f SHA512 02f9f574d2d06750ddf5218aaf3c725f954020bde94492264a9ad1d3294b24866f89d296b126ed26390f0597afb55daad944c31dde2bfedc6ea1ab769ea11c7d
 DIST emacs-28.2-patches-2.tar.xz 3760 BLAKE2B 73a78b4fa05aec86ed29315acdad8219957f3acae4ebca130ec17a578522443e8fe911a3165c3918eee12d6a0b8173c0d22166888ae392d8a83689494bdfe689 SHA512 841fcde4f8a0428e017b1f6fb70a2e4f9f7c5ee2ead410f48381f66815b9c2c23990b23ec06988a78aef01fbc4e624ceef05bd2eafd071d2174e998ba09a79a6
+DIST emacs-28.2-patches-3.tar.xz 5416 BLAKE2B c361fdebf375427cf25c4ac206161b5b55d8d6de88752de35491c778ba90eedf277159a8c317ccda7aaf5e000035d6e33d8e70282436d6e03fa311c4576abe03 SHA512 acae15b577af831bc94e102323836f3fa5b0d51ec1096b84063c81c58f1087b67487507c05d93ba5ddacfce0fea4f3e755906a9ec582b061b65095ee7d693eac
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-28.3-rc1.tar.xz 47896700 BLAKE2B 2d7da4a72cc1256c7b9d1157cd379a5373b6b55c01d94254d6aee25887991a8da694f3239a7f443adef0debbc300043ad4595b5934b6aa383daed10257bcbae0 SHA512 2cd4c5174a5ade6f928de3ff6aa1728fe0f18bd5b985d87b62f38aa083da14d9ae3db6372638548d33ef7bbb632823eabb051307d8fca6c78296bff3c79b2d2f
diff --git a/app-editors/emacs/emacs-25.3-r16.ebuild b/app-editors/emacs/emacs-25.3-r16.ebuild
new file mode 100644
index 000000000000..1e7a6cd64d8b
--- /dev/null
+++ b/app-editors/emacs/emacs-25.3-r16.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="25"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+
+RDEPEND="acct-group/mail
+	app-emacs/emacs-common[games?,gui(-)?]
+	net-libs/liblockfile
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		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[X] )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:3 )
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
+
+src_prepare() {
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+	touch src/stamp-h.in || die
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	# Don't trigger a floating point exception for NaNs on alpha
+	use alpha && append-flags -mieee
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3"
+			myconf+=" --without-xwidgets"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--without-compress-install \
+		--without-hesiod \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-26.3-r12.ebuild b/app-editors/emacs/emacs-26.3-r12.ebuild
deleted file mode 100644
index 29c9491118fb..000000000000
--- a/app-editors/emacs/emacs-26.3-r12.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-
-RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( acct-group/mail net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	gui? ( !aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		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[X] )
-			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.1=
-				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
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-26.3-r13.ebuild b/app-editors/emacs/emacs-26.3-r13.ebuild
new file mode 100644
index 000000000000..10482650084c
--- /dev/null
+++ b/app-editors/emacs/emacs-26.3-r13.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		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[X] )
+			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.1=
+				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
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
+
+src_prepare() {
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-27.2-r10.ebuild b/app-editors/emacs/emacs-27.2-r10.ebuild
deleted file mode 100644
index be9e4f277203..000000000000
--- a/app-editors/emacs/emacs-27.2-r10.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-27"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games 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"
-RESTRICT="test"
-
-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
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		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[X] )
-			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.1=
-				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
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.2-r11.ebuild b/app-editors/emacs/emacs-27.2-r11.ebuild
new file mode 100644
index 000000000000..bbe0dd17f23d
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r11.ebuild
@@ -0,0 +1,438 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-27"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-6.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~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"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games 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"
+RESTRICT="test"
+
+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
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		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[X] )
+			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.1=
+				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
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=" --with-dumping=unexec"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.2-r5.ebuild b/app-editors/emacs/emacs-28.2-r5.ebuild
deleted file mode 100644
index 6ffaf5fe8d0c..000000000000
--- a/app-editors/emacs/emacs-28.2-r5.ebuild
+++ /dev/null
@@ -1,517 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-28"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-	SLOT="${PV%%.*}-vcs"
-else
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	# PV can be in any of the following formats:
-	# 27.1                 released version (slot 27)
-	# 27.1_rc1             upstream release candidate (27)
-	# 27.0.9999            live ebuild (slot 27-vcs)
-	# 27.0.90              upstream prerelease snapshot (27-vcs)
-	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
-	if [[ ${PV} == *_pre* ]]; then
-		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/emacs"
-	elif [[ ${PV//[0-9]} != "." ]]; then
-		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
-	fi
-	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
-	PATCHES=("${WORKDIR}/patch")
-	SLOT="${PV%%.*}"
-	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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"
-
-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 ) )
-	jit? (
-		sys-devel/gcc:=[jit(-)]
-		sys-libs/zlib
-	)
-	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
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( media-libs/libjpeg-turbo:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:= )
-		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[X] )
-			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.1=
-				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
-				) )
-			)
-		)
-	) )"
-
-DEPEND="${RDEPEND}
-	gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-IDEPEND="app-eselect/eselect-emacs"
-
-RDEPEND+=" ${IDEPEND}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	if use jit; then
-		export NATIVE_FULL_AOT=1
-		find lisp -type f -name "*.elc" -delete || die
-
-		# These files ignore LDFLAGS. We assign the variable here, because
-		# for live ebuilds FULL_VERSION doesn't exist in global scope
-		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
-
-		# gccjit doesn't play well with ccache or distcc #801580
-		# For now, work around the problem with an explicit LIBRARY_PATH
-		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
-			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
-				| sed -n '/^libraries:/{s:^[^/]*::;p}')
-	fi
-
-	default
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Prevents e.g. tests interfering with running Emacs.
-	unset EMACS_SOCKET_NAME
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use jit; then
-		use zlib || ewarn \
-			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
-		myconf+=" --with-zlib"
-	else
-		myconf+=" $(use_with zlib)"
-	fi
-
-	if ! use gui; then
-		einfo "Configuring to build without window system support"
-		myconf+=" --without-x --without-ns"
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --with-x --without-ns"
-		myconf+=" --without-gconf"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
-				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		! use gtk && use xwidgets && ewarn \
-			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	fi
-
-	if tc-is-cross-compiler; then
-		# Configure a CBUILD directory when cross-compiling to make tools
-		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
-		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
-		popd >/dev/null || die
-		# Don't try to execute the binary for dumping during the build
-		myconf+=" --with-dumping=none"
-	elif use m68k; then
-		# Workaround for https://debbugs.gnu.org/44531
-		myconf+=" --with-dumping=unexec"
-	else
-		myconf+=" --with-dumping=pdumper"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		--with-pdumper \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with jit native-compilation) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		${myconf}
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# Build native tools for compiling lisp etc.
-		emake -C "${S}-build" src
-		emake lib	   # Cross-compile dependencies first for timestamps
-		# Save native build tools in the cross-directory
-		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
-		# Specify the native Emacs to compile lisp
-		emake -C lisp all EMACS="${S}-build/src/emacs"
-	fi
-
-	emake
-}
-
-src_test() {
-	# List .el test files with a comment above listing the exact
-	# subtests which caused failure. Elements should begin with a %.
-	# e.g. %lisp/gnus/mml-sec-tests.el.
-	local exclude_tests=(
-		# Reason: not yet known
-		# mml-secure-en-decrypt-{1,2,3,4}
-		# mml-secure-find-usable-keys-{1,2}
-		# mml-secure-key-checks
-		# mml-secure-select-preferred-keys-4
-		# mml-secure-sign-verify-1
-		%lisp/gnus/mml-sec-tests.el
-
-		# Reason: race condition
-		# Looks like it should be fixed in 29.x at least:
-		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
-		# files-tests-file-name-non-special-file-in-directory-p
-		%lisp/files-tests.el
-
-		# Reason: permission denied on /nonexistent
-		# (vc-*-bzr only fails if breezy is installed, as they
-		# try to access cache dirs under /nonexistent)
-		#
-		# rmail-undigest-test-multipart-mixed-digest
-		# rmail-undigest-test-rfc1153-less-strict-digest
-		# rmail-undigest-test-rfc1153-sloppy-digest
-		# rmail-undigest-test-rfc934-digest
-		# vc-test-bzr02-state
-		# vc-test-bzr05-rename-file
-		# vc-test-bzr06-version-diff
-		# vc-bzr-test-bug9781
-		%lisp/mail/undigest-tests.el
-		%lisp/vc/vc-tests.el
-		%lisp/vc/vc-bzr-tests.el
-
-		# Reason: fails if bubblewrap (bwrap) is installed
-		# "bwrap: setting up uid map: Permission denied"
-		#
-		# bytecomp-tests--dest-mountpoint
-		%lisp/emacs-lisp/bytecomp-tests.el
-	)
-
-	# See test/README for possible options
-	emake \
-		EMACS_TEST_VERBOSE=1 \
-		EXCLUDE_TESTS="${exclude_tests[*]}" \
-		TEST_BACKTRACE_LINE_LENGTH=nil \
-		check
-}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# movemail must be setgid mail
-	if ! use mailutils; then
-		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
-	fi
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-	rm -rf "${ED}"/usr/share/{applications,icons} || die
-	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
-	rm -rf "${ED}"/var || die
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use gui && use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	if use gui; then
-		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-			machine would satisfy basic Emacs requirements under X11.
-			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-			for how to enable anti-aliased fonts."
-		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
-			symlink it into /Applications by yourself."
-	fi
-	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
-		a portable dump file due to being cross-compiled.
-		To create this file at run time, execute the following command:
-		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
-		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-28.2-r6.ebuild b/app-editors/emacs/emacs-28.2-r6.ebuild
new file mode 100644
index 000000000000..31ef2328e4a8
--- /dev/null
+++ b/app-editors/emacs/emacs-28.2-r6.ebuild
@@ -0,0 +1,517 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-28"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~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"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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"
+
+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 ) )
+	jit? (
+		sys-devel/gcc:=[jit(-)]
+		sys-libs/zlib
+	)
+	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
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:= )
+		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[X] )
+			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.1=
+				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
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Prevents e.g. tests interfering with running Emacs.
+	unset EMACS_SOCKET_NAME
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use jit; then
+		use zlib || ewarn \
+			"USE flag \"jit\" overrides \"-zlib\"; enabling zlib support."
+		myconf+=" --with-zlib"
+	else
+		myconf+=" $(use_with zlib)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=" --with-dumping=unexec"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with jit native-compilation) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_test() {
+	# List .el test files with a comment above listing the exact
+	# subtests which caused failure. Elements should begin with a %.
+	# e.g. %lisp/gnus/mml-sec-tests.el.
+	local exclude_tests=(
+		# Reason: not yet known
+		# mml-secure-en-decrypt-{1,2,3,4}
+		# mml-secure-find-usable-keys-{1,2}
+		# mml-secure-key-checks
+		# mml-secure-select-preferred-keys-4
+		# mml-secure-sign-verify-1
+		%lisp/gnus/mml-sec-tests.el
+
+		# Reason: race condition
+		# Looks like it should be fixed in 29.x at least:
+		# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706
+		# files-tests-file-name-non-special-file-in-directory-p
+		%lisp/files-tests.el
+
+		# Reason: permission denied on /nonexistent
+		# (vc-*-bzr only fails if breezy is installed, as they
+		# try to access cache dirs under /nonexistent)
+		#
+		# rmail-undigest-test-multipart-mixed-digest
+		# rmail-undigest-test-rfc1153-less-strict-digest
+		# rmail-undigest-test-rfc1153-sloppy-digest
+		# rmail-undigest-test-rfc934-digest
+		# vc-test-bzr02-state
+		# vc-test-bzr05-rename-file
+		# vc-test-bzr06-version-diff
+		# vc-bzr-test-bug9781
+		%lisp/mail/undigest-tests.el
+		%lisp/vc/vc-tests.el
+		%lisp/vc/vc-bzr-tests.el
+
+		# Reason: fails if bubblewrap (bwrap) is installed
+		# "bwrap: setting up uid map: Permission denied"
+		#
+		# bytecomp-tests--dest-mountpoint
+		%lisp/emacs-lisp/bytecomp-tests.el
+	)
+
+	# See test/README for possible options
+	emake \
+		EMACS_TEST_VERBOSE=1 \
+		EXCLUDE_TESTS="${exclude_tests[*]}" \
+		TEST_BACKTRACE_LINE_LENGTH=nil \
+		check
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-28.3_rc1.ebuild
index 2538b120f522..0a3be1463dbd 100644
--- a/app-editors/emacs/emacs-28.3_rc1.ebuild
+++ b/app-editors/emacs/emacs-28.3_rc1.ebuild
@@ -375,8 +375,17 @@ src_test() {
 		# bytecomp-tests--dest-mountpoint
 		%lisp/emacs-lisp/bytecomp-tests.el
 
-		# Reason: inconsistent years in files
+		# Reason: inconsistent years in files?
+		# test-correct-notice
+		# test-end-chop
 		%lisp/emacs-lisp/copyright-tests.el
+
+		# The following tests fail with USE=jit #874681
+		# ert-test-record-backtrace
+		# loadhist-tests-file-dependents
+		# loadhist-tests-file-provides
+		%lisp/emacs-lisp/ert-tests.el
+		%lisp/loadhist-tests.el
 	)
 
 	# See test/README for possible options
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index cc371e9489e1..7834a67b168c 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,3 +1,4 @@
 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
+DIST vim-9.0.1363.tar.gz 16974190 BLAKE2B 456114cd7e74836998b51e9272e9c9a12952146f42740b3df66e36ee8e47c8c0538341d9ac9c877c93e0b356fd9ca46a2016e9386d53e3cbfd51d0e2b113bc5a SHA512 2e79e104d9816438c14f94d0e858766129eb3f706b3a89a9761331d32b46b3f83eeadb2ce0d2ec14392a69122ab8761e57218c0e5731a4453d2b91f53a70c4c8
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
diff --git a/app-editors/gvim/gvim-9.0.1157.ebuild b/app-editors/gvim/gvim-9.0.1157.ebuild
index d88875cc34d8..708d13e40470 100644
--- a/app-editors/gvim/gvim-9.0.1157.ebuild
+++ b/app-editors/gvim/gvim-9.0.1157.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/gvim/gvim-9.0.1363.ebuild b/app-editors/gvim/gvim-9.0.1363.ebuild
new file mode 100644
index 000000000000..cba104363a07
--- /dev/null
+++ b/app-editors/gvim/gvim-9.0.1363.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/vim
+
+VIM_VERSION="9.0"
+VIM_PATCHES_VERSION="9.0.1000"
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	aqua? ( !motif )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		motif? ( >=x11-libs/motif-2.3:0 )
+		!motif? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+	)
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+if [[ ${PV} != 9999* ]]; then
+	# Gentoo patches to fix runtime issues, cross-compile errors, etc
+	PATCHES=(
+		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+	)
+fi
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+}
+
+src_configure() {
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	local myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable crypt libsodium)
+		$(use_enable cscope)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp)
+		$(use_with python python3-command "${PYTHON}")
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	if use lua; then
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#874690)
+		use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
+		myconf+=(
+			--enable-luainterp
+			$(use_with lua_single_target_luajit luajit)
+			--with-lua-prefix="${EPREFIX}/usr"
+		)
+	fi
+
+	# Default is gtk unless aqua or motif are enabled
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	else
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	ebegin "Calling eselect vi update"
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 1442a79d5704..696505e59483 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,2 +1 @@
 DIST okteta-0.26.10.tar.xz 1066052 BLAKE2B 938dfbfb40bc603c64d80085386873868bd1aa16040016f72e77c63a1c6eab5d46363b227974a10e34ab514bbcca25fef39a193ea635439ad97a42178326240e SHA512 746a838cf2fce769fd3660189f070c2a2105f2b2eab7c231dd6be42f2e71518afaef2c77a9d9906847ef1febb46fce66079d485459f6c22545e72feca7f747ea
-DIST okteta-0.26.9.tar.xz 990484 BLAKE2B 97430ed8a5c8dda422dfd43a91c04fe778581caf475c74b324a26d772777030d73ed799dafa6662b225258ae76c1c37bd38c7d3c97d89d28928106d10f84308a SHA512 cc98f7923a26de9548944ebc207284879607707f41065c847707ac5876c04d31926bb4edf82062cd4d6ade2df64d7a2363d8dfa711524574514ca0dd260b4a9f
diff --git a/app-editors/okteta/okteta-0.26.9.ebuild b/app-editors/okteta/okteta-0.26.9.ebuild
deleted file mode 100644
index 486db94692b3..000000000000
--- a/app-editors/okteta/okteta-0.26.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Hex editor by KDE"
-HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-IUSE="crypt"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DOMIT_EXAMPLES=ON
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-
-	ecm_src_test
-}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index cc371e9489e1..7834a67b168c 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,3 +1,4 @@
 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
+DIST vim-9.0.1363.tar.gz 16974190 BLAKE2B 456114cd7e74836998b51e9272e9c9a12952146f42740b3df66e36ee8e47c8c0538341d9ac9c877c93e0b356fd9ca46a2016e9386d53e3cbfd51d0e2b113bc5a SHA512 2e79e104d9816438c14f94d0e858766129eb3f706b3a89a9761331d32b46b3f83eeadb2ce0d2ec14392a69122ab8761e57218c0e5731a4453d2b91f53a70c4c8
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
diff --git a/app-editors/vim-core/vim-core-9.0.1157.ebuild b/app-editors/vim-core/vim-core-9.0.1157.ebuild
index e1f6666aafbb..f0e509e7c901 100644
--- a/app-editors/vim-core/vim-core-9.0.1157.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.1157.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}/vim-${PV}"
 
diff --git a/app-editors/vim-core/vim-core-9.0.1363.ebuild b/app-editors/vim-core/vim-core-9.0.1363.ebuild
new file mode 100644
index 000000000000..64e63ae0b84e
--- /dev/null
+++ b/app-editors/vim-core/vim-core-9.0.1363.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="9.0"
+VIM_PATCHES_VERSION="9.0.1000"
+inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+S="${WORKDIR}/vim-${PV}"
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+# ncurses is only needed by ./configure, so no subslot operator required
+DEPEND=">=sys-libs/ncurses-5.2-r2:0"
+BDEPEND="sys-devel/autoconf"
+
+if [[ ${PV} != 9999* ]]; then
+	# Gentoo patches to fix runtime issues, cross-compile errors, etc
+	PATCHES=(
+		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+	)
+fi
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+}
+
+src_prepare() {
+	default
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See bug #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+		echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug #18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+}
+
+src_configure() {
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	local myconf=(
+		--with-modified-by=Gentoo-${PVR}
+		--enable-gui=no
+		--without-x
+		--disable-darwin
+		--disable-perlinterp
+		--disable-pythoninterp
+		--disable-rubyinterp
+		--disable-gpm
+		--disable-selinux
+		$(use_enable nls)
+		$(use_enable acl)
+	)
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r6 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index cc371e9489e1..7834a67b168c 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,3 +1,4 @@
 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
+DIST vim-9.0.1363.tar.gz 16974190 BLAKE2B 456114cd7e74836998b51e9272e9c9a12952146f42740b3df66e36ee8e47c8c0538341d9ac9c877c93e0b356fd9ca46a2016e9386d53e3cbfd51d0e2b113bc5a SHA512 2e79e104d9816438c14f94d0e858766129eb3f706b3a89a9761331d32b46b3f83eeadb2ce0d2ec14392a69122ab8761e57218c0e5731a4453d2b91f53a70c4c8
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
diff --git a/app-editors/vim/vim-9.0.1157.ebuild b/app-editors/vim/vim-9.0.1157.ebuild
index 8cf2a8cd69cc..ebd71300ee4c 100644
--- a/app-editors/vim/vim-9.0.1157.ebuild
+++ b/app-editors/vim/vim-9.0.1157.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vim/vim-9.0.1363.ebuild b/app-editors/vim/vim-9.0.1363.ebuild
new file mode 100644
index 000000000000..40a78fc412a4
--- /dev/null
+++ b/app-editors/vim/vim-9.0.1363.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="9.0"
+VIM_PATCHES_VERSION="9.0.1000"
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? ( ${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	~app-editors/vim-core-${PV}
+	!<app-editors/vim-core-8.2.4328-r1
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+if [[ ${PV} != 9999* ]]; then
+	# Gentoo patches to fix runtime issues, cross-compile errors, etc
+	PATCHES=(
+		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+	)
+fi
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+		echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+}
+
+src_configure() {
+
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug #57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug #24447). The hvc
+	# things are for ppc64, see bug #86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	local myconf=()
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable crypt libsodium)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python python3interp)
+			$(use_with python python3-command "${PYTHON}")
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		if use lua; then
+			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+			# deprecated (in 5.1) luaL_openlib API (#874690)
+			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
+			myconf+=(
+				--enable-luainterp
+				$(use_with lua_single_target_luajit luajit)
+				--with-lua-prefix="${EPREFIX}/usr"
+			)
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Arch and opensuse seem to do this and at this point, I'm willing
+	# to try anything to avoid random test hangs!
+	export TERM=xterm
+
+	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+	# for more information on test variables we can use.
+	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+	#
+	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+	# - Test_exrc
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	# - Test_spelldump_bang
+	# Hangs.
+	# - Test_fuzzy_completion_env
+	# Too sensitive to leaked environment variables.
+	# - Test_term_mouse_multiple_clicks_to_select_mode
+	# Hangs.
+	# - Test_spelldump
+	# Hangs.
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug #187449)
+eselect_vi_update() {
+	ebegin "Calling eselect vi update"
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 47d29c068759..f2ca0d1285a3 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/apheleia/Manifest b/app-emacs/apheleia/Manifest
index bc7523a315e3..3862f3a76fa7 100644
--- a/app-emacs/apheleia/Manifest
+++ b/app-emacs/apheleia/Manifest
@@ -1,2 +1,3 @@
 DIST apheleia-3.0.tar.gz 36988 BLAKE2B 49e9231e1cddd73ff353512ac29e6b1491bc2cad0985a12677743acb1514b827c8462e6b40912367472adf9d0be12150541162d3106e8e510650c3d70b0bf598 SHA512 19304feda4d3570e68184639a3969f2102765836324db9e1de958e63cf49614a62672df83c21420df92671217ee05630e0c0e0d57cd5ff75eba50a080f0dfde9
 DIST apheleia-3.1.tar.gz 42110 BLAKE2B 2731a0d5a37ce43f422d3cc94d1daef9fdc3147abd09c3878f28caae21e4e34320af2d6b1c929c9824de36bba3dadc40325c1fcc40d095b9e5bbc87dc0db9018 SHA512 1e6159c35016526f1af3cf1c14c6a41ec9f155948a107c858049056dc073327ffa84feeb669982ce0b9ec1c50312e9f1cf3bf7bfdd2f1cc4c7318aeff86e86f4
+DIST apheleia-3.2.tar.gz 44587 BLAKE2B b09764cedfe03d4b6086dba0cca7262253e2e03c401c237f82fbc773eeddd3e121471a35277f321175405c0cdedae9417240b80b5690b4a55b29e0067b312e14 SHA512 b351ef48f914500d04de20badb56a09657493702d95dbd5a5bbeec847cb79ee2977e5fdb8a26e25765b4308d2cee4b95cb2601da8022cda4b32adc64a660453c
diff --git a/app-emacs/apheleia/apheleia-3.2.ebuild b/app-emacs/apheleia/apheleia-3.2.ebuild
new file mode 100644
index 000000000000..6876690f67dd
--- /dev/null
+++ b/app-emacs/apheleia/apheleia-3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="Reformat GNU Emacs buffers stably without moving point"
+HOMEPAGE="https://github.com/radian-software/apheleia/"
+SRC_URI="https://github.com/radian-software/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md CHANGELOG.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index b28c0b65bc0f..c4e9670ac7d0 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,2 +1,3 @@
 DIST ebuild-mode-1.60.tar.xz 36996 BLAKE2B a566c9f602ec6ac4126a4a13610e515faf2a02b8ca89f417a037a28f4b9ea633518d589d78f6deb54084be34cdc30c2a1896546b2f86c1166cedd47289edcfd8 SHA512 b04b37b7a376dc48a7f80ec0e60bf36a8b7ea92edcbdd45fbd002e80e8ea29111905a726177a869d607adffe78094efcdc94b1aad32afe1444a09b4e714dcecd
 DIST ebuild-mode-1.61.tar.xz 38632 BLAKE2B f13f251918cf13533611c4d98a9aeceff10e9253c207a10c047c59952d6c8e50cdddb7c3ff65ed7b9565bd09fb45203c9cb57a277165b9cc7bbb47c5d8978a59 SHA512 a7087894299c3882ff0993a1a33cd192ebec078e7cea2f8964610d758a439350dcf36fe43aa43a42b89446d36b62a9b80bfce531e701b0183f3d69e56528ab62
+DIST ebuild-mode-1.62.tar.xz 39080 BLAKE2B 91bb206f7ca3fecebc80d946d5840ce6e02610171d6179d360b188e270226e4f1dbe4ceddbc1e41f8e627c787b28454a20720d563bbabcffb3a99b7b10a1251d SHA512 9e7caafb45a7538dd66221d2a5dd9fef764c72f6f42db1ad1615e4017b7d4db14dcde09edfa0e8777a528af918e219521072040215d05a9c8a5cdc57ca395bd8
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.62.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.62.ebuild
new file mode 100644
index 000000000000..7c4ed2c5c19a
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.62.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp optfeature
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.54.el"
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	optfeature "ebuild commands support" sys-apps/portage
+	optfeature "additional development tools" dev-util/pkgdev
+	optfeature "ebuild QA utilities" dev-util/pkgcheck
+	optfeature "generating HTML from GLEPs" dev-python/docutils-glep
+}
diff --git a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
index dc6a90317b97..efe3533b8b1b 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-COMMIT=1746e7009000b7635c0ea6f1559018143aa61642
+[[ ${PV} == *_p20220321 ]] && COMMIT=1746e7009000b7635c0ea6f1559018143aa61642
 
 DISTUTILS_SINGLE_IMPL=ON
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 NEED_EMACS=24.4
 
@@ -16,7 +16,7 @@ inherit distutils-r1 elisp
 DESCRIPTION="Emacs Python Development Environment"
 HOMEPAGE="https://github.com/jorgenschaefer/elpy/"
 SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
-			-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
@@ -44,11 +44,12 @@ BDEPEND="
 	)
 "
 
-DOCS=( CONTRIBUTING.rst README.rst )
 PATCHES=(
 	"${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
 	"${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
 )
+
+DOCS=( CONTRIBUTING.rst README.rst )
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_sphinx docs --no-autodoc
diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
index be51e73e3a83..df58b81f475a 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb
+[[ ${PV} == *_p20220627 ]] && COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb
 
 DISTUTILS_SINGLE_IMPL=ON
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 NEED_EMACS=24.4
 
@@ -16,7 +16,7 @@ inherit distutils-r1 elisp
 DESCRIPTION="Emacs Python Development Environment"
 HOMEPAGE="https://github.com/jorgenschaefer/elpy/"
 SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
-			-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
@@ -44,11 +44,12 @@ BDEPEND="
 	)
 "
 
-DOCS=( CONTRIBUTING.rst README.rst )
 PATCHES=(
 	"${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
 	"${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
 )
+
+DOCS=( CONTRIBUTING.rst README.rst )
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_sphinx docs --no-autodoc
diff --git a/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild
index a66a15d33fe2..e41358fe8e8a 100644
--- a/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild
+++ b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 
 COMMIT=388c8f753cfb99b4f82acbdff26bbe27189d2299
 NEED_EMACS=25
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit elisp readme.gentoo-r1 python-single-r1
 
diff --git a/app-emacs/geiser-chez/Manifest b/app-emacs/geiser-chez/Manifest
index 13aabdb1033a..67cc79b1f8e7 100644
--- a/app-emacs/geiser-chez/Manifest
+++ b/app-emacs/geiser-chez/Manifest
@@ -1 +1,2 @@
 DIST geiser-chez-0.17.tar.gz 6664 BLAKE2B d4f72de512e9d443a1ea2dc0cf6cf03f59980097ff26dd51df7a618c651c5beef142c42b1dea9bb56f94fe4a97b370c6844231eea8968618f6d0dbff499c601d SHA512 bfb1e77a3a0be3750e0e30c421a2b34179edbdb3585fe318c3f6a5a14d7220b3933c63cb970e80af4e14f8d220b620915192d7a34759cc91dfed45878d63ed6e
+DIST geiser-chez-0.18.tar.bz2 27377 BLAKE2B 06fe52715ace8a8c3c6d9d4a8f0e3991249c675c24bdcd1163906559f0e89d70378aa52ab9ecceadb550d4b7c4f0667caefe59b71fed67323ffffe40a9f8b999 SHA512 c7655ee83ecb86dd812a8cc028a8585e4d3f325a1f80457f7b388c8e81e56a12f8edad146997955b8cea05120db2e95b591fca857c059ba001af9eca3b1feb52
diff --git a/app-emacs/geiser-chez/geiser-chez-0.18.ebuild b/app-emacs/geiser-chez/geiser-chez-0.18.ebuild
new file mode 100644
index 000000000000..ce657cd3c425
--- /dev/null
+++ b/app-emacs/geiser-chez/geiser-chez-0.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Chez Scheme's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/chez/"
+SRC_URI="https://gitlab.com/emacs-geiser/chez/-/archive/${PV}/chez-${PV}.tar.bz2
+	-> ${P}.tar.bz2"
+S="${WORKDIR}"/chez-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-emacs/geiser"
+RDEPEND="
+	${BDEPEND}
+	dev-scheme/chez
+"
+
+DOCS=( readme.org )
+PATCHES=(
+	"${FILESDIR}"/${PN}-chez-scheme-binary.patch
+	"${FILESDIR}"/${PN}-chez-scheme-src-dir.patch
+)
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r src
+}
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 040c93ee4143..d456c4fe7bdf 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,2 +1,2 @@
-DIST nxml-gentoo-schemas-20220730.tar.xz 8856 BLAKE2B 7c08bd09242a30998d6dd535b5143bb920aebaaf209f9acbac734fec258d08711945d58322912f455ef251d59df7f6bad8bec8a758065d67c63cd9dc926950f6 SHA512 91c2183acb3d435e5deca67cb0e9c14fb0af1795a490c8f35076442dcf7f49bff419e3f74d3a34f5790faafd68c643e152ff292c0e994e6ec8f34e4f74efa3fd
 DIST nxml-gentoo-schemas-20220916.tar.xz 8884 BLAKE2B c10a5d19268ebf28df6d3dd025d83a8c4e6d6c6bafd553ed1a82d1eb3ffc1afc1ce6bc148c0cd93e11d694e59f48a4bcd53990f842533573f7b37b29ff487f79 SHA512 f2e811945d66828e84411fe84d66399ab6b383456d6d8fd611454fe1c91203c4c29766178e2d52158ab5908a2e197109fb322f7cc5324c1fcb40dfa68757cac6
+DIST nxml-gentoo-schemas-20230227.tar.xz 8812 BLAKE2B 517857a3cd3306daf2570019376eee315abab2f2734283dbfeaf72148471d08e8d2cfbe92b5ad19d3b67104c26da5d02aa2a01ca23b97230aa93d3ab45ec7ec6 SHA512 a92bba645e6122968cdcc0eada9a1a3e5d80f1cb560e95fddcd1cfe60b46699fdf16bad85b86e2d4111d5a10be5124f0d6f8a104038cfa13fd4fff2494f8235b
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild
deleted file mode 100644
index f48ab69514c9..000000000000
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220730.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20230227.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20230227.ebuild
new file mode 100644
index 000000000000..94311b25501f
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20230227.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/pymacs/pymacs-0.26-r3.ebuild b/app-emacs/pymacs/pymacs-0.26-r3.ebuild
index 648ad8f83a57..b17150d95bb4 100644
--- a/app-emacs/pymacs/pymacs-0.26-r3.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r3.ebuild
@@ -3,26 +3,29 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+# Can not use "DISTUTILS_USE_PEP517" because we need "DISTUTILS_IN_SOURCE_BUILD".
 DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit elisp distutils-r1
 
 DESCRIPTION="A tool that allows both-side communication between Python and Emacs Lisp"
 HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
-SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${P^}
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
-BDEPEND="doc? (
+BDEPEND="
+	doc? (
 		>=dev-python/docutils-0.7
 		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${P^}"
+	)
+"
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -35,6 +38,7 @@ python_configure() {
 # called once
 python_compile_all() {
 	elisp_src_compile
+
 	if use doc; then
 		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
 	fi
@@ -42,7 +46,10 @@ python_compile_all() {
 
 python_install_all() {
 	elisp_src_install
+
 	distutils-r1_python_install_all
+
 	dodoc pymacs.rst
+
 	use doc && dodoc pymacs.pdf
 }
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index c9caaed1f5a6..cae6af505c11 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -1,3 +1,4 @@
 DIST racket-mode-0_p20220830.tar.gz 308654 BLAKE2B 85f82181fe994c48369c27ae762d1a0c336b155bc28ee8a4a5a52853e57d23f58c47e34e76b4fb103f9f5115bd856d635dac63f0b1955f7baa24e850e7ea7404 SHA512 6b94b839d9f25d4d07fd73e0a291862014d70501e9db2f154d37ef88f449140543344d4ee0072be0f7bf1c8994d82cf2794d512fd30216336ece2be31db4dc5c
 DIST racket-mode-1_p20221122.tar.gz 322401 BLAKE2B 8ae447616485d7e9deafe50044d0b0cf73ab93a628b2a536ba67604f7ee9ac7b13beb844c2b25de86c2da4d0f13ad1c92f8fb1be96236cbee7e8efe7607da94a SHA512 e4870cb00e1137cbacedda986ccc61f01a8e86c65d1a87b895a268460583f8671c256f07b2fbd1ede36dcf0d0c2770da00f39692a43b5ccba02f21aafe9a1602
 DIST racket-mode-1_p20221216.tar.gz 322994 BLAKE2B 6a221162f27621dfece9679ab6dfcf4930f55bba366421fbda029a7c808ed919051a4a2728892c75cacd87179c80043b6427ac83b4adfd9371342a4c70a037e0 SHA512 dcb06ea327fac75831ad037768f74b446fa0286f5c90ffcf5d7e279780a64b8e1beaf34c4e220ed8c2ef4ea174998c9502e7188ae365a07762c6bee3566c1e64
+DIST racket-mode-1_p20230209.tar.gz 323308 BLAKE2B 61f58a374c30e99acb718364c76a150e4c845b671e9a2aca8e5af41acab2189d8c819dd4c4039bbf8f2197fcfd1037d89a76bcdd8d4816871ecb4d417d857104 SHA512 d52aef3b5a938268f8d00fadafcca8ea1052042b90eee049b302bb853d7b73191fc9c3b99577559c78e285acf08b4786c367330207e9071094dc703881fc51d7
diff --git a/app-emacs/racket-mode/racket-mode-1_p20230209.ebuild b/app-emacs/racket-mode/racket-mode-1_p20230209.ebuild
new file mode 100644
index 000000000000..d26773fed9f3
--- /dev/null
+++ b/app-emacs/racket-mode/racket-mode-1_p20230209.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == *_p20230209 ]] && COMMIT=947d9806ee27ef241643f978c7901fd1f9e10c98
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
+HOMEPAGE="https://www.racket-mode.com/
+	https://github.com/greghendershott/racket-mode/"
+SRC_URI="https://github.com/greghendershott/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-scheme/racket:=[-minimal]"
+BDEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-rkt-source-dir.patch )
+
+DOCS=( CONTRIBUTING.org README.org THANKS.org )
+
+ELISP_TEXINFO="doc/racket-mode.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i "${S}"/racket-util.el || die
+}
+
+src_compile() {
+	elisp_src_compile
+
+	# Equivalent to compiling from Emacs with "racket-mode-start-faster",
+	# because this is installed globally we have to compile it now.
+	ebegin "Compiling Racket source files"
+	find "${S}"/racket -type f -name "*.rkt" -exec raco make -v {} +
+	eend $? "failed to compile Racket source files" || die
+}
+
+src_test() {
+	# Set "PLTUSERHOME" to a safe temp directory to prevent writing to ~.
+	PLTUSERHOME="${T}"/racket-mode/test-racket emake test-racket
+}
+
+src_install() {
+	elisp_src_install
+
+	# Install Racket files to "${SITEETC}".
+	insinto "${SITEETC}/${PN}"
+	doins -r racket
+}
diff --git a/app-emacs/treemacs/treemacs-2.10-r2.ebuild b/app-emacs/treemacs/treemacs-2.10-r2.ebuild
index 21707f71d5e4..de552c5b30b2 100644
--- a/app-emacs/treemacs/treemacs-2.10-r2.ebuild
+++ b/app-emacs/treemacs/treemacs-2.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 NEED_EMACS=26.1
 DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit elisp distutils-r1
 
@@ -34,14 +34,14 @@ BDEPEND="
 	test? ( app-emacs/buttercup )
 "
 
-DOCS=( Changelog.org Extensions.org README.org screenshots )
+BYTECOMPFLAGS="-L . -L src/elisp"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.9.5-tests.patch
 	"${FILESDIR}"/${PN}-async-scripts.patch
 	"${FILESDIR}"/${PN}-icons-icon-directory.patch
 )
 
-BYTECOMPFLAGS="-L . -L src/elisp"
+DOCS=( Changelog.org Extensions.org README.org screenshots )
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
@@ -58,6 +58,7 @@ python_compile() {
 
 src_compile() {
 	distutils-r1_src_compile
+
 	elisp-compile src/elisp/*.el
 }
 
diff --git a/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild b/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild
index 847fece21ce8..1c2b01c56dc4 100644
--- a/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild
+++ b/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 NEED_EMACS=26.1
 DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit elisp distutils-r1
 
@@ -34,14 +34,14 @@ BDEPEND="
 	test? ( app-emacs/buttercup )
 "
 
-DOCS=( Changelog.org Extensions.org README.org screenshots )
+BYTECOMPFLAGS="-L . -L src/elisp"
 PATCHES=(
 	"${FILESDIR}"/${PN}-async-scripts.patch
 	"${FILESDIR}"/${PN}-icons-icon-directory.patch
 	"${FILESDIR}"/${P}-tests.patch
 )
 
-BYTECOMPFLAGS="-L . -L src/elisp"
+DOCS=( Changelog.org Extensions.org README.org screenshots )
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
@@ -58,6 +58,7 @@ python_compile() {
 
 src_compile() {
 	distutils-r1_src_compile
+
 	elisp-compile src/elisp/*.el
 }
 
diff --git a/app-emacs/treemacs/treemacs-3.0-r1.ebuild b/app-emacs/treemacs/treemacs-3.0-r1.ebuild
index 5b225323539c..2a86b46185ac 100644
--- a/app-emacs/treemacs/treemacs-3.0-r1.ebuild
+++ b/app-emacs/treemacs/treemacs-3.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 NEED_EMACS=26.1
 DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit elisp distutils-r1
 
@@ -34,7 +34,7 @@ BDEPEND="
 	test? ( app-emacs/buttercup )
 "
 
-DOCS=( Changelog.org Extensions.org README.org screenshots )
+BYTECOMPFLAGS="-L . -L src/elisp"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.9.5-tests.patch
 	"${FILESDIR}"/${PN}-async-scripts.patch
@@ -42,7 +42,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-tests.patch
 )
 
-BYTECOMPFLAGS="-L . -L src/elisp"
+DOCS=( Changelog.org Extensions.org README.org screenshots )
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
@@ -59,6 +59,7 @@ python_compile() {
 
 src_compile() {
 	distutils-r1_src_compile
+
 	elisp-compile src/elisp/*.el
 }
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e35f70529584..caf3c75485eb 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.3.2-r1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..1e6e015e81da
--- /dev/null
+++ b/app-emulation/genymotion-bin/genymotion-bin-3.3.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 desktop pax-utils
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+BIN_ARCHIVE="${MY_P}-linux_x64.bin"
+
+DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
+HOMEPAGE="https://genymotion.com"
+SRC_URI="${BIN_ARCHIVE}"
+
+LICENSE="genymotion"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="app-arch/lz4
+	app-crypt/mit-krb5
+	|| (
+		app-emulation/qemu[qemu_softmmu_targets_x86_64]
+		app-emulation/virtualbox
+	)
+	|| (
+		dev-libs/openssl-compat:1.1.0
+		=dev-libs/openssl-1.1*:0
+	)
+	dev-libs/glib:2
+	=dev-libs/hiredis-1.0*
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpulse
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXmu
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+"
+BDEPEND="x11-misc/xdg-utils"
+
+RESTRICT="bindist fetch"
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/${MY_PN}/*.so*
+	opt/${MY_PN}/imageformats/*.so
+	opt/${MY_PN}/plugins/*.so*
+	opt/${MY_PN}/${MY_PN}
+	opt/${MY_PN}/genyshell
+	opt/${MY_PN}/player
+	opt/${MY_PN}/${MY_PN}adbtunneld
+	opt/${MY_PN}/gmtool
+	opt/${MY_PN}/tools/*
+"
+
+pkg_nofetch() {
+	einfo
+	einfo "Please visit"
+	einfo
+	einfo "  https://www.genymotion.com/download/"
+	einfo
+	einfo "and download "
+	einfo
+	einfo "  ${BIN_ARCHIVE}"
+	einfo
+	einfo "which must be placed in DISTDIR directory."
+	einfo
+}
+
+src_unpack() {
+	cp "${DISTDIR}/${BIN_ARCHIVE}" "${WORKDIR}" || die "cp failed"
+}
+
+src_prepare() {
+	default
+
+	chmod +x ${BIN_ARCHIVE} || die "chmod failed"
+	yes | ./${BIN_ARCHIVE} > /dev/null || die "unpack failed"
+
+	# removed windows line for bashcompletion
+	sed -i "/complete -F _gmtool gmtool.exe/d" "${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
+
+	# copy .desktop file in S directory
+	sed -i -e "s:Icon.*:Icon=/opt/${MY_PN}/icons/genymotion-logo.png:" \
+		-e "s:Exec.*:Exec=/opt/${MY_PN}/genymotion:" \
+		"${HOME}"/.local/share/applications/genymobile-genymotion.desktop || die "sed failed"
+	cp "${HOME}"/.local/share/applications/genymobile-genymotion.desktop "${S}" || die "copy .desktop file"
+}
+
+src_install() {
+	insinto /opt/"${MY_PN}"
+	exeinto /opt/"${MY_PN}"
+
+	# Use qt bundled
+	doins -r "${MY_PN}"/{audio,geoservices,Qt,QtGraphicalEffects,QtLocation,QtPositioning,QtQuick,QtQuick.2}
+	doins -r "${MY_PN}"/{icons,imageformats,mediaservice,platforms,plugins,sqldrivers,translations,xcbglintegrations}
+	doins "${MY_PN}"/libQt*
+	doins "${MY_PN}"/qt.conf
+	doins "${MY_PN}"/libicu*
+
+	doexe "${MY_PN}"/{libcom,librendering,libshadertranslator,libswscale,libavutil}.so*
+	# android library
+	doexe "${MY_PN}"/{libOpenglRender,libemugl_logger,libemugl_common}.so*
+
+	find "${ED}/opt/${MY_PN}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed"
+
+	doexe "${MY_PN}"/{genymotion,genyshell,player,gmtool}
+
+	# the android-sdk-update-manager have some bugs and lacks maintenance
+	# so installs bundled version
+	exeinto /opt/"${MY_PN}"/tools
+	doexe "${MY_PN}"/tools/{aapt,adb,glewinfo}
+	exeinto /opt/"${MY_PN}"/tools/lib64
+	doexe "${MY_PN}"/tools/lib64/libc++.so
+
+	pax-mark -m "${ED}/opt/${MY_PN}/genymotion"
+	pax-mark -m "${ED}/opt/${MY_PN}/gmtool"
+
+	dosym -r /opt/"${MY_PN}"/genyshell /opt/bin/genyshell
+	dosym -r /opt/"${MY_PN}"/genymotion /opt/bin/genymotion
+	dosym -r /opt/"${MY_PN}"/gmtool /opt/bin/gmtool
+
+	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
+
+	insinto /usr/share/zsh/site-functions
+	doins "${MY_PN}/completion/zsh/_gmtool"
+
+	if has_version app-emulation/qemu ; then
+		dodir /opt/"${MY_PN}"/qemu/bin
+		dosym  -r /usr/bin/qemu-system-x86_64 /opt/"${MY_PN}"/qemu/bin/qemu-system-x86_64
+		dosym -r /usr/bin/qemu-img /opt/"${MY_PN}"/qemu/bin/qemu-img
+	fi
+
+	domenu genymobile-genymotion.desktop
+}
+
+pkg_postinst() {
+	if has_version app-emulation/qemu && ! has_version app-emulation/virtualbox ; then
+		ewarn "By default Genymotion is configured to work with VirtualBox hypervisor."
+		ewarn "So you should run command:"
+		ewarn ""
+		ewarn "  gmtool config --hypervisor qemu"
+		ewarn ""
+		ewarn "to change hypervisor to QEMU."
+	fi
+}
diff --git a/app-emulation/libvirt/libvirt-8.9.0-r1.ebuild b/app-emulation/libvirt/libvirt-8.9.0-r1.ebuild
index b21d401c3b12..bb30f72a02cc 100644
--- a/app-emulation/libvirt/libvirt-8.9.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-8.9.0-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
 		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
diff --git a/app-emulation/wine-mono/wine-mono-7.4.0.ebuild b/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
index c09e03eec8e8..27069cdc43d3 100644
--- a/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared"
 
 src_install() {
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
index 1aa7a660b98a..d9b6ce69a9ec 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
@@ -16,7 +16,7 @@ else
 	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
 	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
 	S="${WORKDIR}/wine-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 436b08e49a2a..712cffbb387e 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
index dfb5c4808326..77dd21bb52d0 100644
--- a/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
+++ b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 MY_PV=${PV//_beta/-beta.}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2141423b55b8..472c95bc3c1e 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
index 24b29d6dec6f..d43d9941a13c 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools gnome2-utils python-r1 xdg
 
 DESCRIPTION="Chinese Cangjie and Quick engines for IBus"
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
index f2661fb08430..b7af5906e50e 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 81899115b72a..6e9aa20f55d7 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1 +1,2 @@
 DIST ibus-m17n-1.4.18.tar.gz 639501 BLAKE2B 73881d77f08433052ef1c9dd6706febae6f351287ab0ea9beb47078292224ccaab51d930ca178db245870d0a3639a54cca0dc15bf59fd320f3ac9c39d433f2a5 SHA512 4960301ee2a4b10a8ca3c618df1a9f5acabce89da662c80bc39520d1b4b2a6e0b487f85c6e513ba174addc7b8ae349b3cb799f4925abfc20c8ac1ef1b8678540
+DIST ibus-m17n-1.4.19.tar.gz 640562 BLAKE2B ec3153d1fa750b4958cb9ad54e95e13cadabd45ec992c1635bcd2480796e7219af449197849a90e50fc6a3d3985d0770614586ccab9c09a8eb33bfc232c07d55 SHA512 d859ccd566ec46b0f03cee47dc926bf4608bbe281f62ac9127cd518749a54e7f11bbef573900575f34c1a0d33a55262226132c320acbbabf44b1ff262565702d
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.19.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.19.ebuild
new file mode 100644
index 000000000000..88b4ee5735a9
--- /dev/null
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.19.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="M17N engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk nls"
+
+DEPEND="app-i18n/ibus
+	dev-libs/m17n-lib
+	gtk? ( x11-libs/gtk+:3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtk 3.0)
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
new file mode 100644
index 000000000000..0faa622e3230
--- /dev/null
+++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
@@ -0,0 +1,23 @@
+UPSTREAM: https://github.com/ibus/ibus-pinyin/pull/12
+BUG: https://bugs.gentoo.org/896366
+AUTHOR: jinqiang zhang <peeweep@0x0.ee>
+
+As sqlite 3.41.0 release note say:
+
+ The double-quoted string misfeature is now disabled by default for CLI
+ builds. Legacy use cases can reenable the misfeature at run-time using
+ the ".dbconfig dqs_dml on" and ".dbconfig dqs_ddl on" commands.
+
+We should change this double quote to single quote
+
+--- a/data/db/english/english.awk
++++ b/data/db/english/english.awk
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+ 
+     # Insert data into english table
+-    {   printf "INSERT INTO english (word, freq) VALUES (\"%s\", \"%f\");\n", $1, $2}
++    {   printf "INSERT INTO english (word, freq) VALUES (\'%s\', %f);\n", $1, $2}
+ 
+     #quit sqlite3
+ END {
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
index 3524ba6ebedb..2df80c6b265c 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-boost.patch
 	"${FILESDIR}"/${P}-content-type-method.patch
 	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-sqlite-3.41.0.patch
 )
 
 pkg_setup() {
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
index 1958b594a0bd..b744dc469035 100644
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@@ -1 +1,2 @@
 DIST ibus-table-others-1.3.14.tar.gz 674955 BLAKE2B 77f94ae3f83e95eb53aaf3d78a28682261bfa63031dc74b1399b57194d68e2405df070f41af6a00d69dd9f9c9a106ffa730302847e01b2fc97988fe9bd42a1e2 SHA512 9c91db95ebbee3b6951cc179a46bbc3ee29409afa1e3229a6213447b90ebff288dc738046b0ea4f979c2241cf9563ca77a8b97b651a56e940563e9f25e0e238b
+DIST ibus-table-others-1.3.15.tar.gz 675072 BLAKE2B fe12af11628bdefdc313ae29d905f8a95ea73541fee3c7dbbff355948ff1afe7d051ccd2f85d50582e43dc68c87eb669e9321a97e5fc39a5ac29785148dbc3f5 SHA512 65c8ca06901cd507b0112de7df0700450d3348b10eef36b1d5bb3e419b21637f9a4cf707b6ce630256cb350d6a65f6d7b261b5ec639599193610a31487f9ea76
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.15.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.15.ebuild
new file mode 100644
index 000000000000..3b9d129a0b69
--- /dev/null
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.15.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Various tables for IBus-Table"
+HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
+SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus-table
+	!app-i18n/ibus-table-code
+	!app-i18n/ibus-table-cyrillic
+	!app-i18n/ibus-table-latin
+	!app-i18n/ibus-table-tv"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 7869b5ad6be1..cc929dd7e106 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,3 +1,4 @@
 DIST ibus-typing-booster-2.20.0.tar.gz 11175896 BLAKE2B 399b48617cd3d256e682b2d23d63c8931faecc4e83015d0be30040d516d3cd3a50e9366c460ebfe1f1ef2b2aa1363f4d2e2d2ac0ef9ad7016f6f2ecd6ee4f36b SHA512 8c7271d3029a28b045c9e9ffae9c9ac07adac3ac98749f30cd0959cfb91a50953372758c77c9820d713f2027d535d0752d1817281ce16be7e3594877b64177a5
 DIST ibus-typing-booster-2.21.1.tar.gz 11182916 BLAKE2B a301173052cfa18a5b06ec5409550c5fcf9f76faa08a46567599a6c5f6481a346708366b808b29efeb33214b10001d49fc05859ec82d12e5cb23bd8e736b7546 SHA512 e0b643d8d24c97929889f8a5772651365c83e8c331a77e5510a317696caa22524f17ad4f7f31f202ae33b1a02d5ce3e8a209f2e9af5e9f41ce60a16fb038b1c7
 DIST ibus-typing-booster-2.21.3.tar.gz 11219998 BLAKE2B 2d2f8a2664d280b05c74126ff132307c4b63c072fddfef63ffe7eb2de0d13a0a1530b7787459c7c7d4dba28ae77e5d277b628ec0c8c904806439e1ccf55c9c65 SHA512 a9a78b0b7d285982890eae30a562c642e9f746622119a968eebce3312d53211841c9e105942862e05548b1bfad1dbf1da033e341eb51f3fdde1c45a165d38649
+DIST ibus-typing-booster-2.21.4.tar.gz 11220794 BLAKE2B 7e5c7b9be31858ce1be7399b7dbada4cdec5a24f9d4f66d4e5ea110153d4696aa794650048b40dc52044ad90514f051a60234835d9b3c59aadb05aa6ba9eef4b SHA512 26dbc8cee8e6a6ec0414fc3e2f26298665030babed7f7dba7f52b5260b9aba511ab456fe49fb779f66b66b4db9fbe81faeec8692ad8a101e518d6fcf80189fd8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild
index 93214960c8aa..172808cc0650 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.20.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.1.ebuild
index 3a255c68af99..564f684f9809 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.3.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.3.ebuild
index 3a255c68af99..564f684f9809 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.3.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.4.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.4.ebuild
new file mode 100644
index 000000000000..564f684f9809
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.21.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 6fd502ca7c05..22c0f865df55 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -76,6 +76,7 @@ BDEPEND="
 		app-i18n/unicode-emoji
 	)
 	nls? ( sys-devel/gettext )
+	test? ( x11-apps/setxkbmap )
 	unicode? ( app-i18n/unicode-data )"
 
 src_prepare() {
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 652e2e25f4bb..37e98ce90bc0 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,4 +1,4 @@
-DIST transifex-client-1.4.1-deps.tar.bz 241665608 BLAKE2B 88fcdf188c0086c3a8438cee0408e1df8ea17fa7c5724347d8af9b3f94fd843e8a3d68e988c33ceb55f6f8723d6a97fb189027d36fe9f443cbfd39d6f6ddf257 SHA512 a7f6a8e04211756761b2b1295c3cc1ae0c2a3b6486607f0514c38f9314678f48d2f743f681bf1f990310ef89345f02cc06f15908db3df5c4a1c0c7d0fa7601a3
-DIST transifex-client-1.4.1.tar.gz 91054 BLAKE2B 55bde1faf526a633923691cd3dc14d9d481cd4eec040e95eae385c63593545dc2158e0d3518c53a08db70661abf4fb864157d5e7e1fdab403ef02e47d83665fe SHA512 66ad08c9a22e09dbb5690c4da830924e0bd76c9ecf73dbeadc849c7b1911b4439a456c478a5688883278e90903015b0968220f36f7cd951650f364857ac0e08e
 DIST transifex-client-1.6.4-deps.tar.bz 241683180 BLAKE2B 395caf5b5db1ea93363a7f6efc4d2b8ff9e5e8040b04fd8e78ccfbc4b6239c809e348de9d4f8e494d34a2fc6564a70df448961d62a2949c9e2a326cb5f873fcf SHA512 0463cc7ead2c111f4d3889f3f29aa1c729554af0d0934a51aebd691e1f621f9bc61b5b3a90166ee0c947187aa5b489dc6b1bbd438193d6009afdc1a040db1270
 DIST transifex-client-1.6.4.tar.gz 94703 BLAKE2B b51e29aadab41c23b95efc86c334876094772e9d4f4f0cdaa41a5d016e710597da631953446d20689b0028e34bb4cc31ab0bdc1d3107dbc3a4abd6ba9279698e SHA512 d8e6b18d30b9d225c6ed84c9cc699743c289ccfc151c1aa74411989f965f554e651ece3e36a033dc8fc77bc3bb5502b02b2d04b1affe96811195b74edadf128c
+DIST transifex-client-1.6.5-deps.tar.bz 241689777 BLAKE2B 55ca6f8c39e08887ddad1fa27fa5065cdeaa193d470be846b60ad0350578e64d10f9ea63a6d9bd744b048e0db164591d07a069e2deab55e75ecb1e78efc44c19 SHA512 72b5702b31121e42b6b107b3addecd9ac6010042f94b2116e08b18e50264d6a6bb7010e0bef6dead599d96de390390f624b413ff042cc4293538fabbf904bc19
+DIST transifex-client-1.6.5.tar.gz 94921 BLAKE2B 1d1e00c62754765e1bf51165e7fcfa2f7352d3d2033b7f8f5916c89e571dbcd2d421038e44382b490aa91013213fe89232cd5337678c265c6bf32734786737ce SHA512 212d6d008eb0f7b83483c4dfd3b3f1caf6a18cb136e8a814b6395d7baee4097c902280a93e358f1a9ccaf43e668e3dcc372e0c67765624610506012328f89f3d
diff --git a/app-i18n/transifex-client/transifex-client-1.4.1.ebuild b/app-i18n/transifex-client/transifex-client-1.4.1.ebuild
deleted file mode 100644
index f6cb75a144ce..000000000000
--- a/app-i18n/transifex-client/transifex-client-1.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="The Transifex command-line client"
-HOMEPAGE="https://github.com/transifex/cli"
-
-SRC_URI="https://github.com/transifex/cli/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-deps.tar.bz"
-S="${WORKDIR}"/cli-${PV}
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-src_compile() {
-	emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV}
-}
-
-src_test() {
-	# Skip tests depending on a network connection. Bug #831772
-	rm internal/txlib/update_test.go || die
-	go test ./... || die
-}
-
-src_install() {
-	dobin bin/tx
-	dodoc README.md
-}
diff --git a/app-i18n/transifex-client/transifex-client-1.6.5.ebuild b/app-i18n/transifex-client/transifex-client-1.6.5.ebuild
new file mode 100644
index 000000000000..4c2ef37584ef
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-1.6.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="The Transifex command-line client"
+HOMEPAGE="https://github.com/transifex/cli"
+
+SRC_URI="https://github.com/transifex/cli/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-deps.tar.bz"
+S="${WORKDIR}"/cli-${PV}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+src_compile() {
+	emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV}
+}
+
+src_test() {
+	# Skip tests depending on a network connection. Bug #831772
+	rm internal/txlib/update_test.go || die
+	go test ./... || die
+}
+
+src_install() {
+	dobin bin/tx
+	dodoc README.md
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d516330bf1aa..aaa6fb222995 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index de0404949b1e..d35a0f03a2b8 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -22,6 +22,7 @@ DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST broot-1.19.0.tar.gz 10132851 BLAKE2B 23629bf7248b3b570e9a9553aba4d6991c557f4c06d3d906f9a018fe5584d73f0c07ff9f93ea7455f3bf6dbeb64f7b288f7162eb59929f6667326b8848f02d88 SHA512 bcf4d8a40f03e0aa1681f603efdd922351a0b7052d810b9712f1e1dfc32b9aba096b43b5eed13c4016117c474324ea8b55afe641fb68031ebf82af96ad3cbd3d
 DIST broot-1.20.1.tar.gz 11033695 BLAKE2B ad4eb5bf23c772b8aee4af762d55ce6f80fb890700f262cba5ad1ac370feed78b77738f98a76db813cdb7f46465d4d3d59016bb4b82edec440087bde5a09263b SHA512 d2011e8e8ea4bbde52353a6c57bcef70c8659e5e96d6f879e21094be1ce8e71e5924c797a2ab5fbb3e3b18f9ccc6efe8afb5d6461988d2b0f957c8325e6217dd
+DIST broot-1.20.2.tar.gz 11094835 BLAKE2B 3dd5c3ea6d5a02a78b9b1e169468872abaf4502d79f1f3224c646c524b274bca204a31271169a2b1d5d377dc2c14af198e1675f6cfd9bc8fb66694d0fa0e5f37 SHA512 4c96bbcf204edd74d6ffa3f1ed04c59ce1fa2be0bbd6c2caa4c05ccd1b2c07d577e39376d58e4d4d2b86a2d46787472766b399d0f242f70556d1c52195b91ceb
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bstr-1.2.0.crate 340985 BLAKE2B a032f74c4681407704fe6b49cadb19bece51270abe85c3fab9268f5cb0fd27bd12c179beb88c932b1a5ea745af476249ad66465ec88ceefa433d4b6cca9d3b93 SHA512 df849487d35299abe116ef5e32857cb8736a5a89bb3b785a3563a5a0b43e412935eb21a639add210b6d5808fce135afbdb548f86f8572d4b105a065901b5a543
 DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc
@@ -251,6 +252,7 @@ DIST termimad-0.21.0.crate 355828 BLAKE2B 86e3a7a3f6f13f40f7825c79225d5cd23d35da
 DIST terminal-clipboard-0.3.1.crate 5597 BLAKE2B a05f67c1ebce2129a2b8130cd84fbed579c67ae4d46bc4f233e6ae647a2693e5c1257ce3882a21345b596c487cbf5b339ef907f417aafea4bb6f980113aa31eb SHA512 b29a81d2737271cc4e60115e473ea3af80ce45f078c99fee573cbd35da8e27c939ff1aa86dd86a3e2ea9352a28f2fd3492e28be63c3eb0dad53974d06b43c346
 DIST terminal-light-1.0.1.crate 39115 BLAKE2B b4a8ec843c84a22b7de0f607ed4ad212f503142ff3e0085903c7faa2a9c0058f7de019501dd04becb7913f7ab6f988d79d07efdd6d42cfe233f0ba3468367edb SHA512 0547e006add17b0a363bbe792a1cab67832af3fe148e85b5a00a70651a01e8d8fd8a7cc1e720093d4223e50fe10277389d72acd5b3b738bfa6027be35e7fbb80
 DIST terminal-light-1.1.0.crate 39353 BLAKE2B 9727a1e338c605ac97fbe26a12203ef25c5c2f4549c74c7b8ee2d1c32c60339934507f1b82a66221f1ac8d1f971be1f25677468ba71a14dcd413c550da136dd4 SHA512 197786a3b79a28f667778527f3aed2d76b52d2ba3c001d27ca3de3310d79fc4c051a1756277b405bcc28407232dac5c6e5ed971f7d171a5841e2f234ed35b1f2
+DIST terminal-light-1.1.1.crate 39344 BLAKE2B 92cd28f4e3a64a995815bddc98baa916bef6e271d32499ee648c795ddcdc71ddbfcb5523e4941224e6aff650aca36850cc6eabb08a6c107352adde607e9f4afd SHA512 c25f4abfe4c51ccf7aef1d80848964ad5d80e472c18ed114f25e9047a31120ffd0478f8a8457985d06bfd05ac12d5945bf9c508b9af022c64c8e3a5e6b6f1eb3
 DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
 DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3
 DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
diff --git a/app-misc/broot/broot-1.20.2.ebuild b/app-misc/broot/broot-1.20.2.ebuild
new file mode 100644
index 000000000000..1c6848ef09a2
--- /dev/null
+++ b/app-misc/broot/broot-1.20.2.ebuild
@@ -0,0 +1,347 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+ahash-0.4.7
+ahash-0.7.6
+aho-corasick-0.7.20
+android_system_properties-0.1.5
+ansi_colours-1.2.1
+anyhow-1.0.68
+argh-0.1.10
+argh_derive-0.1.10
+argh_shared-0.1.10
+arrayref-0.3.6
+arrayvec-0.7.2
+atty-0.2.14
+autocfg-1.1.0
+base64-0.13.1
+bet-1.0.2
+bincode-1.3.3
+bit_field-0.10.1
+bitflags-1.3.2
+bstr-0.2.17
+bstr-1.2.0
+bumpalo-3.12.0
+bytemuck-1.13.0
+byteorder-1.4.3
+cc-1.0.79
+cfg-if-1.0.0
+char_reader-0.1.1
+chrono-0.4.23
+clap-3.2.23
+clap_complete-3.2.5
+clap_derive-3.2.18
+clap_lex-0.2.4
+cli-log-2.0.0
+clipboard-win-4.5.0
+codespan-reporting-0.11.1
+color_quant-1.1.0
+coolor-0.5.0
+core-foundation-sys-0.8.3
+crc32fast-1.3.2
+crokey-0.4.3
+crokey-proc_macros-0.4.0
+crossbeam-0.8.2
+crossbeam-channel-0.5.6
+crossbeam-deque-0.8.2
+crossbeam-epoch-0.9.13
+crossbeam-queue-0.3.8
+crossbeam-utils-0.8.14
+crossterm-0.23.2
+crossterm_winapi-0.9.0
+crunchy-0.2.2
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.8
+custom_error-1.9.2
+cxx-1.0.89
+cxx-build-1.0.89
+cxxbridge-flags-1.0.89
+cxxbridge-macro-1.0.89
+data-url-0.2.0
+deser-hjson-1.1.0
+directories-4.0.1
+directories-next-2.0.0
+dirs-sys-0.3.7
+dirs-sys-next-0.1.2
+doc-comment-0.3.3
+either-1.8.1
+error-code-2.3.1
+exr-1.5.2
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+fastrand-1.8.0
+file-size-1.0.3
+flate2-1.0.25
+float-cmp-0.9.0
+flume-0.10.14
+fnv-1.0.7
+fontconfig-parser-0.5.1
+fontdb-0.10.0
+form_urlencoded-1.1.0
+futures-core-0.3.26
+futures-sink-0.3.26
+getrandom-0.2.8
+gif-0.11.4
+git2-0.14.4
+glassbench-0.3.4
+glob-0.3.1
+half-2.2.1
+hashbrown-0.12.3
+hashbrown-0.9.1
+hashlink-0.6.0
+heck-0.4.1
+hermit-abi-0.1.19
+hermit-abi-0.2.6
+iana-time-zone-0.1.53
+iana-time-zone-haiku-0.1.1
+id-arena-2.2.1
+idna-0.3.0
+image-0.24.5
+imagesize-0.10.1
+include_dir-0.7.3
+include_dir_macros-0.7.3
+indexmap-1.9.2
+instant-0.1.12
+is_executable-1.0.1
+itoa-0.4.8
+itoa-1.0.5
+jobserver-0.1.25
+jpeg-decoder-0.3.0
+js-sys-0.3.61
+kurbo-0.8.3
+lazy-regex-2.4.1
+lazy-regex-proc_macros-2.4.1
+lazy_static-1.4.0
+lebe-0.5.2
+lfs-core-0.11.1
+libc-0.2.139
+libgit2-sys-0.13.5+1.4.5
+libsqlite3-sys-0.20.1
+libz-sys-1.1.8
+line-wrap-0.1.1
+link-cplusplus-1.0.8
+linked-hash-map-0.5.6
+lock_api-0.4.9
+log-0.4.17
+memchr-2.5.0
+memmap2-0.5.8
+memoffset-0.6.5
+memoffset-0.7.1
+minimad-0.9.1
+minimad-0.10.0
+miniz_oxide-0.5.4
+miniz_oxide-0.6.2
+mio-0.8.5
+nanorand-0.7.0
+nix-0.22.3
+num-integer-0.1.45
+num-rational-0.4.1
+num-traits-0.2.15
+num_cpus-1.15.0
+once_cell-1.17.0
+onig-6.4.0
+onig_sys-69.8.1
+open-1.7.1
+opener-0.5.2
+os_str_bytes-6.4.1
+parking_lot-0.12.1
+parking_lot_core-0.9.7
+pathdiff-0.2.1
+percent-encoding-2.2.0
+phf-0.10.1
+phf_generator-0.10.0
+phf_macros-0.10.0
+phf_shared-0.10.0
+pico-args-0.5.0
+pin-project-1.0.12
+pin-project-internal-1.0.12
+pkg-config-0.3.26
+plist-1.4.0
+png-0.17.6
+ppv-lite86-0.2.17
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.20+deprecated
+proc-macro2-1.0.50
+proc-status-0.1.1
+quick-xml-0.22.0
+quick-xml-0.26.0
+quote-1.0.23
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.4
+rayon-1.6.1
+rayon-core-1.10.2
+rctree-0.5.0
+redox_syscall-0.2.16
+redox_users-0.4.3
+regex-1.7.1
+regex-automata-0.1.10
+regex-syntax-0.6.28
+remove_dir_all-0.5.3
+resvg-0.28.0
+rgb-0.8.34
+roxmltree-0.15.1
+rusqlite-0.24.2
+rustybuzz-0.6.0
+ryu-1.0.12
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+scratch-1.0.3
+secular-1.0.1
+serde-1.0.152
+serde_derive-1.0.152
+serde_json-1.0.91
+signal-hook-0.3.14
+signal-hook-mio-0.2.3
+signal-hook-registry-1.4.0
+simplecss-0.2.1
+siphasher-0.3.10
+smallvec-1.10.0
+snafu-0.7.4
+snafu-derive-0.7.4
+spin-0.9.4
+splitty-1.0.1
+str-buf-1.0.6
+strict-0.1.4
+strict-num-0.1.0
+strsim-0.10.0
+svg-0.8.2
+svg-0.10.0
+svgfilters-0.4.0
+svgtypes-0.8.2
+syn-1.0.107
+syntect-no-panic-4.6.1
+tempfile-3.3.0
+termcolor-1.2.0
+termimad-0.20.6
+termimad-0.21.0
+terminal-clipboard-0.3.1
+terminal-light-1.1.1
+termux-clipboard-0.1.0
+textwrap-0.16.0
+thiserror-1.0.38
+thiserror-impl-1.0.38
+threadpool-1.8.1
+tiff-0.8.1
+time-0.1.45
+time-0.3.17
+time-core-0.1.0
+time-macros-0.2.6
+tiny-skia-0.8.2
+tiny-skia-path-0.8.2
+tinyvec-1.6.0
+tinyvec_macros-0.1.1
+toml-0.5.11
+ttf-parser-0.17.1
+umask-2.0.0
+unicode-bidi-0.3.10
+unicode-bidi-mirroring-0.1.0
+unicode-ccc-0.1.2
+unicode-general-category-0.6.0
+unicode-ident-1.0.6
+unicode-normalization-0.1.22
+unicode-script-0.5.5
+unicode-vo-0.1.0
+unicode-width-0.1.10
+url-2.3.1
+users-0.11.0
+usvg-0.28.0
+usvg-text-layout-0.28.0
+vcpkg-0.2.15
+version_check-0.9.4
+walkdir-2.3.2
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.11.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.84
+wasm-bindgen-backend-0.2.84
+wasm-bindgen-macro-0.2.84
+wasm-bindgen-macro-support-0.2.84
+wasm-bindgen-shared-0.2.84
+weezl-0.1.7
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-sys-0.42.0
+windows-sys-0.45.0
+windows-targets-0.42.1
+windows_aarch64_gnullvm-0.42.1
+windows_aarch64_msvc-0.42.1
+windows_i686_gnu-0.42.1
+windows_i686_msvc-0.42.1
+windows_x86_64_gnu-0.42.1
+windows_x86_64_gnullvm-0.42.1
+windows_x86_64_msvc-0.42.1
+x11-clipboard-0.5.3
+xcb-0.10.1
+xmlparser-0.13.5
+xterm-query-0.1.0
+xterm-query-0.2.0
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	sys-libs/zlib
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.65"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+	local myfeatures=( $(usev X clipboard) )
+
+	cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	insinto /usr/share/zsh/site-functions
+	doins _${PN}
+	doins _br
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+	doins br.fish
+}
diff --git a/app-misc/gramps/gramps-5.1.5.ebuild b/app-misc/gramps/gramps-5.1.5.ebuild
index 754be0d90f2f..a640777bf942 100644
--- a/app-misc/gramps/gramps-5.1.5.ebuild
+++ b/app-misc/gramps/gramps-5.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -36,7 +36,7 @@ RDEPEND="
 	x11-misc/xdg-utils
 	berkdb? ( $(python_gen_cond_dep '
 		dev-python/bsddb3[${PYTHON_USEDEP}]
-	' python3_{8,9}) )
+	' python3_9) )
 	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	spell? ( app-text/gtkspell:3[introspection] )
 	rcs? ( dev-vcs/rcs )
diff --git a/app-misc/jq/jq-1.7_pre20230210.ebuild b/app-misc/jq/jq-1.7_pre20230210.ebuild
index 3a2508ecac79..4143400bc2a8 100644
--- a/app-misc/jq/jq-1.7_pre20230210.ebuild
+++ b/app-misc/jq/jq-1.7_pre20230210.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
@@ -52,8 +52,12 @@ src_prepare() {
 	# exists; save the cycles by nuking it.
 	sed -e '/modules\/oniguruma/d' -i Makefile.am || die
 	rm -rf "${S}"/modules/oniguruma || die
+	sed -i "s/^jq_version: .*/jq_version: \"${PV}\"/" docs/site.yml || die
 
 	default
+
+	sed -i "s/\[jq_version\]/[${PV}]/" configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-misc/lirc/lirc-0.10.2.ebuild b/app-misc/lirc/lirc-0.10.2.ebuild
index 380e55128424..f9b8428f0f19 100644
--- a/app-misc/lirc/lirc-0.10.2.ebuild
+++ b/app-misc/lirc/lirc-0.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit linux-info python-single-r1 xdg-utils
 
diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index 8994df22e307..c98814f9b31a 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1 +1,2 @@
 DIST ola-0.10.8.tar.gz 2552023 BLAKE2B b4fa7e36e2b907e8f0ea16ef089607fc223afc543752a03740fd1d525062ea676d2f392bb623804543827d6f5ac6078c469a3edcb4321bca9a454b1c219f9c89 SHA512 78ef8cc7f8e8d0b1d15bbb305d99a589fce82e07e89ca3bf2466bef8cdc1b18f590fc8dcbf29fc5af2349e0721c832f525fd665d62498907554ee742d79cd3d2
+DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581 SHA512 e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf
diff --git a/app-misc/ola/ola-0.10.9.ebuild b/app-misc/ola/ola-0.10.9.ebuild
new file mode 100644
index 000000000000..5cdbca6899a9
--- /dev/null
+++ b/app-misc/ola/ola-0.10.9.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Open Lighting Architecture, a framework for lighting control information"
+HOMEPAGE="https://www.openlighting.org/ola/"
+SRC_URI="https://github.com/OpenLightingProject/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples ftdi http osc python rdm-tests tcmalloc test usb zeroconf"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	rdm-tests? ( python )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/protobuf:=
+	sys-apps/util-linux
+	sys-libs/ncurses
+	ftdi? ( dev-embedded/libftdi:1 )
+	http? ( net-libs/libmicrohttpd:= )
+	osc? ( media-libs/liblo )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/protobuf-python[${PYTHON_USEDEP}]
+		')
+	)
+	rdm-tests? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+	tcmalloc? ( dev-util/google-perftools:= )
+	usb? ( virtual/libusb:1 )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	test? (
+		dev-util/cppunit
+		python? (
+			${PYTHON_DEPS}
+			$(python_gen_cond_dep '
+				dev-python/numpy[${PYTHON_USEDEP}]
+				dev-python/protobuf-python[${PYTHON_USEDEP}]
+			')
+		)
+	)"
+
+src_prepare() {
+	default
+	# Upstream recommends doing this even for tarball builds
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-fatal-warnings
+		--with-uucp-lock="/run"
+		$(use_enable doc doxygen-doc)
+		$(use_enable doc doxygen-dot)
+		$(use_enable examples)
+		$(use_enable ftdi libftdi)
+		$(use_enable http)
+		$(use_enable osc)
+		$(use_enable python python-libs)
+		$(use_enable rdm-tests)
+		$(use_enable tcmalloc)
+		$(use_enable test unittests)
+		$(use_enable usb libusb)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use doc; then
+		dodoc -r html
+		docompress -x /usr/share/doc/${PF}/html
+	fi
+
+	if use examples && use python; then
+		docinto examples
+		python_fix_shebang python/examples/*.py
+		dodoc python/examples/*.py
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-misc/openrgb-plugin-effects/Manifest b/app-misc/openrgb-plugin-effects/Manifest
index 559acba296d3..b6c7e91e0085 100644
--- a/app-misc/openrgb-plugin-effects/Manifest
+++ b/app-misc/openrgb-plugin-effects/Manifest
@@ -1,4 +1,3 @@
-DIST OpenRGBEffectsPlugin-a7222bdbcd3c52e13d96993a33c5648f1306aeba.tar.bz2 255129 BLAKE2B 8fc7ee994d80bd9fe8d8a76e26710ed0fec429aa8df835f6a46a64d4034a4fc2352d722c9aed26032bff33781b1f024a893d685f6883e1816872d91cd937c1d0 SHA512 386879a7a1f05cfcbcca792add1b18f2680b4fa7b139f8532e6f32d09a5194c381357d3cbb3883352c2a03280c9b0b0f1e9faef7e140c7535144c0d645832d3e
 DIST OpenRGBEffectsPlugin-release_0.8.tar.bz2 232858 BLAKE2B 71851eaa40719d8b04a91577756e76b248d261c344e461a00f2c60d26fe37b2a1a2d563a67f620a4c6887d21d4505cb715850f6f0eb4f133894833a72f22e8e4 SHA512 c1ad3f460a9cb4788e9eae3f6df1f0b60a838205a0655c1a639f1bcd04c00f99d55d9a51161267e543bbd961883d4ae0751babe7c98d9be395f104ac9d40e8e3
 DIST QCodeEditor-2021-08-17.tar.gz 95099 BLAKE2B d9eab343c956288b098c9fad4b523615beb7c1a860a00b8c84a2a71f40398fd2e82c335c5d82bb5bc2d15d35bad698a780ff4d1d3202f7555a93120e8a2d906a SHA512 4f8af3a45d3b16d06bc6e4b795f005cf917a80add8f738454751a47d40747df1215ba9b4e05a0f654251bc006521151f8a256c2e41be05c72abae4e55f383b54
 DIST SimplexNoise-2019-12-03.tar.gz 781353 BLAKE2B ce05f78b58439d57e369b8b3944b8d392bec80d579767cb1683befe5c56b90dcf40d405ff75d4541e6c17659f6e1abc83f5d3444fbe641724d21ed509e439854 SHA512 b1e27d6630a902006636ec31c3b1cead1857b255edc8ae8db74cdfee25300337200be48264c6adc0e2c0e39a3693e361d448e61ae62d2f0b700374b264d5e5cd
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild
index 98722bf8b3f7..6b51e61c8507 100644
--- a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild
+++ b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/OpenRGBEffectsPlugin-release_${PV}"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=app-misc/openrgb-0.7:=
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild
deleted file mode 100644
index 3df6ba0bd54b..000000000000
--- a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20220110.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="a7222bdbcd3c52e13d96993a33c5648f1306aeba"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB with various Effects that can be synced across devices"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.7:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtwidgets:5[-gles2-only]
-	media-libs/openal
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-PATCHES=(
-	"${FILESDIR}/openrgb-plugin-effects-0_p20220110-dep.patch"
-)
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBEffectsPlugin.so.1.0
-}
diff --git a/app-misc/openrgb-plugin-skin/Manifest b/app-misc/openrgb-plugin-skin/Manifest
index ef0adc69ffdd..eb03452e78df 100644
--- a/app-misc/openrgb-plugin-skin/Manifest
+++ b/app-misc/openrgb-plugin-skin/Manifest
@@ -1,2 +1 @@
 DIST OpenRGBSkinPlugin-release_0.8.tar.bz2 22711 BLAKE2B 25325c6be5cf619940e79e4f431871478e3026188d7aba4b8220a99afda8f75d18ffeafa0f905110d4ce44f5d7e28208f3d7b358cfadfcd4719a22f1ef5cf70d SHA512 89b9a4bcda4600ea7dbd05972bba7c5f8d917606b3def4971e6ccff84d8510ca420747dd85d3395bfea29e62adc775b592f9cbe20a6966776a46e15593f2cf59
-DIST openrgbskinplugin-ebb80f7bd0e1efaa995f60454f3c049a4607bc3b.tar.bz2 22843 BLAKE2B 30c88b143b3df829c543744b20424df24bde9dda10f770fb78d653609111801a4d1d3fe16ed3e3c15ad953f41113db5d4da40bc66f7ec57418b2e934cd9a2e32 SHA512 a70c0157072b6b638a5a4f3f48f41c73f422d0ac356174479901cd3d088faf6fe96e594b2a39b15de305e0355fd0d252dafc4a30b9216d57058ad2cde7f5a3e3
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild
index 8a3da828c824..b611a886e87b 100644
--- a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild
+++ b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit qmake-utils
 
 SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin/-/archive/release_${PV}/OpenRGBSkinPlugin-release_${PV}.tar.bz2"
 S="${WORKDIR}/OpenRGBSkinPlugin-release_${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
 HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin"
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild
deleted file mode 100644
index 3e8d07f3bf37..000000000000
--- a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20211230.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="ebb80f7bd0e1efaa995f60454f3c049a4607bc3b"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/${MY_GIT_COMMIT}/openrgbskinplugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBSkinPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.7:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBSkinPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb-plugin-visualmap/Manifest b/app-misc/openrgb-plugin-visualmap/Manifest
index 007d9b9a17b0..b9109dd7156a 100644
--- a/app-misc/openrgb-plugin-visualmap/Manifest
+++ b/app-misc/openrgb-plugin-visualmap/Manifest
@@ -1,2 +1 @@
-DIST OpenRGBVisualMapPlugin-223c5ec67d256c5fa3bf7f3d572213114d93db6e.tar.bz2 54289 BLAKE2B b42b59fdc31f48d3e7be28051ccb02a2ba1befa1b1ed180a9313c8cbc50bad1c358ab5b4d8f249b488d5f32c801426078ef6c0c3c46dbec9695cb7b7cbf21d40 SHA512 eff52debcd027176a761fba71fb33d4a04802dd8f2441a86a825f3afecb268d2768edb8b03ec35ff2d17b5dc6f95dd0642e7d524fa7fcf93f0d215d712e75f3e
 DIST OpenRGBVisualMapPlugin-release_0.8.tar.bz2 51680 BLAKE2B c3423779f7a2082c8f682b519be2e1128b30dafbc4400414bd664f98de5c58701fbdbe9287a44951e8cf6ac4ee7c940a841f499ee1afce107e17537ad9df076b SHA512 7bf0393bc00bb69545ed02f6505f366aa90bb87350de6319977d02ba0afd38ccb895aa14edf02a42242b0a12f76ea2b135d8de5b3df10469c760b6f3d9dd2b61
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild
index d6abfbf2af1c..29925e2a50ea 100644
--- a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild
+++ b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit qmake-utils
 
 SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/release_${PV}/OpenRGBVisualMapPlugin-release_${PV}.tar.bz2"
 S="${WORKDIR}/OpenRGBVisualMapPlugin-release_${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
 HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin"
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild
deleted file mode 100644
index 510983023278..000000000000
--- a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20211230.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="223c5ec67d256c5fa3bf7f3d572213114d93db6e"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=app-misc/openrgb-0.7:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	ln -s "${ESYSROOT}/usr/include/OpenRGB" . || die
-	sed -e '/^GIT_/d' -i *.pro || die
-	sed -i -e '/RGBController.cpp/d' OpenRGBVisualMapPlugin.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBVisualMapPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 4b00e7ad8635..e0ff770dc389 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1,2 +1 @@
-DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
 DIST OpenRGB-release_0.8.tar.bz2 28631365 BLAKE2B 3b328e38f1c52646da02b0b2b2c22b1285f3b31b0a2bc684e99d491d04bd14a91b49bc196b3b81b537320cd872e5568aaa8aec34744f4f15392d9424a81ac6f0 SHA512 d69686da7cab33099b13cfb5ab876fc2db047f79aa01bf8150507ec41321b4c6c092f81623823b89916c70a1a24c4a102f77b1001c5caa721ff4c0c52e0630d2
diff --git a/app-misc/openrgb/openrgb-0.7-r1.ebuild b/app-misc/openrgb/openrgb-0.7-r1.ebuild
deleted file mode 100644
index fc7b38dbf97b..000000000000
--- a/app-misc/openrgb/openrgb-0.7-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qmake-utils udev
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
-else
-	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
-	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="amd64 ~x86"
-	PATCHES=(
-		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
-	)
-fi
-
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
-HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
-LICENSE="GPL-2"
-# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
-SLOT="0/2"
-
-RDEPEND="
-	dev-libs/hidapi
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	net-libs/mbedtls:=
-	virtual/libusb:1
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
-	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
-	"${FILESDIR}"/OpenRGB-0.7-json.patch
-)
-
-src_prepare() {
-	default
-	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
-}
-
-src_configure() {
-	# Some plugins require symbols defined in the main binary.
-	# The official build system bundles OpenRGB as a submodule instead, and
-	# compiles the .cpp file again.
-	append-ldflags -Wl,--export-dynamic
-
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	dodoc README.md OpenRGB.patch
-	udev_dorules 60-openrgb.rules
-
-	# This is for plugins. Upstream doesn't install any headers at all.
-	insinto /usr/include/OpenRGB
-	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild
deleted file mode 100644
index a8ef5e62540f..000000000000
--- a/app-misc/openrgb/openrgb-0.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qmake-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
-else
-	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
-	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="amd64 ~x86"
-	PATCHES=(
-		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
-	)
-fi
-
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
-HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
-LICENSE="GPL-2"
-# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
-SLOT="0/2"
-
-RDEPEND="
-	dev-libs/hidapi
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	net-libs/mbedtls:=
-	virtual/libusb:1
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
-	"${FILESDIR}"/OpenRGB-0.7-udev.patch
-	"${FILESDIR}"/OpenRGB-0.7-json.patch
-)
-
-src_prepare() {
-	default
-	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
-}
-
-src_configure() {
-	# Some plugins require symbols defined in the main binary.
-	# The official build system bundles OpenRGB as a submodule instead, and
-	# compiles the .cpp file again.
-	append-ldflags -Wl,--export-dynamic
-
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	dodoc README.md OpenRGB.patch
-
-	# This is for plugins. Upstream doesn't install any headers at all.
-	insinto /usr/include/OpenRGB
-	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
-}
diff --git a/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch b/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch
new file mode 100644
index 000000000000..2ae13cd4abb0
--- /dev/null
+++ b/app-misc/rmlint/files/rmlint-2.10.1-fix-gui-install.patch
@@ -0,0 +1,11 @@
+--- a/gui/setup.py
++++ b/gui/setup.py
+@@ -19,7 +19,7 @@ def read_version():
+     with open('../.version', 'r') as handle:
+         version_string = handle.read()
+
+-    return version_string.strip()
++    return version_string.split()[0]
+
+ class install_glib_resources(install):
+     user_options = install.user_options + [
diff --git a/app-misc/rmlint/rmlint-2.10.1-r1.ebuild b/app-misc/rmlint/rmlint-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..0bb48648fcc8
--- /dev/null
+++ b/app-misc/rmlint/rmlint-2.10.1-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Extremely fast tool to remove duplicates and other lint from your filesystem"
+HOMEPAGE="https://rmlint.readthedocs.io/"
+SRC_URI="https://github.com/sahib/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gui nls test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	virtual/libelf:0=
+"
+RDEPEND="
+	${DEPEND}
+	gui? (
+		${PYTHON_DEPS}
+		x11-libs/gtksourceview:3.0
+		$(python_gen_cond_dep '
+			dev-python/colorlog[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		')
+	)
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		app-shells/dash
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/parameterized[${PYTHON_USEDEP}]
+			dev-python/psutil[${PYTHON_USEDEP}]
+			dev-python/pyxattr[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DOCS=(CHANGELOG.md README.rst)
+PATCHES=(
+	# The build system tries to override several CFLAGS
+	"${FILESDIR}/${PN}-2.10.1-cflags.patch"
+	# https://github.com/sahib/rmlint/pull/520
+	"${FILESDIR}/${PN}-2.10.1-scons.patch"
+	# https://github.com/sahib/rmlint/pull/521
+	"${FILESDIR}/${PN}-2.10.1-fix-tests.patch"
+	# Skip problematic tests
+	"${FILESDIR}/${PN}-2.10.1-skip-tests.patch"
+	# https://github.com/sahib/rmlint/pull/523
+	"${FILESDIR}/${PN}-2.10.1-x86-fix-size.patch"
+	# https://github.com/sahib/rmlint/pull/526
+	"${FILESDIR}/${PN}-2.10.1-fix-cc.patch"
+	# https://github.com/sahib/rmlint/issues/608#issuecomment-1406811107
+	"${FILESDIR}/${PN}-2.10.1-fix-gui-install.patch"
+)
+
+src_prepare() {
+	default
+	if use test && use x86; then
+		# Skip part of a test until this is fixed:
+		# https://github.com/sahib/rmlint/issues/522
+		sed -i '/--size 0-18446744073709551615\.1/d' \
+			tests/test_options/test_size.py || die
+	fi
+}
+
+src_configure() {
+	# Needed for USE=-native-symlinks
+	tc-export AR CC
+	scons_opts=(
+		VERBOSE=1
+		$(use_with doc docs)
+		$(use_with gui)
+		$(use_with nls gettext)
+	)
+	escons "${scons_opts[@]}" config
+}
+
+src_compile() {
+	escons "${scons_opts[@]}"
+}
+
+src_test() {
+	RM_TS_DIR="${T}/tests" nosetests -s -v -a '!slow' || \
+		die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --prefix="${ED}/usr" --actual-prefix="${EPREFIX}/usr" install
+
+	# https://github.com/sahib/rmlint/pull/525
+	if use doc; then
+		gzip -d "${ED}/usr/share/man/man1/rmlint.1.gz" || die
+	fi
+	if use gui; then
+		python_optimize
+	fi
+	einstalldocs
+}
+
+pkg_preinst() {
+	if use gui; then
+		gnome2_schemas_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gui; then
+		gnome2_schemas_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		gnome2_schemas_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-misc/rmlint/rmlint-2.10.1.ebuild b/app-misc/rmlint/rmlint-2.10.1.ebuild
deleted file mode 100644
index 838041b4fc6e..000000000000
--- a/app-misc/rmlint/rmlint-2.10.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit gnome2-utils python-single-r1 scons-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Extremely fast tool to remove duplicates and other lint from your filesystem"
-HOMEPAGE="https://rmlint.readthedocs.io/"
-SRC_URI="https://github.com/sahib/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gui nls test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	virtual/libelf:0=
-"
-RDEPEND="
-	${DEPEND}
-	gui? (
-		${PYTHON_DEPS}
-		x11-libs/gtksourceview:3.0
-		$(python_gen_cond_dep '
-			dev-python/colorlog[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-		')
-	)
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		app-shells/dash
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/parameterized[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-			dev-python/pyxattr[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-DOCS=(CHANGELOG.md README.rst)
-PATCHES=(
-	# The build system tries to override several CFLAGS
-	"${FILESDIR}/${PN}-2.10.1-cflags.patch"
-	# https://github.com/sahib/rmlint/pull/520
-	"${FILESDIR}/${PN}-2.10.1-scons.patch"
-	# https://github.com/sahib/rmlint/pull/521
-	"${FILESDIR}/${PN}-2.10.1-fix-tests.patch"
-	# Skip problematic tests
-	"${FILESDIR}/${PN}-2.10.1-skip-tests.patch"
-	# https://github.com/sahib/rmlint/pull/523
-	"${FILESDIR}/${PN}-2.10.1-x86-fix-size.patch"
-	# https://github.com/sahib/rmlint/pull/526
-	"${FILESDIR}/${PN}-2.10.1-fix-cc.patch"
-)
-
-src_prepare() {
-	default
-	if use test && use x86; then
-		# Skip part of a test until this is fixed:
-		# https://github.com/sahib/rmlint/issues/522
-		sed -i '/--size 0-18446744073709551615\.1/d' \
-			tests/test_options/test_size.py || die
-	fi
-}
-
-src_configure() {
-	# Needed for USE=-native-symlinks
-	tc-export AR CC
-	scons_opts=(
-		VERBOSE=1
-		$(use_with doc docs)
-		$(use_with gui)
-		$(use_with nls gettext)
-	)
-	escons "${scons_opts[@]}" config
-}
-
-src_compile() {
-	escons "${scons_opts[@]}"
-}
-
-src_test() {
-	RM_TS_DIR="${T}/tests" nosetests -s -v -a '!slow' || \
-		die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --prefix="${ED}/usr" --actual-prefix="${EPREFIX}/usr" install
-
-	# https://github.com/sahib/rmlint/pull/525
-	if use doc; then
-		gzip -d "${ED}/usr/share/man/man1/rmlint.1.gz" || die
-	fi
-	if use gui; then
-		python_optimize
-	fi
-	einstalldocs
-}
-
-pkg_preinst() {
-	if use gui; then
-		gnome2_schemas_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gui; then
-		gnome2_schemas_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		gnome2_schemas_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/app-misc/solaar/solaar-1.1.8-r1.ebuild b/app-misc/solaar/solaar-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..13ddbb755105
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.8-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+
+	')
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libayatana-appindicator )
+	libnotify? ( x11-libs/libnotify[introspection] )"
+# libayatana-appindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i \
+		-e '/yield autostart_path/d' \
+		setup.py || die
+
+	sed -i -r \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc docs/devices.md ChangeLog.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_pkg_postrm
+}
diff --git a/app-misc/vit/Manifest b/app-misc/vit/Manifest
index a510b610e0b5..192b0ad7f5eb 100644
--- a/app-misc/vit/Manifest
+++ b/app-misc/vit/Manifest
@@ -1 +1,2 @@
 DIST vit-1.3.tar.gz 56035 BLAKE2B 871e29767dd5aeb39e6876981246c7d42cdbe45320e3a2524bbc3c2aa055b65a04a54ee4a2bc122c3bf689fec93f117ec7b238dd5462a9133c35cf177cf454e7 SHA512 45ae4a1d08560d534a02a046d2fcf55c5401f9aaab0abcfbd13070fee28854268ba327018aea40317a184b9e28b074973f5d3e4169a479227e94b8401f066527
+DIST vit-2.2.0.tar.gz 65815 BLAKE2B d7643490d00e5f4b1e3c2ed07d1df859c62696adaecb1225a83dc7c025b1c1f7fb3510c754b5a2f063ceedd5d3b361b9b0bef88436fecabab872c57bc8cd96ae SHA512 5301a6cd0e9d2226f006346feef900ebf984f4a98fa933ef20a3864d487e0393dc801ad66723dda956db411a1797f4e759bd161ddc4fe5c1185599c605d1532e
diff --git a/app-misc/vit/metadata.xml b/app-misc/vit/metadata.xml
index e2a356d475a1..8955cdd24077 100644
--- a/app-misc/vit/metadata.xml
+++ b/app-misc/vit/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-    A perl/Curses front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
-    provides a fullscreen terminal window with modes and commands
-    modeled after the vi editor.
-  </longdescription>
+  <maintainer type="person">
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">scottkosty/vit</remote-id>
+    <remote-id type="github">vit-project/vit</remote-id>
+    <remote-id type="pypi">vit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-misc/vit/vit-2.2.0.ebuild b/app-misc/vit/vit-2.2.0.ebuild
new file mode 100644
index 000000000000..0890db739edf
--- /dev/null
+++ b/app-misc/vit/vit-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A lightweight, fast, curses-based front end to Taskwarrior"
+HOMEPAGE="
+	https://github.com/vit-project/vit
+	https://pypi.org/project/vit/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/tasklib-2.4.3[${PYTHON_USEDEP}]
+		>=dev-python/urwid-2.1.2[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="app-misc/task"
+
+distutils_enable_tests pytest
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d8e07cc7c3c9..708d775689fc 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 6ebc434d613e..b4f958215744 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -547,186 +547,186 @@ DIST LibreOffice_7.4.5.1_Linux_x86-64_rpm_langpack_xh.tar.gz 237584 BLAKE2B df6a
 DIST LibreOffice_7.4.5.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 917994 BLAKE2B a4ba8f2c35497b0cd50cc8b8e386bb7292c816b8dcad683bcf423e65ab68e187a05702f35887947782e8f0da4b894fa20d05110b4d418248ed35dfdf4a664f98 SHA512 0eb443d60c24fbef986965b4c4b2fbaf56949f1adea46976ab44a24afa5a07605cfd9d37feb9e870ce8eaca3c334f315e28cf72600e29f545ebe6581a02fe1a5
 DIST LibreOffice_7.4.5.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 936267 BLAKE2B dda9781bda200cc42023922ab36a8d0867c8989736790a1bc7acb634fd45158621075ab665948bf33a9c9feb8ee5a6ddfa5ee087f9287b6c3e2f00638d20ec66 SHA512 766bfa9318497821684298924bff59e3a759b70564b19d3a4fdf5fca9f0b6ef8bee8c3f90bea3ebe6dbb72ebd96f62a68227e011515bb76f30c8387b337e4053
 DIST LibreOffice_7.4.5.1_Linux_x86-64_rpm_langpack_zu.tar.gz 261001 BLAKE2B 7e5d7163108f515d5b7c6d9ecfd807f0005f3f834bc65ba5a036c918452fd9b4bdfea34f76221dc19fd2ef53a005049c6677d66c0da0d96ebbc460d50513e294 SHA512 121e17a4f800c3966236526151d7ec869e154585b1e8c1693ca41e9dfb7b28078bb8bd3e26c579b18975c9ffef13cffe86380bd81679ebfb467b9f1ef342e92e
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_am.tar.gz 3201680 BLAKE2B 92e2ccf684bdc7cf598aa9289f7c8221f080e79b63be2435a030ebab042d0898a71bb1b15485935e9f98289dbec8d6f5a7465646c8005bd1df7ef86534c43b65 SHA512 962ffb60d457b11fe4bb80c3af453a176278fd3341cf3c8f0dc110d7838b2a216ad8b81c992a67e4f5bbd7cfc89cb12a05398228c99905f558e2d69bae6c99b4
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ar.tar.gz 2889086 BLAKE2B 10e8f490c2413ae3ddd3f41d243a5c29892d28dd89cc1a4c5661e2a1edd813d07fc3391add738370b6720ab96b83f36b196dc0ba9d46790fd46bcb62a90cf676 SHA512 ac10bfa582d30cf170c3f4c015e637378e9de7757bb60816563f2a1d5c5d8cadf10d70c7cc93708f42dc0003a473a84a033470280c671843405c01c37aeca2d2
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ast.tar.gz 3054267 BLAKE2B a9d7ff1593e05ae634d52bbfcb9bbb11e6f91f350b0099eca5da3935d0a627013c83f2a5edc90611dc876cf36f4ecb2144e94c0b0180f78ac773a5132c524493 SHA512 1c92b58dab85f73459f87f99ac8bfe259dee0a79c0c4708380fe91461c49d2e963ae38f4bb17d3844e54d8191c4ccc1ba2970a3d77bf3ac3f5fbac25b04a2c79
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bg.tar.gz 3351401 BLAKE2B e5aa50cada77eff292fcf890e63eff13d834900e01393d0aad0156675899d3f43e5f30567f9577297eb079e0952237d2d82d3ec9073a70c345323716c7453cc5 SHA512 899b9a714c2eeb56cf10cfdc9945a794873d53d02c75087507cb78825a25f2aa516e1196e41ac8e89415a578ee8087b9d6e2c324015dbfb806419f2cc9d28ced
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 3360672 BLAKE2B 48f94ffca6caa089798deb0456cea8ce78d836ac0080892c2c3dc9218094528a69b2cb38f13d4ccef08c90f84be19273093cc106f5c8cca938ec88ccc900ea21 SHA512 74e81529f9f7d4255520da726312e81151d4cbf59f8f1834ee6e43778f62d7b314711aedc0e27fcb12eff62533e00e5444083af9e66435510cc96326f78d7914
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn.tar.gz 3173143 BLAKE2B ed11ade196bd5886518c2c11c05751738ec1a914d5c7bc1e40e963fedab756b26076ad5b73dcb0def19017642bc6fd053ed19136c539d7d65d745192a77e60d9 SHA512 4aa4451ea940b37961785d42384ed2dfe2f3cbad0b73c313be3636c20075aee561fcb6b25392a1b70a571e3f0c6af2442210c8cf60b15dd6d68475e221b3b247
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bo.tar.gz 3169711 BLAKE2B e4c9caa7ddc08b071a332139095152bb1e4d0f57e9f466a143e6c4977c276d1546e16f6ef98eb2ffc2c00922f5fd6938211226babfcf4fb33211991e2895a0a1 SHA512 0f43bf6ed848ff79b5a1e75808f69df8f0f73849a5cc4d717200c64d0e45008b401874b7ec2bfbc67b3cf179c26ab9404804dbc541824b61952e07bb39f628cd
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bs.tar.gz 2973853 BLAKE2B 4ce94e2818798716da6cd692cbd1645d3e36987bfdc20e07537d114e549d3fe7aa3df066d4822a48060cd651fefb795e8bb3f2bd9481ff6ed1be2f69aeccde22 SHA512 a650c32735a85e1a9b1c066dafa11796d431abb32c6a08b9bfc3cbb9ac1cd2db14e6203c8792b67fcedd1f95db399f7a51593cf1be8530834b3127f1136b0a9d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3059387 BLAKE2B 9e59466a1f96b3c5cdd1a435480bf9bea01416bf215336ef1b7736d21acabbe44c13f77130ecf73cd1d5e7aba637b7397890f3922005e7fc4a4d523b8c0158c3 SHA512 9596054ace0bab4e0c7c0c14ce3481c2d4f7399fcb96a0cd5a2ddf983d4336947cd8972171083602862d530a7de62588a735f44d5f0bc31e74538c5a1069a827
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca.tar.gz 3073524 BLAKE2B 558c7e6bf833278891a6f43b7454312f63a5b1a6da7f01972cc738ffcda49ce06263af861abfbcea6af14d01b587709bcb8ccc93cf1d316fbe8ad66cc18f98fa SHA512 37d3f24ed4b57e98c70457f2e62b5ff583e121928f641cf56560c9bd2c3eccd9bdc0384f8d0c716fd2e30fc48fe52b9b9c9e75d9dfc0bd60496931db183c82e7
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_cs.tar.gz 3037413 BLAKE2B 0af6a05445de8bbd2b61cfd9eac89ae0465a24a44b8ce248ce699f4c7282e54e8884b164c3260339afea4522be54d6d9ebff94478e35898a732b758f87ff92a2 SHA512 9be742d722383a59a28839ae2987790394a3ab469df6ad2f92c4a74d07d00435db72b9fb8db0fe3192e06cd30989abb84353d4752a4b23ad149cb90158b8cdd3
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_da.tar.gz 3037680 BLAKE2B 75ec666dac66c8986efb212e10230418e7e1106e713f4412a1d18c975fae57bb3d4aa3ad7ad21209796b33d078824b90de47536548f359362ae0c7c40861e0b8 SHA512 5d0a75587b03d9b9df506a487177e0d25fca59a0682a704a16e5c86aa8062d78c5e3aea8b8390fffe74b838b52a55c2d9953f33386d00b6565e4403e7889e5c5
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_de.tar.gz 3129492 BLAKE2B e2825f0f4867f6da50f33ab045ab03b482d58b13eea195d443e9aea692b10a5c20bf105e901c4b8e69d285e9eaa0b43fe2f94f448ee1366771ccc317aa2b41ec SHA512 f0ffaeb886171b2db84cafe63bab54d946016628ff4a60a792abfcdb3fddd229b328182b1db28e01b5ad3838fc5a96f7cfc05258ffef2e668b554bf1539ef01d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_dz.tar.gz 3293201 BLAKE2B ff556355f749bbd11fef2e06a4c7b6c25de5ae21baf917669d7912f27dd2676c1d06e8245b6ac4aa976a97b038ceb9a7cfcd92f3aa7cb96e43b3f72b8bacef6c SHA512 aa94f929e5ccaefadacc272270ab4e7d221f8741885444bcb116e02f4b5924466968787df76fee6614b71a31db0cada83fff8104e2201991e1a4e115f45173f8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_el.tar.gz 3654938 BLAKE2B c60a770daa5f74e2ac5242310cb83185af02e2840976fda1957e094f24186f6b7264d2ef495c63fbf004ae06219ab9bf3e52979c510e302cb75ca75efbb1e4a5 SHA512 6cb194bbbe1ed73cd73e38831fdb2310d1ebe61d2aa7319ea5fe0085dcd04ff234a546d8b7349e6a23c2c34e51ef9fa1210884e349e5f0e1a3738357b895277d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-GB.tar.gz 2894702 BLAKE2B af165edc6289d00c99e4dc62f1b7ff22308e272165c692fbd3875b18e31b5f9f63bd366a5a87fce20e706c5ec86faffa826a1b973ea7d685a01ce6b9fd1728ea SHA512 4eb28a1a216ed716c10dc07b86c16688b52138d50887a0f759db2f9e27c4f69b20e469292c20b1b2bc8d860e1c75e314394b9120677d90fe8a296e1860e2b0ef
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-US.tar.gz 2311456 BLAKE2B a03cce4ac647cdf29c13851394b69de56ec7416e686423628cb2e61b71faa9fdb2bcde6258e550696f16d78ecb671e8969b84aaf249253086b71288930ffbcf3 SHA512 463308aa481e3ae3ffe4446103cbfe72a8f11d4f7fd6a92ed2ec0c0d0b7044aef9de2e4671d0ba4e6311ce6449612be816f0e1e54cc8600aa64c3a8122e6355c
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 2892740 BLAKE2B 2cbf24265b7bd636aa77a9349b8efc21b3ed9d99ee098290cecd0d3c632e69f7e73df11e9989028ae09eed0f4ab869a892556dbc5bf5d91b553e17b6df403cb0 SHA512 712a93d51897ccad4196d8fcbee756a03135820400b1e244221280aae3c8e621ddc403308d3ab6341348a05d8719995544930438cfa612034406e91f5e5802e6
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eo.tar.gz 2977020 BLAKE2B e7b41ef3c7f61b732ba19d3bb186af5b056f36cf70f7fcd90a62d2fc0565ab2f83cd8541c1c35e07ca6f88d86bd29a8725484a7b21626c794d500b1c614f4815 SHA512 f59f9a4fdad2599e9265f9a3a1eda79c5684ac521babc3a7fca217c42a2f59dde38ec3e4ff9444450b22d9b347e016b7d53d41d6388aa79567e091bfd4b0ff23
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_es.tar.gz 3115323 BLAKE2B 2933341f03694fc592471b768a132e629252fc3a38e724f008db7974283a450cb2933496c486d37ed30c4a281b519e83844110a7ba8abce47671a7b8050cef30 SHA512 3fbdd4d10b9d75d13e5b011aa5971d65451648c0a2f20a00cdfb3865d03903b64ec52c1836f85dce11d119f6946dae44a67423430ca7cdcaa98a082b1c39e3a4
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_et.tar.gz 2998361 BLAKE2B 1d23e2319acc639a931633ff516573a44c24c7581989bfe4c5d188a94cd337fe56245757ba30c18f406fa3b64cbe550a80fc947c4c7718aae8c030bce9d77f73 SHA512 c891ce2944fe1a71bb9c6c226a4a3fe3310f579c8829b8b8a330140e58f67f8507b443f3e161d9677e0fbfb85b134d46326b310458fc47096da0f3d467ea8115
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eu.tar.gz 2993411 BLAKE2B 0176440fb6edbeb80cd4effe7ba42b2b140eb162071cfd2177a48e2f69d709d448172e57bade5b349f7204c71168f0c6bd2657257cca54e58c8c3519d96805e2 SHA512 1f6b3f30ee78d8c0aeadda6af273e4c2c39fdecbf979e8b4f4b9f628f9868ea16f9260911ebd501a93ac2c7bb52147a1f1348f2d7c6f20edcbf8fd6edbc9b4de
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fi.tar.gz 3035311 BLAKE2B 801cb667ed1afc8d1a3c10d619f5c3a839e68d0ff165753e14ba2a218378d3ccb2a179c2302c89e8b9d107bceffc5633991d9314749f1ba3fa31a708058e875e SHA512 b2106ca5061bab9bc2a9e0edcfda0b845f134f34283c6a08baeb823577e90de914ab2575e211558367b8e409ece475cfeaf8e23362ff4039629c6b41e6eabb2c
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fr.tar.gz 3093823 BLAKE2B 8b35c239cc4fd5a321152c21b21893949b3c751491a862b0addbf3a0dc4e86296a870773403fdce6b19d5df73c60a0b34fb1a43b2e8126c4d3b4c95364be5300 SHA512 91514a9eb271be2ec21965b72447be04439a7fce1bd6abd2c5f047a7848a188c2e3972bba751316cf7c3971980b185aea839c5c3a1966f674e8f5b0898b7c0d7
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gl.tar.gz 3051160 BLAKE2B d1aeb41250a6784dab52e8259506742355ef9eeaa96551ed3ae0ba9613b7041cce14d4dcd907568e6db38dc306fbf349dfd77d39a1f02f7819102a5b913890bc SHA512 09ab6bbb96b01a9d52e857647399a6205e276b8d0286164e7ae9ae34f3343875ac5fb0548f8a60a930aec65bd9d5918e5a600a05a9a2e4e73eaabc2b9de413af
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gu.tar.gz 2981708 BLAKE2B ba51754866335950bf635ca6ce2c0adb34c4f629ef56519166caed8753b3a88026e128177f849cbd4ea09a6eb549d5fa94411b0961bb412eba7e208f269a23e8 SHA512 bb474c1aa5685c910dcd0151a4423915fa205877503ea8fb9cc95516d93f24a4157661fd0e82788deb87b782ad76e6660337495d69a8fa8f4b0281be9e4ce5ef
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_he.tar.gz 2811918 BLAKE2B be260b0d24524abf135193047a8a75e5480445caf87f09073f616caf50b40a33444cb35085b711528cdb2c2ca19412d9f20010d3cb79825049f0eda1b96a3400 SHA512 97c2b10e64a01e54e8129a9c521ce765804ab94eee9bff1d74b1b2916eb89ba116a39aae390ff0baa4851e60bfc025ae35f2dba7748506cffdfe38baa638eeaa
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hi.tar.gz 3010751 BLAKE2B 1f4b2844a6fff481520d445ecb64cabe18e63acaeba0616e0a7f820ec3fa71afb3f8263a9053fe9fc67a45d73826f26d7582754b583fcf42e3cfe2bc6a5e9bae SHA512 10f1db529a4484016b4d286a51b1aa3410be21f8ee167e6d38389fae8c95047a60430f8c267f66607813da39b06762afc757b51567f352c8a8a1c9fa908f794f
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hr.tar.gz 2969998 BLAKE2B a70c7bc9b90f7b2b799206f622f5d87f8f257416e16e8312039707e8c2db4836b15d29f994e594ca7c16122895a8cbcbcc5b2175900a84e1489b27265ddd1456 SHA512 c9e5986e1cf3bc9cddecdb611bb3aa65b759db48ca7d2a378ad4a0004eea6af9319ccdd61c3f823fe6f90fceb6cccbecc22776bbfefd1e4940dc454e06a4fcd1
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hu.tar.gz 3168933 BLAKE2B e787c21e1d1f51c63e0eb580841e3fe7d83b8b09745dcd5c28a362e94656562250db4faa8245fd7de92131077035d0433651a873085d7a16e22080e04ed43252 SHA512 bbf3ff2acefec5924ad5809b630b8d5b9ed70c67675dc512b0cc091a9dbf204de53cddbeb1cd77bc5eec88c2176e2a776c57d6548e93fb4e241aafecd0750343
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_id.tar.gz 2983338 BLAKE2B c695a306f2a62faa3f8cf7662e0c2ff0d9ed4edc665931229f057f7a22c13eaf0c4573d90b9592e59ad4cf2cb9bd8685fc7a256b5607155fea75ef183512823c SHA512 3f76c505834b9d1e3e313942d0a11e1ff82237f7544c77d8d7373471f7edfa0f67ef33011052553df4908370aa5b1d07d3f3b4366c29ca78c1b9211bd885056d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_is.tar.gz 2973737 BLAKE2B 89142742d2cbe4e3f75eb4124911017c577fd1487b37173415569aac8bbd625e33a241d1947ad1566548c1570fd974cfface1c945b9478deba62f18329ce9e29 SHA512 5bef8a03f844484e11cb9d97a04fdfb80bfdccfe66daeb8734e83009050c4685bbb276988ece9657f266e5e178feb6ade2c33898ad1d00bdd96c6bb56f69079f
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_it.tar.gz 3047157 BLAKE2B 3b57ebeb00aa4b97357a9b8ca5f47448f69864018ae0fbb09a78b294cd7f97ea2b53bca9ace19c8b55991e92dc996deeaef4359c2ad2791aede5799b87d5f4db SHA512 ad1e6cbdcb8a4e1c6c0215dcee7b4202e01fbb3f16feac85b50a083e79fd25ff854a920fe8afc34aa1227f7053eb40c728821e3d4a81b29307b0b347bfd9cca1
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ja.tar.gz 3396066 BLAKE2B 3c7a365cd3d064e90aa254ff20d87a828765362449e0e2a6d805ff65da68c8804c5a387e01d476d0426b6de6335ae4654ccc5aa631b56c4bb8c59b334b834f55 SHA512 a66a6666fe8a16b63ec0844b67011497ed9311afe8e457f8d46ef43e7c5abd8967ed7cf563e31067127f8f39c8bcc84084e30c1f178fb145830b52e81a6c39c8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ka.tar.gz 3062144 BLAKE2B cc7a3819084ed0bb231cc8c402b616f4f03d2a75a8206f7046e019d6e32e9353e24db63da74d18c014eb0b388576bc2a49be52c07619b8c94e1cdb156927ce5b SHA512 17b3dd9492bde828e4b93239285babfcdb15abeec5fd64a124302addf671907664c5910e87ddf0df227c14ddea59ca6a6c8815ef45d9339a7e244a52b03282fa
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_km.tar.gz 3388386 BLAKE2B d505cb0c965b6905a59779bc2cd9cd5021b4241fcff19cfcacc7821ecc143383bde85328d44382617833be97d4b5f342afc671b0f92c653f59da6c6e12cc5b56 SHA512 b484f08c413e18151392555434b23817dbea32b6de54b4e5f57b2b95188284dfdbcaea145e2706823a9e722a5532bc856e5f1c1bbfb15e69590cde5ff42ae8a9
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ko.tar.gz 3043926 BLAKE2B 57b7ed4c5ea9f4f3495136cf92b5195efe547c667015d07b01311d380542c0caf6f8dbf8d08c36564a12d869a289f5ade188f609424f3c622113f96b4dfe0f43 SHA512 9498811498146823a1c6f55792e58abf3d521a37104522ea7afb41a8ea7e48639c74a6d43f25b9f8b0907b4453cf409c8d085bb00166614941eb5a902c901e65
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lo.tar.gz 2923653 BLAKE2B 84a7d57d190baaa74e0a4a9b3ada24e29e7f439df0813ef90c9aff46332d6b26dff6ef8e0a44e91a4ba1af692dc82e053b75ab49250ccab1ab8231b3e8089ded SHA512 e444587e00f5fae49aa77f6ee4dc762c74e97233874f4d177278b8775c53ef47724d478308e22fcb240a3a3ee45b1fee647161a4a1833488ef9a32ab511fadec
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lt.tar.gz 3087307 BLAKE2B 17887ddccb3021df60cff9f185ddc153a35fc13fc47b2e42ca1effe2cf8fda2a6812cd9ccb6547bffd2ae1412f07808df522c8e7eab8011a44000ffd912d6f52 SHA512 13b1ebb9632612ca184ffd29e5c47cedc209c59c102746e7c235601a7998975e4332af4045fed5ef719f89f909491cf25cf353d91615cdc8e3759f9d1867eabe
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lv.tar.gz 2968333 BLAKE2B 80649151bfb2700265b5b06dc1c1fa84ecf6c4d4bfa98db794d8f4e532afe4b431d4e2b5c102425a2b5a65a0db8ec7d99386e3877cb9f341e6a1c532b4f83305 SHA512 8560204cfb54e6240dfeccf12fa5dbb7c1626a53bf7649c21b9b953442074e3ae5123789d563eaecf90c05142ad56a29243ba96d97f3a575e12ad4795267fff8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_mk.tar.gz 3007964 BLAKE2B c927c0ba146e524a1c17ac9d9d01eab36038b64baadccb668c3e97c6829074e71b41727c212e12a85e49173a23c344ca0aef2461d175ddf02251be946c4d5231 SHA512 2b8159ff7df044dd0b89519b8a54cb0066a65841320489a6cfac2715d3d48527d13a6daa11a36f3778ed26bede9c07c04f40a13bd9f7e62d5f0ed538b395c30f
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nb.tar.gz 3009065 BLAKE2B 6ede7c3275664119385b6de44d54b4297a9235496695bc69cb36276ffa9864f15aa3c08635232383fecde1f9a0d8c52398a0ae60b76dc3db4d3931255a5bd59a SHA512 144ef62cb174f06a40ffe86c877769304e78c3dfa764d6ff81597a51be0b518011135af2a9396cb6d8455238be2cbd9fcf324fb189a87ae48e3e24a72a59224e
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ne.tar.gz 3210064 BLAKE2B b79877bfd99b470ea15e47f11818b62cc4a7c9f5e02958683091457f02ddef8c71baa214893b16b49c3beeb9d85f01320d844d923bfda47e1c793ef3a8536821 SHA512 1c753281862eaaa33670830d3aacebe607e28b7d10a9f87b8737d673f5fec077f366e3c87c9d9b59a6444d096840d23b03689b794cef1a71cc40308188ef609d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nl.tar.gz 3084641 BLAKE2B 94e7929787797d8481e791ce4e85127fc071a765447705477c6c6d7430a9a52399a0c5630d3681d5196c93bfdbb1e02e125e8a7b85dd40448f3e0a89f7ea7ea4 SHA512 6b5eb6a9b23531816f78dcd4799c48c6fdd5720609cfd0ba3682f5cb131ad6fb4949e949f39d32b142cd6fc1051155ba5ae687ca59594e3fedfb7f49b00491c7
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nn.tar.gz 3012758 BLAKE2B 0eaa01f88c1ece4201082cfd6554c28a28374f77a255df86142ecec87b870c99e3ac85281df403eb2fa7f9a2de13c30c6469ffedf2b86f519133f04ca7a8ffd6 SHA512 effa87e84729ea9263b02993c780878fa9023c9d0170b7d541327d96736b9441c851d217e6975ba862d7cb522e3c22363772352f0d49df4cce5d76e7fc03a0f7
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_om.tar.gz 3042339 BLAKE2B 7e67f9af1d555cd9d3d4d7511cdb4a7c73b015c94b8e4bc35d53aa6e93a1aa708d6db8b02fda00e4cab2f3c0d1d2ffb2ee186742d3d0ea8df23bd025f5f60dcf SHA512 17c13f7bda1c2d5bbb67b67ebb2890934ee5c3a329630274dcb76ac0250be1cc73333967fd4380a27ec7277c8b8154074f5aa1573ffc475979bba051a855ecbe
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pl.tar.gz 3137474 BLAKE2B 68a8da2a129cd6cd8c218c7f95c14f671488668b5e762e0abd94246cef09188611e7ec69e8fb258027315c2ce94792d54a18ad16df58920408cfef1b8291ebe7 SHA512 d5223b4e25470ee6d1d68498a1a137f82ed5f735ab3aff8037d7d88e2c450cd69c5cb7dfb12b4f5f4da9860034f43ff93177dcf18c506ae77a2e3a61528df6a1
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3044949 BLAKE2B a9d9451b3fc13f307ddc195fbe647b58c09e1ba2ea101d67e058f4df7d11e67fbf90374406d4f8ff1a83b79b299278a46a95c5fe1dcf1435b502739b3f607cd5 SHA512 d31b0f1f5b7981591c86d90f86d8801d255e022d7cbd3b69e3d5a1cb027981d4685cb5ee94417c876959053b0e66acc9d5cd1449cbf2a9ba94c5b7ee86bf7052
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt.tar.gz 3051186 BLAKE2B 0fcc9435555c20ea8810a36cca1bfa9371ef05386466c5e21759b8498927f5e42c51ed0f4fbe8f2eea1f487d51affbce5ecbcbc6d2272e0cb3f3eb4e82beb037 SHA512 0f0af9f93d62695dd9b22e2f10cfd2ed9a3e29940a238725b8f6f828932caa36cf5ea1bfcd611f9612053b0d983252915425d10898736c19d14e9e41cdddc64c
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ro.tar.gz 2935000 BLAKE2B 1e207062057fa2e84d81c71220d30dcd81df0d7777599a5a3f8cd39cd95a26d8f653a683632d79503cbaac203a906f29c02b50f56c2abc54174a2cfa5ad23b5c SHA512 960019f2a6b35467bea7b815fc5f1cdfacceab0e1680c4169b60d5fa4fe4636264087fd79e415947b1c73c1e6675b6ff7497c17cb2e710f2685ead09faa1ade4
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ru.tar.gz 3288615 BLAKE2B 27fd02757dee53a17ace00b6c69d3464028bd7dba85fc92c0968c3f6cf4bde87ea5cf9828e62fc691dda3389df41b956c1642b9de24b9bf37eecfe1609b0ccfa SHA512 c717dda6d1a6cd90e172f12558309c4298b643fadc78c062297ebd21af486296e2377449003fa074833c9966c9be7429f1fbcccd3721bf63032bb3af9063a3f6
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_si.tar.gz 3079553 BLAKE2B 7f1aa27010591e757babca0141fbbb376364ec5bd52e56dae20629b89abed0e13a359d9edc4f96538b7b49d50ad855634511d5d798e1995c598182028fd520a5 SHA512 3c1caa5c0cc612d2f2341dfef180b4832f39a14e5555c646d2055e65350bb00f1caa1204e4bca2c2acc459cbd8c04df144b5e5edc200c88a51038bd1cccad5ee
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sid.tar.gz 3025619 BLAKE2B 06bb7f46eff3ac563f18b722bd3c94638fb087e5510dfefaebe6aefda3b1c5f874d82bf15dfca854d2f8479d52ee75fb2da8d6a2095e88a36e9fb7e94060ae35 SHA512 ba37b258c35530a709c42f4c72136749908b418e2875199371a30093b20deb46b48454cfacd79c37ba5e00608d937ff0c4450ca0748bcab0db7231500092d0d8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sk.tar.gz 3083105 BLAKE2B 3080762e4b4fd06ac90100eecabd5cf51d7c6067293dfe22e9a55f7f8155b8a368218943d58a2563cef04b9b09ad01086d9bd015a4b823256682f037d7a3b338 SHA512 a5a185ece946202ff5b314d7cadb87f7790b9051832d593b2e592558070ce7c837a0e8aa2572c2eb282c42cf68e32577e59f8e367c3339b26e41140c20221267
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sl.tar.gz 3023506 BLAKE2B 1c62e627c513d3c7ff35b91588d8ed5c28c82258472d89675399bd767c757a1edfb7e4a7516efc5ff8cf6a44206ba846e66e8935544b8142b0dd3bff5e4d3294 SHA512 330817896016c8d96fcf25463c45ad4b2dfe5a952a17cc2da9ad6f22ab559cbf030825cdd7effe1b481cd2758ae4a80e0bc3eac272f65cb4729ba6b5210a2599
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sq.tar.gz 2953872 BLAKE2B 3e9b8f7c600a76488a17395f1f83194010e3d2f79016f7d13b2a97d0b3dc97e9cd7dd77e9bf2313791886cabb803c64cbcbc2c8ae807d4981850325d8a2bcef7 SHA512 805ca5a56c690370879f71747351bad505d4b79f1a8cf4f0e829edf236035e2e62764493f8ccbee9e29598a6f2c0875625944023bff9be1743fe2b19615c71e7
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sv.tar.gz 3028729 BLAKE2B e311c162a9d9598474748d06767a1688c917b2a55fb6953c5b4278f0c556b1313de9ef83767c2d652b5422d0d19a498d74f5f089e75dcd88999ac7d9fef0bd40 SHA512 ca70d93e07587889fc732312d6473d18dbbdd232b48f03b3fad056254265c17343b505977870e39986dfbb71375ed680250365f1113a808a2b29bec16ff99978
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ta.tar.gz 3267205 BLAKE2B 41c1d18a8f84af1cb745c4816311f6b0d7cea8a67952db53b216b0a5177f24d4b48aae23b3035d1549c2e8e925e4a9ad1f682105494f1c7277639339f7e4706a SHA512 1d93fd06bf43e26519644786fc1b6baec938fd22bc397f137a89c9e9e8a380ae13badd2b2c5f37268996a672938ee3c6bda2932f0d7de404c04d9dd1b1da258d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tg.tar.gz 2970993 BLAKE2B 45296ec5cf5609a7ceb2274953f2c6a29f00b34f09c62d01e0a6bacda067e80fd08639790e8732355bd7329256a1ef1ac996b8dbb0c6c105338eec30d5892e79 SHA512 7138b6e45d57ac911c885388c8e0416cf6c49019f703b94cf2fca4001720dcaac94613331bdc8a44b321e3fe941ac03ee21780ce450ede74556cb37afe0a9f5a
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tr.tar.gz 3090015 BLAKE2B 73511b95cee5dcf86cc183e47cdd99eb1d46733ca9aed9e6bcac809e238d31921b29fa08e162259eb19bb8b6660f46c52b9456211b20ca552207a69a5fadaf2a SHA512 056ca23c0987865ee2535936398205c62c6bb75c56717a77524b8bf53e90205de910f2d4b1bda756a8a73707f42a6ac8298c14108b755f279674fc48339719d3
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ug.tar.gz 2990978 BLAKE2B 45476cca59a2c67ff2ad182145897055679f6040a3dd1ffa6f13eca93bd66a3cbdccd480fb285810b536b81946dae5cde02792020a497cb3695905ca44f2eba5 SHA512 37a4ee803ff3156de0c784ff8b0339b63401f95c78c452ce1e29875867e21ae35389ebde6700d9b9c61696f6262bf674192d5b2f785dff61007611fc0168c677
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_uk.tar.gz 3282291 BLAKE2B 78e3c5d97ffde9fe1e96f82fafd891453301f98430043ed7a5a884ab1b3c1ed1c0128576dd12ed265469888bccdec99d5b83784328371bc8166e9b295db14523 SHA512 b099f8b54ca2e85d88adb52d54ea1c65978a2f8585fb54900827b75278a50875f3f79fa37055376b629724a90e0dbd96dbdb271557e6b6c1c690e5c4f848ae03
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_vi.tar.gz 3020920 BLAKE2B 5de1d571b540c62aad3f988bbf301e612eb84142af308a058322d82235168f555e43e2cff01013d007905d3b8130615fd7e5ef436f06396d267e96d496f551a5 SHA512 bc1cafa725788b6a5b4dd38c7bebc624bed7a6429ba095425e084b128da04a6a78468671dff41d98e0e3d09e907099b7653dacf581751f5bb390f8a527a69d55
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3116282 BLAKE2B 883e7f851091ceebbbc8f20ecb6f41360eb904e71f2acdb4765f7b1d28786775d8ad5fbb3ac6ad1783f34accd568e72a8a71d4c1f2848d5d1ce9557b5ad1c53c SHA512 33491164d492bfe8c0a6f2bf8d2a0544e0420f66afa2d3f2ff1f9f41c29069b6831a7a87281986919a1b490df824fdd5af253ddb84158b2a36ee831e286af26a
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 3156009 BLAKE2B b3b7f713df2201c7f66ebd0859c89e44e19b735aca8c03f85f72471b502abb53f1d2a85afcbee653b8ab47ceecfe7ce9cd0bc50e10c9cf0ea6f55d8efac78dac SHA512 5381bd29c414871c5e12e1b152541bddf51b94b43f7543d2ce9063d75bb7ae0cee9e2806a3cc399ceb9305cdcd1a4660fc64c7749c24b682b08760da5ff44be2
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_af.tar.gz 1323299 BLAKE2B ff370f0e5973995bed1cb37039f8555e9fa0e9518cdba70b6e1b4d57c04556c21b0e26bbfece2f4658069ff0599a465791bcf37270f0fe806e9296aaf33ef72b SHA512 ed4bd347c638a979defa41e9a7ca144fc897f18bcfca503ed1aecd9444df4bcb9dfd80ba67d83e6c5590e3b0ec13d76e60b416aaabf24936d2bf0b7faeeada79
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_am.tar.gz 805350 BLAKE2B 028c1baf172475b49be96642f2d058f62cdc5ae66dc7154c269d0b34f6178815d0bcae1cc64ed1a2ba85500e593cffa71e98bb42c1c00df2179291e80301e70f SHA512 eb04310e717a08ba14972c8a4f333bc864bfdea6b342f1c37f3ced807219cf55a7c53b92b746b2394fa420248fb4a8d0a011298100c9f9e0fa54c7bf4785d14c
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ar.tar.gz 2302926 BLAKE2B ed4c58aa17b99d69e5ce8b98fc5d01349ddea01c221baf2c5568c095de8e8f8f0f3a4ca1083a6d49b0eadf86d0fd4692a5541785fa37f87c30b1a2cb02bf200a SHA512 13dbd510bd4681c137b3acbf943c240d046547e4e2548d2df3a90f45ec99e8836eff9d8437e2439c5c3a8d043b9d4e632b4d8ddbcac3709a8870449ef7f4d4f8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_as.tar.gz 430034 BLAKE2B e7b86b83fbbed13a059dd62dcb9657f5c99a4440f85c1278988c49a2fe81b972eab93dc3452d5f5a4a41cf2a815e5aafef7f1dc5a02f55012d8406a29fd68728 SHA512 992a4b8dd5c0e2bbde60cd793a02b6023ff37d954dbea03751f7dc89cbf0f5f0f9d5329ca8a738211ec9673bc7076f342339f5df4c33f3c3fb4bd09231702e74
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ast.tar.gz 482294 BLAKE2B f837051482c755d88fb569d4ebdae57efc6a8d36d7a8ac60913b061b3b009f13a24a79af6fd9e75355c9444bec0f85e056cc62089c1740534ac2c411544cf5c5 SHA512 ee0b109066d5df45653429f8c8503dcc0226115ec592c16081f8612cd6b63b59754e7b2857021e3120d774faa5738487a4ef34cc5b3a0f15412708388e91b034
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_be.tar.gz 1953624 BLAKE2B 71935413339e2766abb88bf101194547054aba07e3980741b4c8738952934330237cf1aba9a2c53519a4cc690c090da19cefaaff15a98d6026ca8aaacae95f5f SHA512 1d46cc4bcc609307f8e24bf28bb8d277eaed882ba0ff839f1a5395b90ffe7bc26df10d1cab8a6ff112903be735d63e3e4884dc25bc71439b15fdc58bcaa6933a
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bg.tar.gz 2621761 BLAKE2B c1e71922d4cc3b605dab65dcd13f6ce82aeabcd74ce34940192bcc65d162d27c590b07796a66362b45e398ca2af0c539757f7843d63415582e09fd42fe87829d SHA512 d6688599d11d0647709fc4a2544a7af86dce773af7edcf08957f9f805b9053ea112c45aea3bc17e452843cf8519dc9680c5451c61e18eda6e75f491776240780
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 601244 BLAKE2B ecb3c5a25b36d0db0a8a633e8115205fa62689d513981e9af9e8e934049de6cb150cef5c633c8b2ba1b1e457708881018ccc2f0b5c610c6915e40fd0557b556a SHA512 15317fc555823043429f6eee88ff553c4eea09166b98067ff8bf03915190e851876079fd0b98047043dc66bd172d9f5ef16aeb65490c46265a323ad7eb0f4cbf
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn.tar.gz 755738 BLAKE2B 39fd478de2e37ef95130b37697ed59d60a3f671eab79a95bb7f7462f630f913e5e2927b6f752944e9777865f5e9757247e516fb1d0bfca1b96445aaa1faabf96 SHA512 f1ffd3766ba87ee2ae571044c759dd503731b3124e9189181f3d99776344342813b51608ff4d23463dca07cf0c74a618b7b784d391b7181c4a69d2a8c697bcda
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bo.tar.gz 384729 BLAKE2B 61c04844e3e560527a8f72702768125d8689d6bab9d46aa62e0d4829c1746fbda2bce24201d9c81a98eab9c85100bf6cfc0e7f37d4b01d234cd44191c3fc8200 SHA512 e07a4ca02e236dd9bee20bb963b4193b5cae287046dae2c4421cfa02c72060a61cd5f7a9d04f9e6215a31730ce3e6714fbc8f9c598d83e880038fc3295c30b28
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_br.tar.gz 1340818 BLAKE2B 5d71167741d3049679ca7fdc15a2d2a2c7610151aca579bef9dd6683260004758f950ce28183d201c62942b84124aa49c48669bc693c9fcccfd168ed683832cd SHA512 dbb889b7ec8aedfa1786d4720e6a801d299c9f6d79eb8296e37e533f470eac950009e285aa15860dc00aef804057a2b2a1e0e8571ef8d31fda04487575d07386
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_brx.tar.gz 279790 BLAKE2B 35e2cc03d14eee567732a5397082150075c96977c5bd62c725393be0fc025bcff4126cf1070c50877328b9e60ba94292283b32a343a0e7dc290b84968cc53f53 SHA512 91be1a5150ef2ec114ee093c66b83617a8f20638f49d9c680401264a4ee2c9805569588f0eee78daff57c6ac55532447b8b3b926da8d0546f64f9353cdc26859
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bs.tar.gz 556684 BLAKE2B f3f71ca125e55a8ab3e6171bcadf27678555ae3755fed506f3bbaba059290d9669c0d8ba22c3c79abe6ee0836adb02d652a5491190f69a91d267dae5f3aef4f7 SHA512 cb1b8ecb3b0709736633e8a694b27cf3b02046ba13efed63e86bb1d6327771476f8f560928fcd7442e6acbbf1b3ec224e2427da8f1bffa97c854f0929c3c834a
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2390726 BLAKE2B 8a4817e07984878f42186202385736ceb6ca8ccaee49ac17ab0acbe2c819fcea4b5de5a1b14bdd5ffc9f9ad723e7b44cae38ddc34bb56b4d4cdcfa599af607a7 SHA512 ec40bd4d00068532437abd0816b54adb68dc71de22046b7f0c84e64b3eecc6c692bdcef363d62e7282a906d4ec28d55ec2590bd47d39e5d46882e0374e90ec0c
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca.tar.gz 2463364 BLAKE2B a0ecfe6b68472f5b60907268a57eb3fcbcc0847dcb5b1255fc49e65798b4ebf26ee587f32a9d2f160ad31eb1b3b09c357131ab949c5c47b53533e6befcfc3443 SHA512 216072ec21bdb7857b067350ff0f9814ef74f18f3bc73ff20f9c54d7d65000d541c3d07a1766c7bf4e2684c80a0449784a0cc93bff88e1be4b07910310693a41
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ckb.tar.gz 412863 BLAKE2B 81ae83f1cd927a40669487d885b3d9c4d2d897e47692d602a28bc77d64e006550636ec55b44207bd01f5310f0c2c5bc63849e5e15657bee52cd858d876addec9 SHA512 e19910531c03f0de49436c265205ec7f026131c352aeb2d473952fa1a70d44ac6e113b7f5e9ea07249f42355dcfb7cfec918594123487f88269327619f3459c0
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cs.tar.gz 3343621 BLAKE2B faf30d37a9a15ef01b5322998f8dbb5e352a81e3eb3ab540403902412e10d984fb3832979c1fb116d46f7494b618c2f5f98ca5f2d950ab2afb6e1c3863cf3eed SHA512 107fc88c51dd0fb9824fa0f4eb7d07a01e71798b3f8be343611215454af00af376b833825f93c6fbb5a51506d4b062516c8117f0efece00946a0c08d3391eb48
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cy.tar.gz 879654 BLAKE2B b82df477f6becb3b567821c67c4b2bddd4f3845e7731b49c862ee3bd3cb52bdb662c7dff205802d3f8a53218d3fa7ab2771ae9d24258665569eca65ff8af4174 SHA512 819b355f73543546431202addbcc8a4ca7f832c97a14d813578d6e39c3fddb1b758927c4cd049c84c046ff0b525c1e1d3fecb291945c9b1ab523740832d5fb55
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_da.tar.gz 2774574 BLAKE2B 98903310b59fe7f6088a9b44fedbcc480ec105e97c05701f2f88d3a59018a65b266dbf43d210d706f0b1608ca776e73cdeec4125070be863058b08301196b633 SHA512 f93a2ba0cd61bcde00fea2894b497b94312686ec3f2fc11e12a2124472af942272832c0a095c796242a36a303cacd721cab59c9bd296cc8ddb6572c451d69885
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_de.tar.gz 17366379 BLAKE2B 70511325d282b4a99ed200c055e81df1bd305fe3dabe5204e3bc280d3a0a4cbe8d6b0dfd689bd58db591d487dd7c407ef62dae81bf6ac52c6e98b8f21e445a7a SHA512 2ffbd926d81dd5c964651bc5b9b7c2a1938eff9cada97b9cd02d25898261fe6cec534f1cfc1cc80ed0643538ca9fa6548dee4920a40f44c244a3ea5a25d1f91b
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dgo.tar.gz 354097 BLAKE2B 0d90fb7f4e7d80a48b3a3fae1327fc566fc5a323bef96fe15e9f43994f3bc21e6327f489501a952079d8e7bbcdcdad340ee909d6e8fc2ed75ce4df73d2a80cb5 SHA512 fbb779ad74c69a08bb5b3c0b8a6b27990eaab95a96753ceb09e020e3dcaa4d42b15c04217c4fbc0e7f09ed5b1ff995a7858104b1df1f95c48b154b784a4bd1f5
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dsb.tar.gz 896742 BLAKE2B 402ab1ec82de11b1ed94210dc95a7c812394c63069ff68d17aa8312bcc40ad4605c289bb469ffd960fdfbe3b4ca072af854e5579551f5cdba91f2eaafaf1afd3 SHA512 9f8c289861b1194a31e9765307a737e4058a07860ab042951755184a48116963f5e61b644312be76eaba12c3fffcbc18cc14b446d7f77e4c8eb457209f6e900b
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dz.tar.gz 408233 BLAKE2B 8fbee3d2e560b3aa1fa23d8c58d1e3b83ede1c62ab5245ee400603646fe9edc6af86e871a0b02087b60a26c594a15c1428e0d852e7004616b5fbae6199dbdc8f SHA512 74865d56f360a7ed430e85c8724e6e6b935c2e73aed18c7a0ff18dee95111e304ab317f5c7f2ca6c2ccbf07d6ac24005d411800fe1fe71414395f2bf8a5faae6
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_el.tar.gz 2896911 BLAKE2B 3a0d498d5fd5295d3d2568efbf92bcb2a7ad66998580a5801e5fe6c5b3a34a34afd5cbe847fdb1d4b1978652e78c4d7480649e6f1e77cab795d7a1973411d3e7 SHA512 6977e64791d22fc24471b1615ff11bccdb4fa74d72d2f541efe803252f939050ae2eec7ab80fd8a505c8975ae04c7a26af8f0a30876a4d5189e8f7437aa9c5d2
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-GB.tar.gz 6499727 BLAKE2B 3a0568f091c33a6a526cf442fafcb2f653192423946c46a839ff6223d2afd3f2f8c4fe58143e5b0d01b920eb60462b163167edc1f1c762ce96c230f6727e890b SHA512 0e83add01a9e01f84671017e463e8de5cdfdf241b569a3c01c4350baedede98b9004fb07433564b0469b06b6e39458f214573b612b79e963d8fc403cd02c5037
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6012325 BLAKE2B 75d8256103ca358f29fd323caa4251afbd3aa3b5e50a2521d8d0bd8f485401ebdbc5c8c57fa1b7dcfccacff6c7ac3e1571dbc5b102a9a653b7afa5c6dc999ecf SHA512 4fd107aa6cd4d6acf99789508eefbb64acc78531359aa81ea6596b0b0fdc847d9a5743ae496b60ffc3b8136e7afdf4f6894adb24d3eb9635afc942da791c158c
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eo.tar.gz 1140434 BLAKE2B d3fd6e9de0f63c092cc92eae70af9a21d8e8a5eba3f582513889ee8e51fe99d2ad888dc60ed37ac5ba54a2e3c206bce056b391cdb70fc0057622af2d0fb18047 SHA512 994ee87a66deaa2f7d19be3b2c07260330454a7f4e915074d9f0ef220b4cde0237a3d0a5879e51593ad4a84f44ab87c141273163bfcc12842ead53c5d990a3af
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_es.tar.gz 3722972 BLAKE2B db059e7004d90d0ee747b83959f198b130b238a1b3c8f7ed996de13aac0b12fa9cab6d9b902458038cc5f1f542723f532fbba81264a848888764549c67ee6604 SHA512 c4a95ec79fde80d0c949d7412b8aa4c8db6d49d5ef7d316a0394ae93aeeee383e86cc3c715f75dc7aef457edfed8fb01a78918da1d35bb6416731938808e20d7
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_et.tar.gz 1622223 BLAKE2B eda0bf6aca2197d8a244b05bfac31ff6bb9e38d47faddddfc5cc488281b70b6e9595b9c9f63e6bb7ab55eace0dad5167460dc7f2e8759a700b9450c779dfa227 SHA512 45366b5da490ac7282715081064079e5eb4290d4d416eaa40eb2c592a3888c14589e6bf3eb6b26e05f0009e29092730ffd7893c239f7c15481d94c44d00ec81e
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eu.tar.gz 882728 BLAKE2B d4596811c8e7fafc2a23714d02073b1a899b32a7b82c84a4d88f51a5e01c36f9a3514cf52103ee0cf8e051148ab7b4445fbc436a9970a6687712897ab25810e4 SHA512 4f7286058753fac2ea10449e831cfbf0725b06788d8ab429f2cd78ff36efd776fac6787ce5a1e883bf858ffb40d96c4cb38f0cc0f85e3f38411194eda1cec13e
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fa.tar.gz 672767 BLAKE2B f42668109e4daf28f95c0b2e6f67bb9b3c99d1e7f3d5eb1bc44f2b69cc14ed8900516fa7c852e8aa6232750e8a23a3a9e53db6c1b275af10db0507b58440421a SHA512 2414d9a53d9cf6151fe669d2d4fc2f617d73e2da6c44412096ee8f0c08722a8af39e5de4289db425d2151428edf63166e0fd7d5b23ea220f485efff557ef4fdc
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fi.tar.gz 743964 BLAKE2B 7153d59676e544b38e8a13cdb810caeee6d6cbcd0ebfc41a2491c03eeda3bc5621719d8569c470f4975a65d04239c417a9aaef4ec4aacf2063cf7100b2b94e94 SHA512 0c198795c0f3b114b930854b3c3ab636642b8861d2562f85640bf11b18c66f6bf41050d82428c0aee10dc362fdba7b439e0201c63806cd5a29f2d77d4f97c2e4
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fr.tar.gz 2827433 BLAKE2B 77c3efb50f786035ff05ac433b70c4d0a6c96d7b59b1112bc9003d6cb4e652bb69367855373e6c18a9f1ea433620dd37cb002b23ebae80e34193755517e179aa SHA512 b2a8a8a957274ddea89be6deb4a6b07b185c286787be4d7bc34bccd0cb0a4e2e0dfbae4e2f0547c7481b2cc2190c801f718141f4f3b0dc6536125fda1616cc87
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fur.tar.gz 167001 BLAKE2B 4d00598367b9bcca25eac9912024e76832663427fec9eaa615d4db172db8728dc3cebb214f9268fb7a7201a899f9b0f7cb3a83c0588e261f9587696cb5c183d4 SHA512 52a72366119cac2647a6d6d2c6dbe534b8566a2d590bd8ec14b4a518ba7df9d35507e8e189161f9371e0e5df15a031e2a3280f2bd3d892c1e41fcc30c5d33007
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fy.tar.gz 755703 BLAKE2B aafa7aef8b654d7a5aa286a9c260a5843126e089a0bdb2489348d6febf8841e4d4e6e420b5b12d2a6514bc194090bc80e170758ca5914b78e91167cef2711cb6 SHA512 6a469b8e8219399e416b664f1d3088cc788830f6ef89f921a67744de5e904ac5fe2fd1f7123d2ffde8a4afe4b228305a2d438fc3f66fe3bb3ec5128c09608ca3
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ga.tar.gz 577472 BLAKE2B dc375115a0c9f3d5eb1a76c3acc0057ca215c6bcf4db7031885b484ad3b9c1a7408f94f0d2bca069bb141c2ffd929b1ab2a8595b7d92b09d2a331671d6e26637 SHA512 c702c42e8cf3e9059e3942ace6958ef3b62cbae58bec6c0cc5bf87a0b6513c986e37c6644018ea8ba848ac7f0ecf4e929ce5fb5a9fd83aaf60492aaf7af7fe99
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gd.tar.gz 1548339 BLAKE2B 07d8989654cf6ba1b1f90ae250e59651288c9f392214662a11ef8e25abde6a20514e5ffcbef601bd36aa9195f28ee2958b343148bcaa3c4004bfa591729b80aa SHA512 8c8bea30fcc0b4c845c4ad43eb08ac3c698574902ffe3f8194e38cec98d786d1af1d57d70e7dd268b2459f2e8636a9c930a5ff91832e5a3d0b5baf64e16e16bc
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gl.tar.gz 2556828 BLAKE2B 0cc73e048bd860376624f06dd759d220efdbf4c7b99f2988a4da72d0cc701b6591751817ba4753248013e9599143257e885b7731685c8c0aa15094fdca7565fa SHA512 bc3c6f064285c0464639f090da965253d6c34f1c3d8678e0876c2d0d083aed63d9261d0c04ab9b59c3e012f9d478734183ec96cd2af08001c17c4fd08362e8d9
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gu.tar.gz 1139219 BLAKE2B 917d9349fff5f842558486aac02d30dfae35dff0bce0dd33422fc51cb6f4ba2a615719f584a60287d633307a62237456c3aca83818320decb01ea19a64fb0cb0 SHA512 bb210ef1000ebb087ca730ef003b1e9ed350b9b98640dff15979ee51750c76624566912d9e5fd115ce8d2cdcfaff792a61a46126f4137981805062d68b3a719e
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gug.tar.gz 408846 BLAKE2B 0b19835acab1ddd1dadee12de6a24d75bee57669584b670a8e30ebddaecd709efb768757044b3ac78957af03adff64495d281f95279f6e270d6be4cfe37746ef SHA512 b1647ea47dc6b18fa64dab0c429d18f47f905e6f80f412e4a5481aaf17e926e678fffb696d8f4cef3c609a2d33e91d7f2862c26e34b3253a4f17d46d28dad07d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_he.tar.gz 1451646 BLAKE2B 5c8d69606de3caf5af1bb5a6901a22850d0e19f7a1024c429942c75eed8a14ff91a8af11a1f6be025ef310f84f3c20fe76336c46a596e4baba1ef0ad4f2439c6 SHA512 df01d7504b0dbbd3e62e39e7f226cfe85fe127b902890212e8e010164f9db5febaaf148a78aa9f72f4299aa7ab7c2a3daf1602961b44c4b72b72f6cee993f116
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hi.tar.gz 465779 BLAKE2B a356ef51a507fa8cb5702ad69225be68c6f1ed0bdbc7034ddcf557203e4a0bd540dff532473c715aa598aaa1adfb1449d36227a08da594a2f32e6fa6eeca0568 SHA512 a3dfd433765ce33d99a4d9f0b1a8b8fd38f18184252ebac8833acde3297e7f8b0fb6b49cee657b3f39ecb6f22619c5f85177d831d743895d0bdef7dd342a782e
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hr.tar.gz 832898 BLAKE2B 120862d3b70a1766ec27c6c3d84b958d189ede9836f48b8df72c1f23f728cbfa8fab80962089094e9d51be475a270db008218c6ea8aea35f92c1c3d265b622b4 SHA512 c544a03011b8e15b6151da0e6842c1205e160d84361bee391b5719d6f40a8589bb294ff500d76f203353d7e47ad89a2c9f7fa8a5d0005dce87a8be643d61200b
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hsb.tar.gz 893527 BLAKE2B 30b4927b634fbfaf644b2956ad0ea9e910d06f785c48eea964417f3a4fe7d425fc08a0b649caee402154b1512cea2f2662778bbfaa8e3c4dc181f4b0bc0bce50 SHA512 7ada64adaf0ac7304136245a3da6ff9d061b7d8005fff167f96b686dfe53b3c8bc575becfb11cf08d817e6c7fc50539d30f562fd419ac37dea62648c40f66885
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hu.tar.gz 2700561 BLAKE2B caaeea33b1161bd31b12343b025f9cbd1c1577aab44e649fb4abadf902df2510b64141deca4545b359ca96cba913a341eebf39d7fa19f0028d68b515d3ee9141 SHA512 4d766a2d47f13bb5931264ec1dce9f16cad94b6a37f7b4979de640a7db7e5e1564b0d16adff0c5f6a1d2b9a1d93874f3823124d159381d846c9c58b9e915d8d0
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_id.tar.gz 1664048 BLAKE2B 955c7e19580ee5affdc87fd93f3197fb01622980e8089de9cef48a088ddf85e9b8d7f54962c7154785032b661d8a723ee716f0f0d07dd2feefe01ed566fbb5f2 SHA512 32f0e265580963a93dc0d5b6899c55f92786fa060e0b3f0ed0134e83ced0b0b43cee2250e4ad2bd0b4f86820eecd2f811af204b72dfc6439c9571b0423dbdd00
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_is.tar.gz 1402174 BLAKE2B 2a3730d731ccdc6797e99bd88138fa25e16b9495dec33d371a9944292c97a77a0b1f01467efe155b8a3f18b607177b7ff3c5bb1883c1ccb1501cdb56c9f55a20 SHA512 d1b7f4ecd9593cd72fa5e83482ec49781450d1156731f3e2639c91dd22bf902818c79481507598362a945606c06e53eeeba44ee325078a2932f8cabfae500a2f
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_it.tar.gz 2141400 BLAKE2B 623d6b881399b36c94086f5671df9fd6f401b08d89a734ed7c1c84c73e41fbe39dac1a9aafb1e74c0f9a863d8738d4d72a5d994c59a981ff107c39a72ecea62c SHA512 3d333289d017f42fe7f60813d04ae71d39b6394a3ab7c1c5f059a5f8d18a955f584868aee2a852b262ec6a0d5dd2b6c7ce4d55cde8e6ce149dccf062bc74b5d8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ja.tar.gz 849483 BLAKE2B 221861a7747fc791798c813b64514aca1404a34b6b6f7aec8185a227cf276a01143748d45cb1412573dd2355b1108c0e48a559e82004b4563877530041879b39 SHA512 6bee1debc76a7ed4a3bc46563393b94aabac4728f6eaf6fe97309f0c492eff57941d8a1e7cf90d253addd41b6be8c6a708b38bc77ac5c7cb3d69b689b043a446
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ka.tar.gz 330439 BLAKE2B a56d443d96951542edf5e442ed68a0e338e8a0415a049aa6241790aa512b86902ab9bd9a638b135d1390a41358da93488d8f2fbbbc69c9654135ccb742452318 SHA512 04a2ff3c290c3fb78bbe8106059fc6eb6e37770231174b042ed570ee6dae24d678e7b626565a7b9cf3ed73d4db780c7ea6c980161c87170aa79f1b0a0d455b54
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kab.tar.gz 509168 BLAKE2B 45bb4ea9eb29af37f7c7bedeb476f1325613f633269f98e5a1b63f9fd1c3de052fdef4f9c161e5efe702ff5fffbd99ab1dc41a2488fe4e0f9d0052f6e79d9da7 SHA512 5876b0a782efcee247b10adba7c04785665cab0d39ac019660fd162ef0dbe949144878c71c0e57cbffb1097603277d4860e3a8b44a0e06d8d548676ed5b8efba
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kk.tar.gz 891784 BLAKE2B 057ff99b5233291e6bf332a4275be0c8079acb7f6ccd41bfb249b87b5ae0b9eb0b7f3bd37afd588fa01cd13638a3b9e16565d6500eff56835d77b9d492e18ec3 SHA512 4ef00e4952bc2f1b68edbd8e5977a798fe2b0a544cec4b5aa4e12d228bd3e9466c3c8cfb8f1ae24b14dd50f89c7b8acdf58c3752ada332b37eb1c3201afb70f8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_km.tar.gz 689695 BLAKE2B 96f6183202a6243d9024ad84ab9512d9c121f73e3e1360f7e4d36475272a35a71b919820695bc83168757e6fa351ba1dac6dde41ff2d94c0e660171cb7aaa377 SHA512 777277fee117e188026c65ab9e0af3f5d095e1697ff178cd5118b6215351d67c5ce7ec8618c7d34a109c8ec920bd0adaabda0bf131df8dd78343eb73bc67d3e1
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 266497 BLAKE2B 1d5ccd58aa1691a0e117ac3dae528fcd46073e8def080a0ac2f31e71ab033612c1162766f40bf4b719cd86ea757092dc34b5f817001bbe7e2463501223060704 SHA512 98e8ee30fcee2ee70a38ec6d36daf5701a89cddad373356b66db2ff4e0c373cccd29822141499c3f6276560daebad34128787c2a1e594db8dedbc917c1705f66
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kn.tar.gz 467555 BLAKE2B 1ff6ccabe6c86597bb8b6377a42dd67fce8a0dd98eb268b58890860fd52d02a2a1c10369ca817c166e561bd16790869582bb764b4e133ccbaf48b2389b972120 SHA512 073865bc315be06d98e4cc1d960e5e79bbfaa265c442a9e1ff617eb5f8abef1225ad75d6956753e815f78fd8593d8771cce8a3ba91db731ff5e2575d8bbb3eef
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ko.tar.gz 1481575 BLAKE2B 80e1a90fd9765fcbbe8b12fb4c8183018070f7f436b991b223c888843c280466fd574c4d95ae46440657ab9d87432adfe2bd50e5a7a5424f81473349a4c6efd2 SHA512 131f56e5517aa34c55b9f62a119c52280381ade85e470f11f63639072f030676f8d254ff99105cba75eb1e37a63756049d8b1a8961f6a27640a362be9de7c331
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kok.tar.gz 333358 BLAKE2B 3c7e0ab2f988dad1fbc5b007a4fa83002d7dba775a53b9bc90b76129cd1c27958d68bdeefc3db0961e7e45cb5d1d137eddb6059993eda3e500a8eac434aed6e9 SHA512 9999ced4320f80070aeb523fd9a6f91d996ecf89085f4bcf551138c4715ffb908e511191b12b63feadbc1d7aecd7af5076ab55224282304aaafafe7459bb3c88
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ks.tar.gz 267561 BLAKE2B 9e179ac1cab0bfbae82f40b1e909a11ebc9dfd59af5dacea3f50410d9a184f75bd67984a85638aee2be34af2107ac1e42602b445d3301829d32b7b481905a275 SHA512 b7de06248e1a26c5f9e4162e9feeb148110d1c6c34b4f43cf1a77fdab17d8cad343e92a7c1bd3cdfb4a1d2f1fbc32daadf4d6a118f9f19aa426edc8a577bb901
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lb.tar.gz 125361 BLAKE2B 223e5b2a2e81569f2f79b90f771bace50bd754703f3eac8325f1f0ec74eb0b4a7ae293dabf935a4d156af6c4e83178b0084b6634c4b9cfebd2560976e754e1cb SHA512 d26dd9427e9e282097c92c66dd61b907b7c2c9139d1c2355400e7571016d5441914ef6a0512e49efa4d897ce0fb3e072b10cdc1f9101700dfa1cea360e208dd8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lo.tar.gz 449719 BLAKE2B 80b7336b3d1477ab6144828ebbbb5d893a140479c30c2a6193340e14e0e99cb7be73d8d2fe220c81cd2eab1a0e85427d8396583a1a24b2d53bf21c1574688391 SHA512 322f86ed495119e72842928f1365a55b9d33db9dfb1b31be497467d76db4039ebee3c2d446a702f99880377c947eb34e28c43cb0df1eccc7d51f0e9fa89ca3bb
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lt.tar.gz 1065314 BLAKE2B 5713654d4ad1c39be0cb63289d17c24afb05b568512a16dd888486680c92910b18b8040caae78684bb6e340e7967ff036bedbb155a59038331c3b0695435a348 SHA512 8fc52ccf5109eea8c18b01eb2dedfdd4bb53c1361b78b0e87d153a566fd9d160e2d5db163cac557f54a06ca16459d459b8d367af6808675063a169d98560ddad
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lv.tar.gz 979957 BLAKE2B 4fc9194f775e5d979adddabbd849993da42927118327e082046360e4f0cbf79592b9dffa9c86e5db9388e0965dbdb08857217aa82e227086ccd1928c5dbd0a85 SHA512 f45a272b18b7199cc824ce35420de16afb74ea9fa781ed03be1fbd025bf4e818983dfa74dde082e505a126806bc5937c42fc74a77f7228a9bb37f21a8a70d476
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mai.tar.gz 271489 BLAKE2B 1381c372886960473734b5b82ec035e1d15633af6c125568ad1d2ac2534778aa4eb957fb063f725ecb5d1e81030fce9ba586faa84ed02905fb97257cc13a3f02 SHA512 4154220127cdf1e8137f6fd297f7212c380ea0d7437dd1c36e1fd18399fe2c0891356d22b3759c7725d1b8f2d8caaa0c5a28e5156237fcb12f366321f2f671f7
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mk.tar.gz 378940 BLAKE2B cfec8f0b58e8b302c204e5ab14f434ee82b99c04da4527edd6134ffc4fe917bc673b88d4c2d1fe0b49aa5d0bb50580458314536bf6f6c7c12ed983f361e71eff SHA512 5d284f3f74b1caa0ec3dd1e0a3e35a6c3bc7e63d703b89089c2c73fea9f9512058f7061c142f94df128ae684fb6a167fca2a2c5722135eaf35e49fb91cc58e3b
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ml.tar.gz 433827 BLAKE2B 1897fccd4cb53aec0921dc0966cc9dad22399d64a0b4f9f47428484a0003f459cd73bf9533e70aa41b48ab3bed47400f477c924921e85aa8686cb8de3b12442c SHA512 143eebbac8d8a850d115ec8b3eb89ddeaac3b30048bd3642b2b37bf8ddd380c3b5b8bf07a56e75633ca667159eac6e5ac087a6fd677190231daf03c381c84579
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mn.tar.gz 2321369 BLAKE2B fd7c82f5c880d6b5d5ba7fb9f6ce3c800b8b3cb22422fd7b3b815abfb0ba32c4cb67629cb79c31042fe8949406e32221ec3c2cb8c62949eae4f220fb9efbb801 SHA512 496d2dcdd9b1d4242baeb21e0f5b84ee8524bbbfc5ed16c0afbce574b5a46646df6489906a773fffb9604373cc0ca641f1cb246dab65548876339e6d3b6c2509
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mni.tar.gz 327129 BLAKE2B 3720ea998d643c46081604ca686023b0e3a9bc5d636b9c24213e10ab72b4d678da733758f5166cd75976859c332da240385ee8d9577f7da79287bd0d79b512e9 SHA512 c08d51979a103b9c2fd4f666ad3d7a331e0f41c57e53665f0b81def54496e4bb3c5d67f387b86c4ea1b1bb1f2dbc711e7f54d90acf668bf04ddb2c04737c966a
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mr.tar.gz 463420 BLAKE2B 3fe6dbd09843ce88e5de48a8717026e6e5b25ad181c494572893da0116b03463abe01914d2078414c12c036547d0041bd9c83ac2b71891676ede582fb2f24bd8 SHA512 3b478f48f26fbad85f4c9ddf0cc558963fc121c2c95290d1e164d60d87f80e9381ac4adc4e525278ee7dd1ce23e9dddb399b4f577fdd05bf694aaa3da2d131f2
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_my.tar.gz 375440 BLAKE2B 1bb5477336a000fdadd230611b3d35533271cf0e823d8cb78f2b1f7824076934a97d4455b0ed57b6169f587a21e978aa1a6f439b7a1f94d31494ad629e2042e8 SHA512 afbe3c89dd7d5eece00d4c9be9199d3b32c872f09f2f2201c99e4806da22de56d3178d71afdb585b0fd8c1b2cf3a5373132ef867af164a7f824a0fb52577078a
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nb.tar.gz 3541169 BLAKE2B 3a16f669d8f792b8080cabb72f69bb3b654150d1f5b9aa6217efc3145af58da500934bcafcaff9884c7c1f5db8f8378f62a877e1d275b274a5d83f8719d82a5f SHA512 b483de5914f876ed32961f8369108231eef996c96eaa9a8579240b225e7e83488a9547acce6d156f5744b33521f3270765f8b261279ede4225c59a75b40c5ca1
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ne.tar.gz 846849 BLAKE2B 42a9534650d557ce8316538203dc0d2e8d2cdeae65d9ee5e04bf99629ed20c841adb80656e56ac659f536b7d5031ff42d48d10a25a5c6937f552d5f8c5e2e810 SHA512 a3603d6dc1d29480400a75beed3121d97eded30452fb01d5e9377575e1b4a6753cf974e095a6207773ff679718be9003212e8995ef61b0b64a92a0ef6c433adf
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nl.tar.gz 1646241 BLAKE2B cbac2c3583b88f6912ac99ed381caf8b627687bbf198faf4a86370e048a7e34413e36a855a5c899cce038a4a86608aa76df65d01ed04b09e9b0cdd20217dcd1c SHA512 8913c3332805f62c2c3044da4ee3e8deb8903c0901f1aaac80b4f84e65f7454bb861a5a6e8639343d231f48b65d86a7507ca99b071860187ce286cbd25b75620
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nn.tar.gz 3543455 BLAKE2B 2ffeca005d8b1daf925b5794acdad7b85565b7109a3c1e772fccdd7767e90b3303e60de796244839212df5822ceba6e4744cff685d7ece1fbc44e7b8820a49bf SHA512 60a2e1375103d9d12966cf060f9654186b9ec05f219e70f14cdf8cb729cd6c2c6f8a4e6005221047bab588d2b6db79001065e52cd41c8ea06159586f8f600381
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nr.tar.gz 228304 BLAKE2B 8068aa18d75008e04d74c3acac82a62e3facf4c12223ff008e58f4129467a6362b77688f8e64c2ebbbb288e371e2e2863c391b63d22594e8bcfb50a5637952d8 SHA512 3851e9728b028f94181478eeb64fcc06f9c57f9ca78e2b848b92190dda911eae031997e41831b328bf71e329fbe9ea887479cf1cb13d54adb848fd73ab8b3960
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nso.tar.gz 260139 BLAKE2B d8c89fc500c9df4b7882c7231dbb04cd14b5a1d038e9327a85d9c839eefe90732f8830a85a8d0b3a7cd047bd16fe39a6f398ac0b6c4c5760edbe247753a19668 SHA512 0d8712a071501aea68814bece23ee05ff110a074238aeafd2cdd5d799f2f1fa2c861920b1ab2e982c43cee8dd36ff4f952d22103ee00c0949404fa739df66f2e
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_oc.tar.gz 1166267 BLAKE2B fca34a60352aec5d7dfb4ff4cebaa318a4fb23cfa413ecc09ab74c56fb4304e693ca684aa65341a9d37ee8b6693a604f5d1a9cb4208693a5ad6ea0d3f4bcbb19 SHA512 293e9d4c35a4bc7021e5caa19a8ee5d5dce198bed3cf3598b8a68bbb041272703daa55f458f92ca346942516a91a89a16d4c74ea567c49c20f4c86b1288408bb
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_om.tar.gz 389374 BLAKE2B 12031622af888d432c54b843990bc3265fc908b4163825b505b3d4bcd47e43973e21a521cb0a798cb437727e1b117e6d786c4816aba4c90e06e3bf3af75c0233 SHA512 bd1f75df993e0bc244d1b872bdf83c141b2a55a8a817436f7b717f0f1356a3080b7dd06f643fc631d79f2afeb4f87cbfe67daf6bfb6e083497b42d1dcc4564dc
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_or.tar.gz 481536 BLAKE2B fc92e47a57d0c4537abf4bc66791d1cfb808a4264e51126965e060d951a5034b42d9145dcdc8ce55478b08aaafe7a3212f1fea0e180df035bf3a232bd10bb16c SHA512 86006d987cb95fe3a337dee879cb8956e13dd4d2fd4470a73fa06a3b835a49fd81e02eda6f726ea72d3a7b9826d6cc95032cc766a707d794d1009d4aba6d22ec
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 429392 BLAKE2B f851713ff186906521f50de720bec512d7a2d19656176942b692cf62cca97ba82f2ae9a84cecd015eeab9387543487f3f70acd804ae4f5007e2cf1b54e2a48a1 SHA512 dd883ffcf85cae72eebefee24ca1bfd0b7ed9de3f2d1556a86340b286757efcaeda85c52e73001557ba0a2bc04d16f252ef429c94cca9afcaf381c480ac399a3
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pl.tar.gz 3046585 BLAKE2B 1c05ace130158d21aef751e69d9ca92011dc5299859df9d36c0379452527fe177db46ba47d8005aec4bb787318c6b3c28855867754bc287cc75279c31b5073da SHA512 5f1b85ea63c0edce18193c99d78f056043f825da0518865f1d07cded36ef05057202cd9be87dbeb668dc329f565f282729b8376c0fa949258ae3d4d4d271383d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 5741351 BLAKE2B b356e4b4188b05f881a7704a46ee76b68a8d56fb8ac3b29ce33055f31ff4a5d5c2edbc2a9a91d8c54b616b14745e385721e6341f4858e278c83306bc0f73f07a SHA512 9e01c04bdf11ccf7671be49f4e63b707f25128f362d15d49c2eded603772fe5191cd36997ceb6e239481d109f0081cbf1463a04eba890b1483fdec6645d41527
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt.tar.gz 2388456 BLAKE2B c9625902d7c64ef045151be0e56b1b898e32cac953387fae5ada46e27601faf07c6db0daf55f772a6e595d64f9a05f796407690b6ad55e94fd52c61d1e87bea1 SHA512 617a3eeff09d3fde83aefd08a6b7b43e4a39065a0e7892abbf08d838b728d8954869e742c4118c8668e3629abc6bd51d168de3e2fa394526322a3850227fcef6
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ro.tar.gz 2323844 BLAKE2B f4018e1f37008ec7f2fc61c90df2b7551fe8b022ee7dd179fa2dec74d117770bfb05cb11cdd74564c8096661ab7be40a63a9beca4b62fae99d63a29709a18383 SHA512 3798b3d41340bf3d169c4be987fb663819430293ba80a56d7d038c08d3fab418fefc972b60ddf194d86f35493325a0d9502bbdf8eaeed2c3b916f9c89b2d5756
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ru.tar.gz 2241128 BLAKE2B 7c6fc394a504f65fd676429ccc6b04486c959d630e47035355dd9576d4c6943b3c75e0b8461055eec16ba858dc51bc8956c4eeccf4a477c10c3ec4f4d36f92ad SHA512 e76c49252327629c7629511e737a7b7f7138946f16f1e316742bab7baace8c666f085cc7ac2f0677df9d7399505009114af555ee5074cb5f5fb0d4c99259afbb
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_rw.tar.gz 280545 BLAKE2B f988ae8cdb7a5500059634918e8ae377842853b8db6342573c9f7ed9901b6323046efa60dd7291c9b31ecb81f39a94b59a649eb301e40f0262e0887ab147f9af SHA512 26a0cb85e4480a446b5d84e0930e11b90ec678c607fbdd7fa79e43ba78337ba95201f395eace705f4a876422abb8f658c6e1477647bd4e9862ec683209dd6add
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 364813 BLAKE2B e90a4577c9d25aea67ed6c15af93b8553f514e963704752253dd9fca2811da700acf4ccea1cb1997835b196477cc13b6d487a8fcc8bde19352ca81ffcd1503f0 SHA512 37f92bf627281ab14dd4c3f5bc533a11cc2c63ba220b0b52e8f7c1e6dafcaf2eacc904ee010650c19762fb1c081e5060b50e7d8be06cfd2bd135142d33555b89
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sat.tar.gz 415975 BLAKE2B ad571ee927e4599c0319c40229a3b2288bed31ba8aab76629a60787bbaadd4bc255e2f22f74a4953875e148baafd6694ca68b27ca624e60c042d124981014957 SHA512 53c47f7de6b6d96cd003fc4ea60c6e5f255a1b5e6bd80850613ec26535870fb325d3e5ce140eb6827cebdd82e2f2c112e70d1fd2a3bfea8bbf9ac2523b126ac4
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sd.tar.gz 345399 BLAKE2B 53643f10b3b8528638f9c51adc005fdaa2b32606aa055f9ceda9f61e734faeabb6f3ae576a45543029fc20151636b857359c80ef38779e5141d733d00c90ba1a SHA512 4f8ed7bc9939c6bbfb7aefcb2778cc0c4946e410a4e24c56aa7ff1c4c9885f5b432a4b5e7a173db84afccf18c021261ad99282294ba8c2a8f865a568c1e5a86d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_si.tar.gz 656994 BLAKE2B d77dfda9f31cfd457987855a35dcc8934523a79ae8cf04090e8207cec20bd01d4230d141f3d1f2e7748a3514891cd83338fb817856653d640bd076ec9c3f4d21 SHA512 22c727578fec9166dc819badc70a4fe45c6149c75958f5ca840b183859ff363c405550b280f5a6a94d213f9fc4307933e9d8d7f1a4eb78d31424876a2d607ff9
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sid.tar.gz 418346 BLAKE2B bc9ef353e208951a15963293514e9f0c71f19bb0f87a86f8697fdd1634ab267b7a15b09d15117845b591993f5965005567e1c23930db42b49c27e883d2aaf1da SHA512 0e3876196e5eb1b02b15d01931d6111be9ab156e215e8a744ecd95f3e3f24a3cce32eacd3dd982285a9e489030e568bd2168fcb20a20114bd5303ef3fca29665
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sk.tar.gz 2104647 BLAKE2B ac60744155145f552adb340112a58e8a8b4a32ed4aed992d0413417c63e6ae5441e4352aac3631a88cb169a10100749eaec26a36192814636593d81712a20a04 SHA512 2b330bacac9f3166458eac3de533caa8d0aebd822d52c48593562d7f4c6ba68daca7311f50d5a5835ff22fe84063926c67942edf615d4ed19c3343322fd61886
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sl.tar.gz 2497761 BLAKE2B 4a9d45d0dabcc1d599b624cf8be84c44d61e086126649b5c93b682c8a76851156746f9314ad35f5f7930073a7fd62efcdec07861ca7844d7f8b263d0e184f467 SHA512 9bc1161d0b202094e2b5822384ee334eb4e787f9ba3d03d8cc4967e0b5b808c09b7d581492b9df5db73fc16c796b17c46c53763192918b8ba627c970082ef26f
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sq.tar.gz 1078050 BLAKE2B 8911526dc7af431b4c10de26691e9a92695973735bff4a704f8844b75296d2404ebb6ff7bed2d8a381ae165e135b1a309f41c73af81e3665bc8c55c8edc503f8 SHA512 f2d61dbd4b3d5b2eed61e3f9516610d895b984247c400ceb052a8f699cc42bf17c4286813b6a7f58e313d6879b6a2039e3206598f4a854de328d8265459fa991
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2292419 BLAKE2B 65beb722ac850601b41aa258834abe24339cc18dc4a36605dfcb2f6ebd226b15f766066ac2e7914ffd889c7c5e9cc18bca6c51d98bd66fcca143614b3f131710 SHA512 b7576e2f200decdfdbce09da6ab16fe32ce1fc591124cd4f3442f73b30043e635aca998c70566bcefc3134425e56799e846f856689c8e2f11ea8f96510afe154
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr.tar.gz 2701478 BLAKE2B 5717dbde7ad46b5065e40772d9bb3b7fcbe1f9b1345578acee69359adf781a2070bab2e90d1b70d47fe8df5765a189373f5123a74f3712ad7963b97b0ea05cce SHA512 9e4c0dda30671e3ccb5d62bd9d4c02d471c7324f4fcdf412c7bd4c8090576ed67ab763fc80c126c89723848298ba1c181e32c4c669b02fa890f057825a660d9b
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ss.tar.gz 234611 BLAKE2B f41fd3e32a8105fa58a50600b845ffca14c6ce6bfa2e29738579398c7f043512dff840c0e630a7b75f8838eb07f5cd9e5e1fb9ad2e57a31abd62fb40e89bea71 SHA512 6d858a08a4678989556fd8a2f756bf7ce5c2a168060673f38b8fe4a6fbc172a06ffc6c4982e1f7c90376e6bcaacba8b4107ea25c9019617b22ae5ec80e790ee5
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_st.tar.gz 229601 BLAKE2B f183274f4aff76f42d67407d7a8a5753edb5a7427508c40a19701795080ad65be1a99d6ed0bb655ec725c7076e2f7e5c9f8e4697eea3e18c8fb690e866293c3b SHA512 08a56a5778dc3599d0fd3bb35b2839c1b360b91d389970a50a420288e140eb8146c4b23db4c12706b9640041699496fb9a9c46c274b1388044420efa3bb4fcd8
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sv.tar.gz 2632855 BLAKE2B 704dba1ef1f35c2b8b2b57780a7bdf894e74ac21c090a5eae131f4e5fd8afb5476aa5f41db2ead041aa4fe5f4215f87e715ebe3c0aaddc70d512e9b67a983d16 SHA512 d85b4dd0f83a393a18e905365aab6deee53043526381682dff777402d1772f2b17cf4e07f47f3778f3c8817f440454e5edec9b22103633a1cc3e0721dc526d8f
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 257509 BLAKE2B c128d26eeb8b64e06a7ae8c5e8cb03bc41505bf7a98dd5a6767a81a360de145c6a86066d4672661007797b1ab6168fa9292d43c73aea4c1f1ec174d656ef8ed4 SHA512 194c27029080159e41b21c9deaebb9dca916b8edc57d2ce3d6803d9d514791d3e0b2706a9263e417c85da322d9017ddaa3763b5d083cf90a5fcc1a14bab1c87a
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_szl.tar.gz 586390 BLAKE2B bc17d7d15c0014f1d35e1c843bd0b7b577b9c11efe6e672a2919b883db0a1e9c838132cdf38f709aa51187fde694f4ede05ef133d543a558489081e9da3bec91 SHA512 f15e485180bac6a43adb912ff392faeeef1bfb242ce7e7181da606c5440144d3788b60567c67329437c680f578ea751f4badd6d4a7224eb8ccab1a07c58f4cbe
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ta.tar.gz 616881 BLAKE2B d59b8225d2c9bf220eaf3934ad7e2db28d844d726ef1a82f08d6a233a6ec6c259777d2b0199428ee4bb40e0ccb937be8c8c0e57cfc071cce9528ed1110fc4726 SHA512 836f2418984b48e99c482368f6d2dcbb818eafbdf3456dce8f2beb81e309201fccaee103fa05476c5951117098a88f703d945830fbba80810345ab3aa7aaa923
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_te.tar.gz 973300 BLAKE2B cbf23c4b5f8a7032774896848629334553e51285b00d70850ff9c0b98fcc7a586ddf935cfeda13f01e69bd80868bfbc2f88e8a46824a10bfdaf542271d44683e SHA512 56b0bcac253ffb0ac87e0278622edba0bbb26e24558e853ae5d3c7b088068930af4b3d2a0f0fc5c1a0e4be7d042dc7f7970745ed7bdbeaccfbce129902470dfe
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tg.tar.gz 312579 BLAKE2B 4adf49634555e923e33c1f69ebcb212bf00fa1f856902b338c5549f581ad8f67d20e9c7d4704f45f8ba386b41109cd9605ee8d37ff0cec36dad637d2de864da9 SHA512 b3cc325dd6ef7209e31386cb0d6e08bcddb9b6a37d59636e7776bfa87b004042c8c17dc7b6493aba3fc705ea6da4a66acc33e184510513d94a9a76f0aced808f
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_th.tar.gz 886369 BLAKE2B 3bfaac0fe0c7023753df0e99f96fa6caf7bfaa2c5fdbf06386e6a1adac85b848190eddbefb22b60be02cd9b9d833535561988d10903c17f40fee4aebf3a66e64 SHA512 5808699a3c8e827d3eb3c604e1144d10ac6737c58873f19d1e267b016554da9bee0e59d106a7482070fed070e77bc7fae072533367ce7645ab15564b5e12cc03
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tn.tar.gz 214734 BLAKE2B 5dfa8f2b1aaacf14da57ca153602e73fd5d0d55455029b61470e295079585b6d51c555e909d72aad8702d57a2a8441f76caea663d80fdb4c2a633431ef0349b7 SHA512 786da02155408086a2db911ba9738c9631ac13f42203076d8372780b2f82a6db679a5490b9cfa03eb1bae1b1a8f8ab05a3876af66562868bc5c2d05f78315f68
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tr.tar.gz 3002438 BLAKE2B d97289f8e10b0d3f62db47851c26fbf388112a03edf47706dc0d46d2c940847600aad7699aa1e2c77e5dc612ddc1bbab423bb97a0b7063608daf4a349aabbc16 SHA512 47b2fc4b581122306789cfdf49d84da90b32c088aea80ac1641e77121fff5e3cdf8f37278ec8e97ca96467cb04ab96e9595c0adac739e4188f443f2d06bbd8e5
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ts.tar.gz 227351 BLAKE2B 991940ebf55d8000e5dab41b460945935028d4eb64d20a5ee3d6a1be4640c242b71dc09dadba8b98e65b5abe3d1ba3902e2c0eebbef5537aab8ce958470b67a5 SHA512 11f725201482294bb03b4ec48c8a782f35989a242e5ee6264a4277db0778aa14d612927f6906a6e3439da773ece83c7cba60e3541fec0278bb8c6fb578a2c5ce
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tt.tar.gz 149207 BLAKE2B f4615317c9fef6523a30c1be0432721a197adb00c1e7bcafb46b579de98bd46176ddf89144adff10d594efef637219df960eae355c67f9c25f6cd1f86760336a SHA512 3f3a137804514f944fd03de6c44a956d23a7d5b6267edc91306f4c57eae1930c87c02d7684c9d0bd7176a7d1fdd452f83d4ab6c1dc6af3cd065c49aef8d6a67d
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ug.tar.gz 441783 BLAKE2B 1e1a38586b452b5232f3cac5c1f6629123a0b3a72f39bf89f711b992bb47c63e2094b489421d4488b76125937769bc63688dd6f03c9cdd29d8f1e2ce61c094a7 SHA512 8e7bdc6fef96708eec0c27587017e6c912c6a60e9cc934df7e31d49fae542371d2d0b391d3505bd6bacf0359aa9ca65419eede40eb5436ba73fc6569aa7c39e9
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uk.tar.gz 2714479 BLAKE2B 7a808d95a6255666dcc00e2f641e127edea6f70c721c0578487b42fdca81b65f7fe9253298dbd2ff1fcaed735e5be421253307c2da05bf19cb6174f5f4ee2737 SHA512 042f650affcf1fbcafb14a319eb2ed9be0201a1d9d00d526cde80d1c2e032558ee413343cfec7d1c8c9a51931b1dfd97a19b862d5ce9d73a69e38692f3b2e0b0
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uz.tar.gz 248382 BLAKE2B 2f4581bef9f4fe88c87f667e2a8ee4e30ec1295f185888e64b824957fbca56a130dedd4315652805b50bb0634a9a33eece39fae9dfdf85d16b372a9c2bde0513 SHA512 95ae3e7633566e02dcd909b1f299756b984352550ab68330e33fb05f4b2610d00ced718cf237f061c9ab82a8426e8fc57ab20dbd3b7fa3785a731a5cee0ed72b
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ve.tar.gz 230744 BLAKE2B c84437ac9798dbcf29c404d3e24fe08deaa6db5d42db872a72e7189d9940ab954ae6dccca089d77aa726c826fc232dbc7ed94d32e795d75e73922df14db72e74 SHA512 df013173209bd1ec12c0c143277e960a7ba7a2ede64248d7edc0672cb203f6064f9bb9a4ec661184956df3cc086fdde5ae06da05a37947a8b3e3e4200b10181c
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vec.tar.gz 603279 BLAKE2B fb7145539584166a0f997cf480c262144fd4884cb79304ba58de288d9cfaefcfeb2d92e754b4a9e8a0d333f62d093fa8569f6fe172df64f37dcc9be514745623 SHA512 b7dbd7c75f7ab609e22c2b6bac6d47fffb363a3b7745618cfbc3a131e9515354e9ffd7556bc126dd9b5539a4b9ba3bb5c63b222a09dc67af076971bfcfc95fa2
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vi.tar.gz 451114 BLAKE2B 231b7aa70f5ba92937d4d784831174672b34124f91c96c6d826bf03dea1ab47690bf7e7a3c98e791d3e630a89356171632972ce7cfe1388cd0398e33261a7bdb SHA512 38971af7bd930509e7c4154ac2649727275ac14d975faa81d14bab0b51c698b13fce373d41653b589f862d8bd1ed7d582f55c2165798003fd87f6c0c41520874
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_xh.tar.gz 235092 BLAKE2B c888b63b9dca8cca0a2022e29594867701ccfd6e4dbb49cbe0f835e5a63c8356f217318df4f813eff4a1fec4e02d413b44d291e99a484785de6a875727c40013 SHA512 c02b8fb044fb8cd18a203f62efea5c316431085fafee171c658df3337bc5207736d803d8a2c6b51bfae269b3d7a5cdfaef16b91b5aa110d067fb917caf8d2bbe
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 915544 BLAKE2B f20f885aa9b5a5064bae3c3046c99ab095a3694129f7a2a85c7db599643ed5615b5304db830f19d24d64599362b8d67ad0d78d233186953e2b1fb964da14a402 SHA512 d3057f0f71ec9bd446de858691d15cbc02a6277f66b4a352e09e8156e7163800ad26783bf34ec0aa574e9637ec40d12fea5bebfeec1a04d01ae213313ad78805
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 944264 BLAKE2B 8a29333372cfaec1d22e97fb69f2ff4de614f1750bca17314b7fb1029707a685f74c240c8b26eaf658058f7b6c9f2552efcf596dec7a9068228609ea802656a0 SHA512 1870d04cb0d845f2b256e14b88054c46ff9ebdf4b7cafd4d930d23fce98848b8ca39e834e0009cfc087b290ec780a8ce68a3b7f597e8acf3e4a44811c106c110
-DIST LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zu.tar.gz 258954 BLAKE2B a1de7560e107b15cfac0408aef563caedf1dfd3322d7dc9252419e91d5b424374b922545cbe78bd783c803ef9887dbb648fbe82a8a150232dbecc9627418466c SHA512 dd46cc36b09ef2f4ea5889bd6a5424bb3cf44e552cacff222304f0f5d7b1c82b319a7239cbb6c4e6c02094124594bcc4ffcfd8de767e15b0390d734db92b99d9
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_am.tar.gz 3201598 BLAKE2B e214b3ecf034dbd30a56687d0c1c9beff3dc454ca75c18e3785832a4c7fe2119fcc1bf115739595b6bb7f58e14e39b5c52ac4181517bc8068fbcf53f19ab9f8a SHA512 02a229b3f95bc59db5f4c5e992275ce68bdf9f7929f98d66cbdd6131fc78731426142377cc5082386aeb30eb222645cab3001eeec2b5a78659b38e3178b9597a
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ar.tar.gz 2889065 BLAKE2B 4b0d4ec662caa15ed3d725ecf2e3c93b31cefef9cf6a44dfae50d67dfa48793af15b9b85032ea92cf407762aaef5b4677fbf305135a480628f9257fcd6bdb4a5 SHA512 15c1f60bd19798754978e82f0ae1d5bb80f6a6eebfbc8cd76c90a147711a16b7e04c1a32e6f53051d5749c965dc4e84f2a8c957c3251680fe7e20ee8c3b7447c
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ast.tar.gz 3054621 BLAKE2B 2bf8c11523d349ab729819622a7c48158cd475146c6365f65ad458b96852e0eb3b2a4b7fdbd312e4461af19caab8e34da23dd7661966b516b7683350259f7b57 SHA512 2d2e5c495ee090ba3a0e84e1085578f4d2a37a5cc29c4501a4de4d5505c008a97fb55d62e7c3d511dface411ca820565888551399b4195402dece7916c929728
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bg.tar.gz 3354287 BLAKE2B e4aeb2a58022d7d1fbc63536f7a9115c245a72ea57b4865d5f181de79258eca4173edc2b15f7f1c53d3a49a3a4c77db35403b62a371765d583565b585fecf92a SHA512 f6fca9c967d7a81a59affec4cbe33824da0f795475f6fc0e80a1c8d4eb69cdaddcff174c9d375b195de350aa6cfff1901fd2c93c54d296b9f45850dc71269d41
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 3360607 BLAKE2B f29dcfc1130ba9a9a69ebb259189a32f80c9e1119a8dc987835fbcac2b82590d8e79b7e6d048d86e409115faa43de5cb966326c6f5407cf9847ebeedde0b7348 SHA512 1e6616c1cb8e4a24ba85f5627879be3a64aefa0a3034d4234e0878cccb9ce5ae8b65257c763aafd0ce9abbbb9ade59bcb4c04a6557b23b00f3bb6126dba58dd9
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn.tar.gz 3173108 BLAKE2B 8821d1994fd8fd6f527b775e49feebd4765a13aff42559aff5aca4c6c422c353dad5a3742f7ffe474f707016c565b675040599ace703963f837a96ce537330ed SHA512 8cf2216afb83313ba68549cc3361e4826962c9f270e97fb8348c95640fcd667266f9ea324deaaeca16dd7f966e70e4c26f2c280625c5fd4eaa6989af201e7689
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bo.tar.gz 3169732 BLAKE2B fd7fd7cbaa061f0d251de16cd3660d59931148435d7f4bcfe280c66b150f2d30dd3aaa118ee8e6e01d7b695706db6d3def6c77c1450606cc81b17b984655b840 SHA512 8aed5433b4182349d32b92c04d00d845fca2557079a0435068f1cd49fa5550015bce9eece128e3574697642d0223c87d11c279f2a2156a89d089da3d8266763b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bs.tar.gz 2973797 BLAKE2B 790911a31b5979a9a3f1c5ffe84be32bfbb9d557982d4fa3ea16ebfb87b997e6697b8cf8b9d6c3445ebb42dcf8ce291994e3e0194b13747024823935a7b36195 SHA512 dd715d4b7936173cf4b353e36c90ff3099286ce70c56cce10e946f7a7be350baa3246f5f9871bc90de09f0febf0de03e036c827f39e7d13fc572e7e41fbcb6b5
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 3059395 BLAKE2B e1e35c48ec55c47b48cd18815aab69068660b935047ff6bf26a88d6170bc94e5f57e32cdb76c6f1a047796fe4a98713364e889035ab27335cf48d414735fdd43 SHA512 fc2c0e016cee663b5ca0c6f83adfee061b9504b826b86455144831df496569f6c67e06e346c97b4550a5109d75e05829603edf79c646bad656962ea969b92d03
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca.tar.gz 3073574 BLAKE2B 5af147986bec5db568420b6b3b4532e886629ceac225e22721770425ed43c103f202972ea17d24a5e5a9fac3a20ea136f0f35c65944f3f39a283df05de2801ef SHA512 7aaa8b04807cd893b3da1b2d0cf959dcd5315b678915685cda99642544a3ea9a5566723e957da4214733540b89e9f61d5ba7de9b1513bb1951b967ba7e6af9f4
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_cs.tar.gz 3036771 BLAKE2B 2275ed747e30ef383e3bf6b226d367437324be1d50ae12f8db41613bd80ab5f31a72289000b793725a7d201869194b2caed8183e727d28ce3e530f096c8a42f7 SHA512 dd978d5b88e011f936bd9acf38ce490fde261736f108eca5b4ce7b0cd34acdefcfb0988807a8dd5b37be7d2d18066aec832fb2cd40d1c27722e9f2a3c300734d
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_da.tar.gz 3037625 BLAKE2B 1d95f3627b8d30032d29110f2a43ba4eb62c9ee246efb37fe9f28d2211ba8676f5a32aa8a2279b7619ce7ba953808870ba1ca3c48e1c592946e7b35093e180c1 SHA512 b2ca2fcf9b166da4592fe08b5db20e004364fb9aa0bd68531235672cd25538a09ea262f6273bf1146a24050628025c1b196ea9e8fae295706b889cf1a1dc4407
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_de.tar.gz 3126616 BLAKE2B aea5c43314aa00333cabe1c672d0d4f3c47bb09d73f79c18661be27242d5b462f8091c6e09140e14c755f99b03292f2a34519b3ba3cbc0edd265a2af33e4f2da SHA512 31977af5c4205e8a00957e0edb7cc0c4c79d9715babbae64d0c327da507ecdcedc2687a003285c44878a7b9da0d44d80f550535dabd34feea29b7f5d33529896
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_dz.tar.gz 3293221 BLAKE2B 1fe980d723c4241d254dccb93bf3178b06fc8d96302244f6de4b58ab6dd666a06ae8d07b2f984c1bb9401a9f618d42f37d038e7a6d5adb03d51da6547e3ee70e SHA512 8ab39363f260e704ac983500d7da123a508bd8a38a6eff240674495463cedef723c14299d100f9d92d2a0d3baf188a175378226a5a4ea03099d38bc2a9ab8c80
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_el.tar.gz 3654764 BLAKE2B b69bbcc4b8744b1b57daebb2d9781b9202635c466712c93b596be73a7b64e22b1136422402c155c82111e201effa11423462f681b99d3d484177513be02e304d SHA512 2e57dbf129c46183c7ccf966c627fff9569c6753eef369cb63e40dc7ae2d68a51a4e97623b5f0a4f2a13317bc9119bdb1b95bbd27a2331e372417c5dd399d7fd
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 2894724 BLAKE2B da61e869c1dee1f6ae5ff26d4b064ae5343f2f3c770bc77b25ef4b75420cb3b4b2e912ae5f06565767f9f6be069eff44c53213b156f55e1de442cc1b2a102686 SHA512 9bab474b4413014f5ebc8d7b47c970569f370122896ed327a8ff89b0b55cbb7301cfcfaed6a4479aa5b66b2dcf4ce41e9f3507550570f277c33532db792293f6
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2311373 BLAKE2B f5647403d05d05e6e55f631c1268219903fba32d3ef0f0ece4d582f38a37a998bd19de764172b3975f7b99f5b79d67894b9ad60cf62844305222bd9f9dde4613 SHA512 e5f1bc72e797ad85cd2eb6c80224bd20ccc4a538a07b8742987b5020e5216e1a591e2faaa3b66dc47e20794a665bf6cb87d9dc4fb27e6b4fed1a17037874bc5a
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 2892732 BLAKE2B 98829b7322460b0003fee81099db93625dda78572ce712d551acd0787162008a10a87d45b44eff61eea39ba3c86a08257515a08b3c00328b84c39b8ebcf2ed1d SHA512 20f596e99d57befe736416dcd3d3fe0c09b9a1f31a1cf899914baffb18fd3c2098b7cfb6ff6a3b3a67b3fffecc62e837e4caefa3209cd1dd9a4919f6f6b019a6
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eo.tar.gz 2977082 BLAKE2B 03b57fcb8b19ac9c7b0f57cec618f265e8f47cfb840c271ec2b64a7b93b2c8c8ceb6a6a831be0e59840b770edacafbf26b1f1607a028629dc596032b9adf21e2 SHA512 79d8812e8e8c10a5f6710860635cb08d570a13d2e2d6cf8ce879179b2bea615b40e977087519ef5beb5e2ac970bcbc2091e29f6d255fa9e4e1d7d14012fbb830
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_es.tar.gz 3114747 BLAKE2B ae029b7c08ce1305a6d27e44f86677f3f1da062153388c3132ae7f015ac107f9584100b4acb71c4227ede5c7d864b629e0d6fb614d9b2fe7c66fee4b32e80385 SHA512 370e23f0f4d07b52e023cccb64a1737a3587cb66479b3f9f8ded504bdb0452093c3f1194c1b11de7522f17f1d40f460ae8df8b715e8465fc724e6e98f74e1671
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_et.tar.gz 2998352 BLAKE2B 4333e5491d5e0a38878784d4f5d81f5158f0677f5575c82aa872a4436cc1a1e0a79291e8786b53018c2f9f51571353aca0bf37141b8e85731efa071ef32bc361 SHA512 b28d7a3fe703c9e93c7088079794bbe9f89c482f7eeb00b29bcb3ba2bbf6d3edcfd1008c7f98c025750a12c4878d4c516e18fc6939f258d2325ffb3f263c7ebb
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eu.tar.gz 2993379 BLAKE2B 5cd4dda70d413b654899ee9a4d209988680bb0f6a8c4822062531af2abb7614487adb851c777e248a05941f830a230a67057c3c31c31ca9e39abf543cbbdcc52 SHA512 90743ca63905a437bb01743e4b4296b4c331eadc5d33f25f287eb1309e4190b1f886003345f998d7a04e345f8f16e0b1aad4063cb850d7ea1436e0f79ce29f1b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fi.tar.gz 3035328 BLAKE2B 3a5a12406fa3841d8eb9b1bac222c9687606b72af703b738c25225b1d2205ba01ffc5f11b46fa58f9fbdbdaba80c3ab9bcfc30538beaab88c1e570e0d01850ae SHA512 a5945ecae40b20f81990364c6b0692f9b73d8b022debb2bb6bd3154e97ea21db9db961190add423b8ed9f52639289fad91235afa980929035b42535fff7f99b2
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fr.tar.gz 3093772 BLAKE2B ba6f89eced2035c99c8a898de986c805eee66061eb74795ad5638b1f92b7107426684d279e201262eeb4e4783e18708a87e68f5cc979216158bea588247448a4 SHA512 d97e39f410cd3932cf680436183d85b0b1d92e66cc22ba8b0f05e6c76652ceb116708152a66cb28dd4d57c1108ee349d207b7917ab529f9aa1c9ffa6774e15a4
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gl.tar.gz 3051298 BLAKE2B 51b7f8ce19d1a1b7e66357adc4a5e78c3c3f5e89abd8fd0d3ef6e8359db5a542c7c3f097239a22af09a1dfe2605c7e3ac2effd8c5874d3c6d397b5e5194baaa6 SHA512 1fdd57f665db143e5ac5d96b4be01c082f33dba5a433ca4c69b2c3b5a7659184d4ff0129b717df8be917642b856b7d9da3c85df0270096b8c79538a69d428101
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gu.tar.gz 2981767 BLAKE2B 8a4785f23aa526bd604a2eaa0b86b5190ca41d93fd3ee5ffc3df292e333e9ac03142dc6d63c7939df22131359651f9e5f2a5294ca7166de6dba8e3bab632f047 SHA512 c6e6e564e0c9e7898230f6c516611b03dd5b861513721542a3f2e32b42735eed75d2374dfca551c7f7bb4f5bdba4f5c2285f2b6612e90bb1fc14ac17fc45df27
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_he.tar.gz 2811898 BLAKE2B 96eb01a1d79b8499aabcfe34cc8f74ac061f8d6c6b173b6689936711ac038ac22d48ef4425a93cfd5114d126d1b342ace63a9734b22be27aa2bb66cb13455b3f SHA512 57f56efcebb1a0fb72367fb4c543817fae977fa48062c5369c95c1a9a734dc426cf71d0f3d82953d053e62ce1f5fc41120001ae3a9c3e2ee5c758bffc9b1768a
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hi.tar.gz 3010738 BLAKE2B 67a3f7353a2d4bf9605b59ef5c371773a8f84c6dc9a1fed8d265cc44b48381b62e7225901503a6b782c6ac81e97cfce1443cd4b892a5fa760d40493457103652 SHA512 fd0366953b1293ca9b6be4a2d86797b3b6be19d88d11158f1fef70a4c9a7baa06ac369bf07a16b6547fed3aefb8ff4846ecc8b8ee530832af9fbffa82cf47752
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hr.tar.gz 2969999 BLAKE2B ae052f0be26712c9f36719577cc7b186697c8e3dd7da4f8829c0a6ec3c8d94caae3b43fa4576372b022c7f31e3b005f859611f1ef2bcf9d66b94aeedfbc0297c SHA512 85ea0f900fcad19c655a357df1edd99a57076334b19c1a702540780722a962220fe4d65a472877971b0cacb0f1c9094bb746c9d0d3c09bd5a7beb888b8b3354f
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hu.tar.gz 3168843 BLAKE2B 5337a4c67287230bdeae0ca757c8d0bd22f96089d64888db9859373495891143eb817fb110d5896953f03455522614ae0c8450b5d8816a61b75b52d5ec4fbee3 SHA512 8453858113d5e99f4bbc884a71aba9df13ac9a5176a22dac14da3bcd5abf355e4a9e693db26e76f453df92c37efd032f1aa15a18365ea8b1132c3dfe3a9b1c72
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_id.tar.gz 2983311 BLAKE2B 1f647467782bf50e6aa0bb289b82bc1397ccf8051162cc9a6b4e7434b3f91fe99c72a0ec12e9e49b78f31eb5139e2c9c2d97e28e40c8e288c241bd382a68ba32 SHA512 e74225c8cd3d7a0014738d971cf377dd467738e90447055dfbd75620261901520e6354588abfbce093ce4fbcdcdd68eea04cd372d5c55118aa64edf5a885bd58
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_is.tar.gz 2973712 BLAKE2B 2e92b30f94f10901d0af3ca39c8017d66b69cdf385a4e9037f8446dac7b02854395b7de8f0b8fdafb4325a275a0cdbaa12e3cbb8129d089ff4136ec1f0ca9268 SHA512 5257790d6154121b6cbc4c608ea8ab48d71505c3f08a3b58bbf9514033c95f9330857c8e275fdb585cfa6a3c07f1699350d40ca6cca21ba58e3f45e9b220bb27
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_it.tar.gz 3047112 BLAKE2B 01aaa470eb0165f50091862f61464b081edf1a1590f614eee01c7e1d00a709099bf3677334abc8318e32bb6da189b74c67c546e886d93e780d08ffa9456b3dee SHA512 8fd0df13ecb7ebba53ae07eb36bf6db81068a547682fb428e382ede908b57fafb07e2f14a9db963613ae08c768f12b9a4bb87b749049016f9bbf1d5e058bd4d0
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ja.tar.gz 3395994 BLAKE2B 796ba8af7b3c56eb241d4fe72eb930a499249042434b35e580595c420d974d4af78d37e43a2c8eb51cb25fb1c5712d73a87723260b7985f4eccdc2b50d8f87f9 SHA512 420b6b9d914c98b00aaa25ac12df7fa3032acd8c10e57bbca16d472489a649407178d108cebf15ce73bdb76e033c57de5948768b51a25f0092a59b5fe87fe3e0
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ka.tar.gz 3062143 BLAKE2B 6f3a219ced6bddbbfb163471d8de6d8d9e94c82ce13997eb088e970efe82d6c1aaedd045926ea6e6442e8bd13f6c61540e7fc7559e095ca30a5614e8b5d7d0b5 SHA512 d48ab233c92c77faf9992ebf97921f7eebc2cacfe342e64e59560eae0d9d035c595ea1daed969375422562eb8c45680fda3b60ac9e166e04d8d3d74401cdc25a
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_km.tar.gz 3388388 BLAKE2B 360141f6ccd35abaff73272905211e3ccaddfa2c81ce9f2b3d840e445b936d13c62072f17c29ee0d06b1e7037e6db05f59ce09611cc341fd4ad170162d074b63 SHA512 161317be31455f9f32acd0e352c9c44bcddeda9a471b9cfded6e668d4e5befd94de9d9c8b979106edd4730eaaaf83d4be3a05998fd24ab8048c84ac7b534e416
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ko.tar.gz 3043956 BLAKE2B 8f3b5fd772ab8844d7826a62e367fe45f705405bd6019cec18cb278917ec4b0d397332324fc25245c98572c952d5c52a8b23c958e67b19c6e7aa581a2f1b19e2 SHA512 02e794746b96f9869b977c846757c5e8b342896cfd4c446273815389d6fa1fab0a4add1a9d76446161ad7d34a5216d95e811c2ac00b7f9f4a06ea4915a6162da
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lo.tar.gz 2924327 BLAKE2B 87a11fbb4988e62858892aa6ad2b57c19fe4641fb79710781a83b9a450576c134983f7e310b67d9c07543a28d99cba28f14b679b286946a1306fec4ea6ec9042 SHA512 e790bdbd7f793ce0fcd338864a61419b83fdc5be6f98db53d52dda3f33554b2a425ac23b6b9435fd615aa1974cb807899ce22650024631dc764aabf5c510e54f
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lt.tar.gz 3087348 BLAKE2B 3745d8ade2516649b311a12d5027a2383921c6e6fbc1b4737407ce736b854c79defd00ca3e47c5fac474af20ed0a8de58d6190dbc2d5d38e72b941df53c975c1 SHA512 728b834653735c0b1d7ce6d1b67224bbd97f02b5578979fd4f6c67f599f5e97a1a132e726760611b5691e6ab3b46d2a6a2d0529f9b7ddcd50ccf5b157162a2c5
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lv.tar.gz 2968368 BLAKE2B f69ab33e9aa66873a0efaf93ceaded0a0aef1304cbbdb707fc96ddeb9c12270651d6b878e01c2bd0feed796c3d8b900c24b1064c74433b1b0382de07b47edcff SHA512 b3e717ccb73ec9f0ebc5d3d2847f8f82884bc83b47617c23cfd95f15e6535bd9c4e6d30f20fd9956587099c44430ce6e2ffc4dea03b295cfa12a643d295ec06c
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_mk.tar.gz 3007922 BLAKE2B cf54481c55856aa4c4a1f10cafd05291227c728aef24f9065804bedada4498d2121c1d6f9b1e9ff885dbeb964e623bb29d0a0bee1d3e4969d43aea6eca17bd0e SHA512 b5e97df3eaa8cb20c7868253b4e28b7ec1e51a106386fd345fd42aa61d5a11845e09e867b2ccd181820bd057734dc6f8037a8aa0e9ad79bb0a16d58b0b1d8011
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3007645 BLAKE2B 337aae24278dee07cb771fa64f1670b4d7b301a377737becd873ddc535919a4f5605361d9af1ada4d50c2cd506df9a256f1e5c145016295c66a00699fcb3d641 SHA512 d2d29d3d8bb834c14f49a4f66b171c903a08f61780fcd0121f7bb6efd39bc14f3a1ffd5b2e3d76f1bddd4f8fdecaac2e0aac42e27d76a0513ebf2345b8949976
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ne.tar.gz 3210042 BLAKE2B 39a2f226399fdc53ce20e653a22d4e681acbf823ea74985d2c10c312ff3e4abbf96fa5fcb8f0d4048dc6da88d55ae4a41437dcc28e521b01f91e41538103cbe5 SHA512 ac88ced7a08b8983f4bf773825cf384226d71da56bf27ccf2200fadd92b45831d351cd22e4ae0dcd53d91faee3e1d2ce7df5c2d3a7a19208ebf11d64d57b1193
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nl.tar.gz 3084611 BLAKE2B 09c85f8a47b6e92338749d726b0b49121eb104671cbb026bcb710f2b390c08380424cbae7911057bbfc67e93c7fb8aa5f1cd180e7c6348ef5afde60d3daa41bd SHA512 0c3579e9c956b4e8ec6593ffeb6d6e6aa8cb19a7e9bfbb91b8e72cf9a075d74beef6f4da2c0f434e6c95267f628b28ab768caca5d073dcb3d9648272cd73211e
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nn.tar.gz 3012692 BLAKE2B 5edcb95d74c93b5be99dae2e7704d153abde561c5ef932440c58bc05cf5c25d1f4955c188dbaf5898af02606f22cc1c30faeadbecc1b4a08159943e5ccdf2631 SHA512 b3c089cc03a551b137a28f012129d9c2a9547bdcc83f02a3779aa276a43efe4857ac07d1b9faa794ac9c3e3f6b03b41c7ee237e6c96ecdbe02554ccdefce79cc
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_om.tar.gz 3042324 BLAKE2B 771f1796faa167da0f57c506dd2f4b5d4105b424cdbefcbf014867300a57b8d1210d961396b4b44c9e70d12875402e447a63e6adc3f771c155a892f2b42f234d SHA512 08569f83de3007f12187914541715c18f08c053167421c8a09b30af9436c8ff59cba9ed20153ea5f24868ee435c2341201d306c22e4f86aec4a392d221874812
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pl.tar.gz 3136614 BLAKE2B e38bd8d72a6d2033e410d1861b928dd041336dbe57201859e1c22a32298df7eeb372eb833ab23b164b243efd19b2f8b4846dea73ac10a1f849622cca4cfdbc8d SHA512 e9e8bff87fd3d90717184c0ff485d552e9a47a11758351e8d66f5a1a063894c77c85e911ae4a9a2d322643e4dd3b18554d8eae533f6dbdd75283422c462a6677
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 3044940 BLAKE2B 32093254d05be4073a1b97174c3da29c214bd5389414eedd29846c596703325f1075ac03dc06fc5bf6b25c96305fdb54ff592cf6b47015140eabc4ce36ab6b8e SHA512 fddd8d46473a7d561ca5ad26553010df7ccf5060b249ff23b252b10e0295f876fb23ea225e2bbc4480994da8bf36582b3ec5f6cec4c68df5553e37fb7fff7e91
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt.tar.gz 3051158 BLAKE2B 701ba64fcc968b654c00537d17e0b804dfa9614a06e02dc4da082023477573d49029eacc88cb2e4b151f9f3cde4b44ff25d957ec220014483adb0e59b09184a7 SHA512 c405ebfc06d0371d5880ec3a26e46109c91c416f6321372b8198f227fa0d136b77a465bc77a97323ddd7b225ca2824966b4e95edbf094e7c532dac9b4fbbf717
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ro.tar.gz 2934933 BLAKE2B d3a9a3cee973b68f12de32d04f01571f96b54716e20371b5b4d57a3d8f6aada6e57cc57f165b9a72aa869ef13d7af1ba12bcd260e7702bf328f1ec9e71f896e3 SHA512 8074814e2c5ca8a812850af6f726fceacbbf179f98ae098cc8ab5e1bb4857ee77056c766a6c4a89b3a8190c9e37ccc0c11123c88866c572ce2ad368bb1360ac7
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ru.tar.gz 3291539 BLAKE2B 287cea09bed4d831230fc6b81a785ba0c574d1a16a478ea3e05002acc04179929a6d6a907d0f5a7906560ff6da17b948942981306797bb0935fe7dc894acae67 SHA512 77c8fd77642b4ec06a6b1eac66853624670ec19f2b742017af77fbe8ebe07ffef08f445e4baf8f3f582f8f117618015a0a7c5d3b5a025274051c3401ecc7d37b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_si.tar.gz 3079495 BLAKE2B 5a36fa08d9649b065b59cce78c8eab669d326bc9e18b080c5fa573db7685dc854a6e9b9b3dd9c24be3f841cf614155e17a3211754cc408082d9356dd9d2328dd SHA512 6187755d0f4e0e7e00d73aab73faa650c61d96cae5fda02c3a13ea7d60d2cfe26ac479e56e5f7e1549fb3200a05d055c31fe1ab60f0e70a485f10825b9c8e0b3
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sid.tar.gz 3025602 BLAKE2B 20b0dd2a8419f13a8d21354202eb18ce0d19df45452d40c5bb3d3aaf19dadfda6830b3928d2f038e0cd1a5764b2ab2568d0cf2edf7408a1db6756c21affa0335 SHA512 10a31c21f00d5216bfc3b6002fa8d873141e7e1ca68dda600a86a0d39948968f925cd1f323d3ceefacdb15da7e447648ef5fc060e42fc8687f6d30a95dc9d1df
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sk.tar.gz 3083106 BLAKE2B 2b1c694125ccbfc1262aee2066861c407237efada71f5594b5a9b01393dbb8988c909dce0095e98c21add40d1f9f3325c9b1c3cb663ad4550757206ae3587762 SHA512 141320db2b3d5c5d851442210965890e443e5e2a6434f006d30fa77cccb0311a27425f015e50fd0bc978d10775fd56922d4939ee076dcdb18a352f95b9f50484
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sl.tar.gz 3023488 BLAKE2B 334f658d2e0bdd224181bb59e767148526e61e69c17e94d677ef25f672e1ceefe0f8b8d7943909dc80184d639f98a3da78c80f29755defdf37b03c3efb78e876 SHA512 59f52761938ebf60aea173babac965de83e431dce39d4134ebbf14d6886e13504522fa8739be3d74fcec87098eab6e9b86528bb5c0f586183295ba36704b30da
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sq.tar.gz 2953879 BLAKE2B 5b4a88c3ca283a1023f2d2e868bfd5bb898f70203f3211d1515c46cd5b37fab0722e0e878ca7e503a0814b6f90c0d92583d3afade808e51c29017c19d1c9f840 SHA512 ad0e7d45df00790be391ad0c406ef8a097e2c1097e3e93d0a16d6d4303a5de2d554d058ee69675e3326072ba4765e6fafa4403830209a36a11437a1ecad7f976
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sv.tar.gz 3028665 BLAKE2B 2924fba5a6d5fbfafd79e44ea0972088becc4572ee5b2a357fa4fb9c9bcf91d5ed58fb3959beb91784e0ccae49fc9f81178bd130f97cd3194ab047cc556b0966 SHA512 989d2f78cf43211827c0ea2a3aa648ecbcb8ee33d8ccd30ca3b027f96c02ed69159d4326ad29eacc5e614a8a784c023703ac4e4253ad8381cdb25efdedf8ffca
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ta.tar.gz 3267151 BLAKE2B e30714faf7296da36c8be6fae2100eee362b9d7288fdcd9423514efd66c81ab02745374ac5488232d78616f079d262bc44a572e31dff3340dcbfff47f1c0d304 SHA512 c0cd37bc5432539b3c2945e23e033636dad5f3c181df0930b405ae30a3402065173cd4d7477dc3756218503c1f2772b63933a7f2314cdc58ba6ee6f91b1e7e40
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tg.tar.gz 2970970 BLAKE2B 20e41f75aaf299cb4ff87e6b37da75be305531befc077b2a47f510cde49ad6edeb59f28e1a8491ea6b4558aff86d57acb1603f40a248c28e75caf10f5316f042 SHA512 171266755871ee59cf3dd699e5ec6f5e50f44e339338dc9d39de151a35f1fc9ac0e07a45aeb3aa53d34fa77e7372c19c3d595a2aacbbf077fcf10e0a53d206f6
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tr.tar.gz 3090045 BLAKE2B 0257c5d87c9949d74d91efd494e31427b67d7fa46d1e0b49e5d742ae8c701b5abec9aca4a3153388d7857b2132efbcd966f675acd194d1b706083cd841b50b5c SHA512 95bfc4efb65897479f6a1706fce7f594581646e01b5e61c6dde20ab08e0f456794dba8dc75989ef61cb02a4c05455ed5c95c1bdfe63af949e33f1ae93d20e236
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ug.tar.gz 2990976 BLAKE2B c3b7cafa134ab03b51b15b267a2084aa985fec02a14b14dae7deff1da12f3e1184596dbe227a27c676ddda2b0311bfab7f8f6ba93bd8c1653abd0bb8d1abe79e SHA512 c2cf0bd96eb7dc406f7f975e49280aed63644fa37f2a6329f715643d715ef4f400338597a5978d65f56a5692fe08d085b8025b6fd01e899aa21b7ef014e269c1
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_uk.tar.gz 3282306 BLAKE2B fea9aaaa08bb91b43e132b8ce5e6ac5ffd5f5b3a0782158aafac266694fd83fec729dc35452c4ae04d606a686f5ee6a728c27195c3c1a5633970c6e3a76259cc SHA512 671ea957f971ddba229556d7d2108f2cf7ab5da55c92cc8c2bc719bd6669b0f9fbc342f75cdabb42e04907627a88d8fd0b60e3b1ebf95e3981e5a2748ba25682
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_vi.tar.gz 3020954 BLAKE2B d207d7ddaeac4e74e07c3db006e3d928f489edbc4b789216d657cda0d75fc4d82e28a9d983f2e121c9da73a48b2feaf8a6910c68aae0e74689cc1a290ddf21a0 SHA512 314de78b5cea0398ae97ce7c38233b3311aa7ae8ff8dce72b52ea4e5b1d044743ece9f83c851f3f48743a2dc0bb2834db034b5684a0ccff46807b58b1e44cbbe
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 3116349 BLAKE2B 5f3ffdc05e48822fa3c9ea3fa05a751dbaba9709914d0eddc4dab1aec2271d4bf459975cb58de1bcdbcad7665f68649faa0bc38643b4592dca5441a4881d8cbb SHA512 5267a87b7f8d7e8f0afc0b9ac95cd575d76162c1f7792312fc8a07653eecd911db9be6e5c14968e9ef2469578bd56a9082f8bf29719b3573be5d8ed358418fa5
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 3156102 BLAKE2B 692fb6ebaf8c7bc0b28cf5c8a16937b4d1458a61d2716346cf74d1cde5cdc653005df775be215d301c7da16228cc5d9905154e93322c822d909142a9e6080d56 SHA512 28e7eacd693ee9d9d580763134936405e8f604b90f5f62386a483a36af84cfb55029b786bcd0e3efa71ef418cd3d98296b967c877c43f342423314b50bfb20af
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_af.tar.gz 1338199 BLAKE2B 1735734f7156b6a21625f43186b2038e16e93d9b3390f9f30841ab044cfb86b85dff91645040b972e2dc4fb4c0782650959114db47a1f3704bc3aba06b7c502f SHA512 b4be27bf2cebe6c5cffbbf47fa38d8743660b99341fe6a9ea579711471a18a28488ad115a8ef7dbe566fff7c81d927968482f3798c92907c13df8e3c38ea7f13
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_am.tar.gz 806022 BLAKE2B 5a24695266166d3cb4978a7569cfc586683f63f1328806ba51d9c87b109cc05d4f39cc8b9fff1ce33ad8e8157c0869184c14157d620b7633424144f3791790e0 SHA512 273d73d504b99d2e22c501868b2393db88b7c4c1c621018eed34b0b262744c44a60a8f12921b31aa7588f96cc1a5f22f5677cb2691682afcf4f4dc18bcef4133
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2303684 BLAKE2B db06856c116fbc904794f55e79e0183b4c31445c81a1deee5cb7905eed87bf61b081b77dc5095cb1ee9c6eb0151f9a003f4e31cf7bee3331baf49f2270f2b870 SHA512 396b9bd87de30d8ba7943152249e9a4324aa5501e9b792b5c222e2361b246b6b0c1ad1e496ce7a547e2acaebd90ecf1e7faca73ee80275faa572e1fe2ad18436
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_as.tar.gz 430034 BLAKE2B 402ab2ae245944820844672bf3f80bd90077144641148b69ca198462ae4de7c337c5bd6c0ccc255f9f48e340330ad6edd2dc0783e9d234b7037f89e29fb3b34a SHA512 cba48d7f714267cef8a82f25ac50a260b42f98ef60ea2b638d6d0e39577d18858012f16fe91532558ce93bed6358b1af640124d67c0b88d5e07ed69e13a0c3bd
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ast.tar.gz 482398 BLAKE2B 2323d5f0bddb29053c988652361230ad0a99c88dd98384044487e7f576a30ee96c33a5f9de9a0eaed335864e51c963cb9fffe6fc29ac549ea492b3c904b9a35c SHA512 4f2ecdc6aac446723e84eab8b7078c82c06034e402211f96ebe1dc5fad04ddb4054f91945316c67880ec53a250b181fbb106ce1f2600548ce83acb967e6eebe4
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_be.tar.gz 1954298 BLAKE2B da89fe61af7242512eeb041114520167e48e49a942811f9c15ba7c38d9cf4ca0185bbed0764bc6c7a3a5c79ba17ec9fee46055b4755759dd0a97b80006d30f2f SHA512 46b0d8158d70be24ac21a109d5f19b98ad547f5fd499a7e43668a5bb5faaa6d634c4fc88929113e31b8704a95d92699c2aeec060763817c0ede207f2d8833762
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2621275 BLAKE2B 85d7ee7ea2f9377c3a181b172cc8844598733aaf8be1a007f2615c0289f300ed37b45542c8a453955878d6da8ea9b0d69f0db7247a64e0bc2613f86df51a6a2e SHA512 ca02cd54c374b902b1eef1eb83ad21cfbaddfcc3a851f7d726b1a605b00088d68d90878ae5f4491e1f8549120fef918f88e183cf7bfeffc9a6dd667577d5e64b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 600634 BLAKE2B d971179199232f3e5afaf5ba070221d7353174b23aaf9cb234daf551ab40182369d4144fd60f78786ed8d54d1e611acfd29aa53085ef7f321a3e0d5f0d50524c SHA512 748ce6368e42f2acc25324bd19507f29b6e577e3b27708585f45f110f543064fb1bc15d8f25c37e00d33842f32a00e011ca5cdee05e657c44b642dfe054af006
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn.tar.gz 756473 BLAKE2B a282daf44885311aa52582ca51390ddb4723341774f6d4ad125fd1665d801c0619d3d103ac0ecc98f700795b268a6f7be8560717bf83e85e4a25f37534ec2b29 SHA512 669166c9badf04d5608e2335c14be1dab2f59683e0115e36d0f35e89ae2e599207b66e089a5b0e1fdd6a637ecb2318689841bdec0b9e66084c501ff84de232ac
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bo.tar.gz 384697 BLAKE2B a1416e05ad2dd4aba8bd4744b782141a40a417ff38b715be3e3e9ef224ad87857a92dc182ea521fca80b556cdd88986e810c65b17b377b30fc0d1554743584eb SHA512 e8d2e79321f6c3949308df003761dea9e7772db1282d41c7daeb1ac9434ed27f447bdd925359e9de0bfe30741cd0c6ea9653dd3b701d80dc1b39f724d13c3d93
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_br.tar.gz 1340809 BLAKE2B d88db9e786ee4957a3a52c69b8b0c4f4182c9f83a363e05b26308b2eab7ea263bc6ac58c1d7e2ffdf1daa538fe8035dab4a47c865ce89c3f73d98299353b8d60 SHA512 8c1ecf8dc3d2f4084128bff8def2c40aa981065d097bc18931ea816ed38a6bd9ff7787449880644f7e253e07f8744ab8441de360e5cd773a1da17b52e6b29c9b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_brx.tar.gz 279834 BLAKE2B d19ead72108e2f81e8cb4d5979fc49c2ea2b118897efce3141985882fec5b3b7cd3e321d1b779b2dceb9d7b8aaa74288b5561f089f5d4346550ca196b9bb243a SHA512 d5892e5bd3051beb95624d47e42c0778c713f9f1f3eec65af1b212b3ffb9acfe91523cc6100b741b6f42c885f2ab384e4c935b5b5ec137cbfa803746baf792a8
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bs.tar.gz 556700 BLAKE2B e1839705f98ff2fdfb1a4039ee413390828a9080715cf3d6150e20125357a287ae77ad3f78a58789ed0efa7ef71782557012d5cb3e885efb4a2aa7fb6ba7b650 SHA512 7288cca1663ac14d3ea1662c777b7ca70f8956d282544896e371ef69dd3d819a0fee5cafa2338ee6fbe0361537ea612838a0e0ac9accf40b37c23c3572321a09
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2391343 BLAKE2B 0795d2f911fc6b762f264c424121d15b2bdfdfb152cdbe0b8dfa132bdab739262df504d2f8b609457a56dccefa0daa1c828e2d549269f558d189d19dac5804d8 SHA512 41e254f7fad690b7e7d5b61c49679c559a3e929f62821e9a804f22a4f8b8bb12b464410690600b6e806a102050e3e083c0cf9993921197d9a8d656261a130b41
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2464948 BLAKE2B 2b3c463015ac984acffe7fecb42ff9237f1717359609f591f5090f05ac6b318b220b966536712eaf19dbcb668dd3d67e68fe5a9836925e7026150f4805da2599 SHA512 7e66406916c5bd309dc13ab252f1c7a7ba3d1b819278b089213f429c614a59a5f30bea2d1f574997cdcbf10f2551e9badad43c47e4ad6af67f53defc7ae5e22b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ckb.tar.gz 412909 BLAKE2B fa8eb0fc03a1dcf8d8a26cc29332c1a716eb8e148907a758fc9b9b4edf283506fb789eaad4a25bff62d17e5f091d4a96d6c36db4664d41e2734834fce3cb5988 SHA512 d96218bcdbb98133167bbd83fb5948dbf91db70a28655f6a8919d30df97ed5e204d22d7f6197d3364c1b7f5d2cad497475ab0ca41330285000332aaff4a232e9
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3343735 BLAKE2B 420d5222d10e5ef8a4515ba1727c364ae8d22bef720d92bc70b00688c44d29e8d7ff7a0c0f2c6af16ebf11592c655aa3be3aa9b6d630425da3b8ecbaeb5de9b0 SHA512 7fa59bde64b89ad6aca7d0c1f66919a4e1991aa1c8d00f1ec9c2d898cbbf7beb6fdda109206d63ed59b99e3a88bab6b404cfdb029df79202ce3455757bb475b2
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cy.tar.gz 880702 BLAKE2B c76a86ed302f472effb446880c9d368bc88ba74397253e7e5f14b9f76334d62fcd8dafda9234fcf5f88bea5c82fb3a0c21e84e700946c3465985db853b0ea89a SHA512 21867a59362e3bb6bb7b88257c95269b4ca1da41c27695b32803d82c40176bbf041ba73e3386480344188b6bea4e9b3cf2015b22e3ced4b267c3e149e670153b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_da.tar.gz 2774605 BLAKE2B 43bacd66ee0b7e3c70d9588d3750c032e8fa12e8547e96cec6e37e660cf3c1d78e178b396c874d69afda27a24f07a22a5b4bc70fe0fcb42f58b7ea035b58ab98 SHA512 9c6a71aa0bae4d2bb999748634076c8f4d8299ab770db028c27d1485fe96a1bed78a9f238486b4b6d2f478ae784f9e30cf867a65c73323602ba4f05ccd337223
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_de.tar.gz 17366702 BLAKE2B 4ecd966a0c88a509eefb9db900e1e233554813f52d23c8ca645adc6c344319dee97f46cb3c08808f93ddb9a42a4817db8bd715b5080b32ab0f6c9cb42decc0e0 SHA512 e9a0b8bd83de593b551038aa772c37ead5a73cdb5c1e8b4ee677c0274ed4cffcd650eac4dfea2d1aa02b0e527cc238b8f38372bb2d00ca25022a0e8e8e08a0ad
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 354106 BLAKE2B 5194d75b3437fa77f13aa68c3392a969f49856db1febc87784697be010d7b658cb7b043922b9f082b4ec1084eccc32bd277e189432f97ac846e36798688c5450 SHA512 17f34c3daa64f9a3ddf1a6112b79419a6a8b7f1fe2a8f02d7600f115a4a998c288a9b21cd70d583dd7578c21b00106f49fe05c07f78eab0320b2faa939c1788a
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dsb.tar.gz 897366 BLAKE2B 79283f267743997ace1fbb304896d893ab00612943d2fcaca12f18bd7bee805ff1658c340559ff1c3f0a1a0193a9494734b409c2c81d96dbafa866eb773b1601 SHA512 c5dd1ef9a490b283f062819029159f84689d0f47bed316c639c37ab62fdf1fac3a6145040e7943eac5dbe6ba43c03f6dd38da78232170dcd72bf0b4cff3b4831
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dz.tar.gz 408247 BLAKE2B d4f15c36d86445f94c74d3a734127a00f16c4a1bd2ce607393af8a337584d09159be63d70f819ba531f5511fe05864ade50f56d89d78ddc349a701eb5fc17cb8 SHA512 2291c2750471b334e15aed3b84ed21f2e94c6df88c46ddf39112af4d789e49b77e9407d9a78a1eb301cfd5d2a2ffef65e464751ce85044cf4134bd5c38d32877
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_el.tar.gz 2897537 BLAKE2B a5ba6c482ee0e0d651309756612718304512185c37b1aea003072a303043a6c98c22d4cdbeb1b7770c363e8dfcd7cfca9a77362a9239af526d7a975b5d985ad2 SHA512 2b34f2d1affc0c5176ffdf139bcb99b5d1d59404707bb802a7b0e02a0c157ecc84e2222ea3c5554d9c3417d8cd6a4ad6d4ad8ec44d81fb9f4eea66362b51ef62
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 6499453 BLAKE2B 25b68d44124bf6392b7c6b016a1518fe3f1ac5cfb5cc670593d5c972d21ef6e3a24c80ef18280e65c4b7b699549509cdc6a623d4df8bf45d4d000877174f0710 SHA512 93a413cc7a61d21a3aa9fa2a59eab1522fc84c22bec436ba7cb4135e56395d98bcd1ab9f8136f778a4f03fec70adc5660fe2fe5fd5e9959a4036aabe86edf5ff
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 6012312 BLAKE2B 3522ec7b8f450802f4c1bef1124755ea65607149ec07bd256d30a53f26509a2f162c01cc30aa809d568fbe958c1f88018d57766494a30141f1e177ce1d74331c SHA512 2c39fe69898b59eb57f5671a36bd767763e2e6725aec0071ada144ccd52aaf775116e0504d696c06bc85d295249d1829bea9d5b49f9a759287d2848f41fe1bf1
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eo.tar.gz 1140845 BLAKE2B 66eafdb4059f9e9f926cca79e819d0728b514f90c7472a6e4201b7f29c9514a19498bfd3f636e361339f198135270500f23e684cb596ad6ecc47ffff0d7fe16b SHA512 448158b344c185074f772139cdb2377c4ad5c7451e7bbf5a410623e0e88235490788983591cb7fa3192ad08405505a05560ea103daca5a85a4e425eb45fc7285
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_es.tar.gz 3723869 BLAKE2B 530b734a5fcce0b1ebdf01548e9e4968b3b5c2291bc3096b37ad4a1ebace1c1b4856d139b6dba2d6a1932e75ea2b102ab751e09179d9f8b7dee8ce86bde7eb62 SHA512 3da4d091c89515cf21f358ee3f4383242d991bda7b928858f95bff34a630d4b43610897be1fd7ffcba25b8b095dc5de26f197aabb5cfae38408472597dc6d11e
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_et.tar.gz 1622867 BLAKE2B 7d51bf2a003713844f1a5d2830932d1b2ed288f8f8df6258eb70edfd9d8d4236b0648ba4ef42c475cf26b8e11ce00c34d1262bba59f0832969d1a9a8c4324323 SHA512 7ac574b5a224abe186ffd8236ce45b159167ddf45e3a9e2196f60d40a9cc632311b567c1c86763cfb62bd817b200d2e17dbebf6839b80ed26a9cd49024b4eb11
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eu.tar.gz 882438 BLAKE2B 07b491b9561de1bbe6231823fb142d673691e13edac12c8d37d0c4df987bc43a627b7de8468f58cddc4a7dfbb135f746bb21ac34aab1e32e4ceff78e2c13aa7c SHA512 a3ea4708b8280f9644cafee62220f01698e3ff24088aeb511b393242ca856750427e073e7398a76d95f40360eb0aed957326e4e16570f442ee2cfb14bf111c6c
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fa.tar.gz 673506 BLAKE2B 2a8f64579295daaf08f3a5f2ea74ba3eeaaccebf5a3a40ffb1853b424649ef9ffa41c45e248c1af1caab02b1d3410a5987e71d203e420fc319ea8848dbfe3926 SHA512 a42ef3eac057553a490a4d52f9af15592e168a97e7cdec5e8c28e86794846d34e864989ac8d50b6748d10dbfc029fd6ff16ac5f4349317c11e624f2c3be6dce5
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fi.tar.gz 743927 BLAKE2B cd8feae1f610d72ce741945f8cfcdbdb51d98c42ece56d80aad4c8e4a19558d8226ca0d06acf9d6d087677cc862ed3864574f53d0ecd64d8f613c99ded2e118a SHA512 359d03e5720dc4f5232c26f6b8c2baf98affdf6e5a09dc9ee0b18119482709d6501ca9c0cf23fce22761c09b9bd9be87a84c83c3cc850e071a17d3725ca51301
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fr.tar.gz 2827664 BLAKE2B a8d7976d0279835f4161bb795743af5a2d3a1b6ac32dcd20f2af229c3273fe23cddad3d21cab315ca5d5f7f6e50aa308a8f6b96b58657d8843d96cdace5d09f1 SHA512 09dbbe542f60336d5997baf077076362170704710a57e38378c8a636eeeb55242a55f0e4e8e0d86d7644428b8248a5bcf9b39bbc93f5829ffd12da72807a35a5
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fur.tar.gz 167013 BLAKE2B ad376a42937e16487ba5d2cd4f17f4bfcf6c2643090ab3b47a64390970816ce247b7d6d84206ab53133da4c334523a06c9bcb81d876bb0e0a1739835fa508d78 SHA512 b352cf98fb73a15c2de515bc6bda7c4960b103e38080fccc0e44647f02a9ffd4812b7d40b851544e57afa03491ed39c33d85164c52c42da3dff7bfaf38801096
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fy.tar.gz 755362 BLAKE2B d6000350f57ed34f4c9e8f0f1f303ed045bc08f8a961f617e28c89b9539c016e199cf53e1ac06836547994de0e9e662e5c17db3f2a9be816fcb592c0cff0390a SHA512 7dafa04c8c445aa24bc9396980b3f696ab902bc654fba870d4ffaa0254eca67e7b26f8319a9089e647df5b2dfef7db9d268e680703d6448c204e835bbfbb971f
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ga.tar.gz 577492 BLAKE2B c7be94a1a977d6a0c0d3cea0d0c22171337e1037802b3926490e8092116177d682833834f0c511da098fb53215f87ef03da40e2ddb4515899c47dae70ad4103f SHA512 74450d6c46852e52630d21a633641f95945870e963fde6574e803a117fa7ce1b6c852eac6005ae6dffeefd6bf070d71612a1f3a74401306fed3f9a1bc17224dd
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1548365 BLAKE2B 4155fe394190798346eea6b574e8988c984427994e93dda3deeba92d4efb86fea4742297b740a826c752016128409b8014cb31c744e27643ca5ef0f15d81e2a6 SHA512 06bd492756b8e50aacc5ebbdc0699fe436a0159e9bbeb2e8b6b9665513cdc39b678a43b9e40185fc172d624a039d3ce6587191ebc595f290e39f88fefc1afc73
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2556303 BLAKE2B ae265b83ceab439e28941c8d4db34b8098acae2909ab97be4ca5cc8281841ef01e54501424dc546eceb9db06e4a7fcfdbe5008358900ef4211458422820fe4cd SHA512 1bad9135cdae386253faf8f95f75e33818f1c3bf10c712c0562eb73ecd07a540a7a2d717d9e70adaecdc4416b43def3927dcbef709242f53930b44d7f256f086
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1138537 BLAKE2B 7918c9f4617986b08053c5b55c1e94d6e485b59e10be6a6482b7158d8afd063c8e4e0b6bebddaeeda97bddf1b601c215d36d26bf8a9eff697a445f2afd8820ec SHA512 e068bcce0dfc6e88e9d37e5bd6e031f95922a530d0752758e5e64216b534d77a415bf14edc6e56454987350582369ae0508c018afc9beebe5cf82a0c368eb8cf
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gug.tar.gz 408234 BLAKE2B 1b3c1fcacad6e53a151c7044e031c4941a83e682e34df32aa7a45c07ed8ebf5fbbd38818ef23c6c5b7920a2843d9b9b1795832840305dcb595a0eea2357ad11a SHA512 74f8b2a9151baa3c89cf2d91f2ace722032021ee7963f13ce4e5491f88927bf50a4c7ae74fab6ad9a1141f39686ece7ee3771b612831e1808cde9c76883ab3ff
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_he.tar.gz 1452228 BLAKE2B 3104af1756a485cea000f560a537cca70c0b9310efe3f1374435ffc1892a8f03e588843ce5d2279d112a169990eeb949d037d572a1575772a914b6bf19b9fa61 SHA512 018fc30317b9aa6e9549664221de8591ade53424e43eac665db28949ae86648a73a55c73466247d33315a07dabd4351f36edbe84cba91701eed5a7230d0e36bb
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hi.tar.gz 465896 BLAKE2B f73313fdcc31c94a91f7b2aa6a2902913c4c710ff7e626e00b7b1eb1eeb91734dbee7afce3c17c0c20aa264f7fdf1fec5df23965e1e2457126265f3b3b3d2cd3 SHA512 703741a7886c1b8b823a18fca4bd25f8d272ea4d39d12889d0d2d79490c53bad4aa3713bc91bb2a8616baa08f0daf11959790d457f63aac2fab83079bbbadf11
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hr.tar.gz 832799 BLAKE2B 3839630539311a5998a26328c70fd3e4e8fdb26832a594101a09edf165c2360330d6778415e415ca6bb63d7babcd677956241d5b33ffb22f40c2603520ad5e76 SHA512 e104bb37c7e452ec7de2286a4d800e976f2f1d1acd07b2665e69ef2af710d32e2d435a45d045b47682f70b69756b55c5347730a86467b44349353431a40fe278
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hsb.tar.gz 894179 BLAKE2B e64041de430040cccbce4f1e14de2f673670c09b05a369c1f202253f5515830dd743f1aea1d2b55c8eff859c8c3a2e5794c4d285af98765fdf09aefcdc8a1efe SHA512 27b67fe1d4b59bd188713647ad5d796a74485ab9372904a634dec0f8aa8b5833feaaa0bb4ace4345dbee164f7b39781da6f131c44ff517a50822ba494746269e
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hu.tar.gz 2700718 BLAKE2B a51e0170ac5ca2643af3c7dae92719a561de693fd8810890f1400627fabc5390e0c059d7d0a3539c514ee502d4f9978436fb56904be3a12c8fa07f62b096824a SHA512 800b00381a801c0c321b3a7570fdddd6131dcc94ef5d4f11eb287d617cebe4ec755095f2d109fd5607e66e598dd9ac07da75417661142cd261e43788b228d663
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_id.tar.gz 1663415 BLAKE2B 243d9e73c022e005508a3f38df2cfc2f0607aebb0957020a75097f8a3005600a70ea6baee6dfb421049a5ad6ea431b971e379b723b39b4a2671747dd056fc4a0 SHA512 b68e768a343e93c5f6f02a0f13a9f287d5dc3fc0912f3992a894ed97958e58d8d35273bd3fe7b5fd10e0dd68463f7ad99a6834576d0a0e89b03adcec4f9a2e90
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_is.tar.gz 1402130 BLAKE2B c3bc947f9874b1636faf17635ce86c2f49bd27efd0828ccd1630c38b9ca4eefba7bcc62f9501c1f2b7836929e561eb729de526253e0d51ec02ff232123b03c76 SHA512 1c93320d7b7073be044add8de1a10da83fd7518b81d6c7c6010b149702d2d1699db5d307235f5a6035c2d7da47ea425ab7afdb1e4f239c3ba587eff341727435
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_it.tar.gz 2141275 BLAKE2B a5de5dec2e3d1e7ffc99e69c435b8fafb505a54fe0a90bc2627f50ad4f567b20d6c7b236b01ec10da25c3a8494ca2934bf9277fce368878b3df405da53676b0e SHA512 1ca0ce6eab7a5313c5d8dbe15997634d44de6f1b01d4fc713a5d05ab8e8390a7e2abee6d4a72e927914ba717722fe3291067b283351dd7e20aad7cc4eb6c287a
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ja.tar.gz 849670 BLAKE2B 1524ddf7fcb3085d9b352abd5bf3149ec6867efe566660ba869ebf4e51f8f3c197c7b84aa5dfa102d6939c066d06174661bc4530e0da108114f5094863bdf3c1 SHA512 118fea89aa65fa005b0abb229fef24781c916c69ea67580d747a4208e47c7461f64ffbb40dcb671bac10aa611a0368d33dc057d443e2a472e4c02d1627e94623
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ka.tar.gz 330436 BLAKE2B e3639b9f14aaffe8fe7ef957e39caa501a9b55ceda39549be0f7600d13c6c7c82072bc889b88a750ffbb89c533e97a56ba431e9fb0738cd77ce66e0c2c6ccaa8 SHA512 fbd6310f13793f00524d12ea66860f3579225dae035efbc4a663a26ac640a7fa37de2cd53703488c9a007fa6604bc26c2b0a8e6642a58e200c6240facbbfec4b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kab.tar.gz 509814 BLAKE2B 4006cf1d809fde169d753ccedbd039611593f3f83f32d31814407b39c0211c436ffd8642ed414b831a3197a0713e0b02e93e7b861ac87502f7634f45612d3b2f SHA512 a1860d285c4d4ec4d832a8498d229a41499cde5275e342d78ff791e8ae113e6a49a318e0e998fc7b4b72a9933a986e27f2d3f64ca8ba5234cab96f51dfe114db
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kk.tar.gz 891778 BLAKE2B bbeeb64364696fb4bc693b33986eec5acda5facef2e8e6f35ca05d0b4681c84b219817bc1ac132a1a6c85c94086852191f532275e762c5ac687aa69667b7960d SHA512 6acacd000e804dca86cf2272cb66a6ec8cd732a723b13bdcc35243246e87f8ad8db9293c44fb7a2f1f588c9c15e4124f8727d423f03b350021cf7740b41fafe7
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_km.tar.gz 689678 BLAKE2B 114250617ae5f32b8b85e54c8bd94dc49e5fb41b893a74a9e727a3fd465298a3ace499a80bbea29ceb2cb534f8e582bc3ec6b19315ca5e45d8d1d6d091d381a7 SHA512 a4f23722fdb49616b399cc61f08a53d3341202be79be639857f0937f31c0b834ce8bc69e71c4c7eca5fa9242d4730d151eec03c5c092785559f72c559291d594
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 266267 BLAKE2B e6fcd1c82d44fce9443a3cca48e9ca9e7d8ea7385c39f4e302f460c9462ca7bc09f02891a1a89c4026f5a4925e1a9ac37bb816e40ca6fef74885ad47defd73ee SHA512 c882af3f50283ddc6eca178204e71f01d611aa3cb01711aa3aa3ff5c4e26a65b1abd48786bfb5998b60f536f0d213133b3ec8e11b2a7c1d978b4c6a71c47b153
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kn.tar.gz 466895 BLAKE2B 4880d3a475afbe267206720b009411e104d21e0018c5e07836f2011b56c5e26efd9af1e161edd8a186146262a40dfe3bda4e36b3139371f44eb0de424b6e05f1 SHA512 6e3e83237726807a00b5df1700d7da7f05988671d193d3e827f13e632d166d4aaa64309f087439f9071c9823b5ec665547c031cc3be621736bcbd34c83e9b4eb
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ko.tar.gz 1481614 BLAKE2B ce81c9b5a22be0a0b3c8dedf1dbae0de82c14f5da4aa119a7582895eba4d86522542a0dda9f7db98e3e94f7795f845e96b0c9a7b798377a3836fc4d4bc544815 SHA512 60e55542829386dc5dc3ad3a8e9a55af25ee54a3302857f46cddac76c06c6f94e19fc625891bd6d3a67791cf7eba69ce0dbe20831948f8b10b60f50202fa2bdf
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kok.tar.gz 333356 BLAKE2B 4b1720b236312ff41a0a7c2ca0c269ad709b8208d93348845e1a2f487fad972451e8233c6cf2bfa193dc8669d167d01814cf0ce3070b2f2fba1d2e31302d29ed SHA512 f00f583499adfd5531829c05aaea353f85a6a9dcd23507d9bbf0b6b47e2c8160ca7899815dc9e0266765ab804c569905c16d526d61077923d422a85e7a272b91
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ks.tar.gz 267563 BLAKE2B ebb6572de815cb5225f3da6eba7cf0ed8f5b88f135b1e798f3a43239ac14f8e1c3eac47ad9d85436f0c4e1b35e8ee9baccc223f5bbfae7fb8af7c2bf498afc99 SHA512 57c40db0eab7769f317cc67d38e609f38f8d49fce3c59afe1aaf5651bbb6d60269be48d54db8e31841216650986ac9f223e432e1a11a8eddc4fd04dd9f1f60fd
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lb.tar.gz 125361 BLAKE2B 751d5c692ad7ec58e1d1a0abbf5dc91cea972803c6a6d76b40edc1b4b214d97b70ffdec509c5f5bebd90f595bab8c9b79556e111456436e917904a815ca9f466 SHA512 31eb2dfb7f5f18d2a8f7fd0d5599e15b96bf088427c95742ec2208cf1a73667820b8c565508d9f7ac360604d5b9db8fd12b546376a8e87fddea2389fc434451c
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lo.tar.gz 449098 BLAKE2B 40ce61a39364674a9a7593a12461b71d86d3fc88f16af55a0fa2ac45f3ac4f5448c98c23dbe1c04c0851ddd11befbd82f3087af1de11de0a106065baffdffd80 SHA512 ff2118f6e24959b21e4f5f6a0a2970a8dd659cf0db4db14fab0526f28c58b791bcc846888ab4c77cdf37f8853f90b3bc69081390ecde695b9c7a7ff78e5d25ae
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1065331 BLAKE2B 1073014f4d0445938673cc3aa988e5159d8661d86003ed30c983c4a9c1c649da83b1b23376d9140eac052ec351e138251c7c1eacc22e634af983906540a757bf SHA512 36edfac055af48039471fc09823718f74d75e7cb240392f93b8f3a2c8b3a8c1e24724dc95146a03409586416ca90bcff220577136e718e1abdfa981bb3e494d0
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lv.tar.gz 979372 BLAKE2B f2a459f1beecfcae401c520a88229ba87f75c57c708e736c294d1e702309f80500ace377126608447f94d2a6ef77e67b832d0eb9d4e4426ee66b5c2a0ecaf48e SHA512 35e38f38ad5d76ef3a0abaa4dd2e0c9d0185705faffce2fcae331bd497ea7e87c89e0ed4403140501b170b572bbec03db21006015ac685ea731cc00451cbd8d5
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mai.tar.gz 272118 BLAKE2B ffe0fb7fec33fac7d5b64f02fa4a5c031284fc307f1e60cf33f1811c80cd9c70af5288e35dc25ce9a2da4aa8aa817ac2e8eaa0be786ecde2eae7be408ef813eb SHA512 ebaaaa8c126c61e1157ccfc4be973bd6e099eef743cab4b4d4d21c6fd84451ca017d6616bf9ba1ba04547a8e4f1d5ae7f70a797a3e894a0c925713b7ea45f396
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mk.tar.gz 379567 BLAKE2B 386e2c3aee42a71e7d7d3139c66310997b5d230fd68789a00762a12c023e55e4ae97debfb4c079d14a91535e18573c0b0357f69c9ffeba0f9c5a21c7540327f3 SHA512 ebf9cbf641627613f3c8354dc2e4fe8d562af1e8f3c7ede064c5c9256042ad0a88f60dedcd3996c2979baf0e2d2c57736c3fe295b68c4ad487d4a6a80ad05b62
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ml.tar.gz 433828 BLAKE2B 66827e7abba5cd929920a6f8dae48cf09fc64d3ec137fac028047caa673815ad964b4ed973ab185cc25a3a65f15cbd6a578eecbb07b8c648f00ccac22aab3f43 SHA512 e912fce2fd92d87d0818b25a1d95a7623ee9fe82ab5b1aa2d02c6cd582724bdc63fff19300c82d954c6f77992e8aad2aa4bc98cddc9dc477c7c48142e870a2d3
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mn.tar.gz 2321343 BLAKE2B b3cba8d977d93dccf1c958a7dbdc35d6adf6031ec265e527a242f066d05204b96515102e6a96a2e70ee695f6f2e29fa0bb3f077e94b5fc16297d5020a4b84a71 SHA512 ac36172614e966db56341f37416323bc2d8b75424ab0b354ae8ce4eddc71df3d512dd91bace6bcda2b3d9e41c5e8f01f7b8da12a27d16be41b658da2ff81b2fd
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mni.tar.gz 327134 BLAKE2B 2f07591c2a171fe6e5bc5fe1fd88607597d493134bad57a03549e574113ee3c012f3047aaf139e9489c88df97d908c7b80314a55541b750a5f4d9c94b8ccb6e3 SHA512 89d74eb66e5ad1501f136b20681ea5886bc6d2bf3d91a06c03af22f42139481a37c00def97338b2c69f085313405959b28970fb5c2f357c0d5e7f5a9521bbbb2
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mr.tar.gz 462749 BLAKE2B 027cd555ee17f05a22f030a8574f483239afbaa6a60d53988526c7a0c59b6b72ae4dab50d12c0f38c69c81c2ec925a71959d7c8e8d5a53d6166c67e3b14cea06 SHA512 7b3cba0a6d837f2b7a2e65a4ccb0195fd1545437765b54581878ef92eb0b432b5925c187971d97bb61afd47bb2347c8576ee4f64533bcb4615045997ff9a9046
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_my.tar.gz 375452 BLAKE2B 16727a481d290d85f5b12f32d94a09120f515d459c2c1ac2b17fe09410e96bebbff1d5685dbf83574795378709755bdfa820ccd7ff82b52918c0a791b155a5ba SHA512 9d8ee9855f5174285b3a4153f2562bfbee9d6c0c1069604558b2471d03a0c5498b2040519647b95a6e60d19563788c90b4efa00651e93fd220f132067ecc7d38
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nb.tar.gz 3541473 BLAKE2B ecc31a491ca3ad78d1fc32e25166d5fc593ae629cb4bee487ba41c8ac53cbab51675fc1566e94e1a25099cb9f35e5b5773d5ca3e2a97022dfdcaf30767f35b1c SHA512 f70e9ac8a4c86f604690e795fbe1d7187cc39291cff3cc361e381a55ae79076d5eddd73458039192c6ea658669ec64a54b47c3afa100a4789e282bc27a955fef
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ne.tar.gz 846825 BLAKE2B 950baef67247302b1cf8a3ac60a15224f2f62cb56d92c7b44dca81d15ad41c79f85c35bb9552e715fa8f96bd0e20ee379c65d5841f313bcef9e352039487a2f7 SHA512 12a1a8e4ec7b8ce64c8991834e53cbe0fe7844d73ce2efac08ec09bb957bab944154165c5d047cd735c4a5021bba6b60d9892ac72de51f329e36333c23835d5e
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1646739 BLAKE2B 59b79856bef52f25cf63d7d79b7895fe42416d48391863f52de28ad03125051e113ae8f65f4c92b8dd4836eda288b0eb74861cedb78d93f5e26953cb70d02e7c SHA512 ff237cfdde1b2ee0f49fd1a0ec9e27ac1d1a890437167550335be924e4b9cdad87418af683a74fb30a0d3b12fc0d9f9a012af5ea10460e83b28582f2327106d2
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nn.tar.gz 3544681 BLAKE2B 937410127b8d102db683c8877162ac2ab50d77d3b48cff93b95851ccfcdcae43c80ef7b89009bcbd1172b00d6d9c89ed12cbb5a8d2ce092684ae90c4ff3969e1 SHA512 9674be78f8be4faecabdb74ae7046f6c6cfe8763aea48549ff6aefed8dff24552395c5fcbc8958d3ee84f7b5f4d799b221d3d096fbfd799faaaa069d5562317e
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nr.tar.gz 228297 BLAKE2B 8811da9cfbee5134e845ff4bb253434b35f403697d2636cf62b8fd5b8cdef1aab99503d9f03051dcc683a810f0f1b3aa34c006005b8d91baee1c6b9aca4a2f96 SHA512 d65e57577831662d7310219a7599ce834ab53b2db06bc5b0038b35183b2c241f4917eddd9285f0e890c17e92a9208b638c94bda2111ab65293f5914c5f05c347
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nso.tar.gz 260153 BLAKE2B 6509b9f26aad274d8f32acaef1daee7a7a2ebcd875334d8c29e6b1f8ca7f949f5251c1c4e8815e0895eeb9c9e7a65579c229baf5621f522a89585a6c3a761cc8 SHA512 f60b9fdfa5738f0882b06a9912a0121ab503ce7f44bc11e02690046d967d6093ccc3f320c035ff79dc1c098bfb8b21329e93d4da46815dee819cd94b63ea7170
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_oc.tar.gz 1167622 BLAKE2B 1202f2b16a3b28df4c00a9edc0f3ebdcb694b4a04e0bccd024bb01f63945c098c6e2e15d7b7790548cfa329d303c4fed69a67cfe0b79f418ed014026967c0f8b SHA512 809f437431847124814e97171b55c0284d8995e248e694374c4d7b00e037a390cf2c13a12e8227e537d4032411dc48b33c91c4ac7e7025e92c76e251a083784f
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_om.tar.gz 389380 BLAKE2B 6482476a14a89c2c6f804b66614ed731a1433159f30dcf9966bd2480eafef594ab782b0846dfc28f101d5f330b715630a9fbc8bf34d2f63f07df3c9db3dac871 SHA512 56acffe2faf6dc902bda178741975e9eb6d415edd9886bfebffc9c626318ca658d24640f15e734a7a7f4206555f619146baffe4f76d0d841600f152bcf105489
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_or.tar.gz 480876 BLAKE2B 7f7bb85cf0db81ac0eec965b2612750b4b054dbebd8d3ae432172d46fc22abcd167dfedb0f0068aebc8ab39154c7ddcfed320a93e3cf8ba78c6eadd1a1faaace SHA512 76f36c20f06fcdded3590785199b95b9dead7c178bc993812342d60ac5ea0c8f64b1d0cb6e1ae623e5bae42bb2b8e9e11f3040de43d669d414ed20566b1145db
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 434479 BLAKE2B e10db883f6133dff93afb7ba2322718ac13c156fa53706eafd5effe9e76473e3cf8497aed11cb4554e444affe01e377ec7170a3fb45f182dd6e3c43af31cca34 SHA512 d9940bc422a2ab141f65c01c63b354fda201e36183bebd593c39d8d3aef7042f4886761b7d90cbef028f135b754a2436731083157bb2d1843a9256904038ea30
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3046271 BLAKE2B a522beedb58c99e41ec040cc5aacac95b81f0c5ff21eafe3b4640710434d3577c1e6d1f8390d6db7bed0b5071f391d76b68f5b14573a516a531cb21b2d5c8286 SHA512 ecc9dd68a946922dd063798c073aaa1cd641e1d0afeab29620b6bf7876770fb635ea6f9716d85979badd1b46238eaa94b02e32009d401e761bd215d6058fda85
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 5741285 BLAKE2B 0b35595cd571da8696ac90ce9b8dbbc3eb7c1f94ef2ce695e72c74c7bb890a5ad20d874ded6f0432ac26bccb8c23e1aa626ea703e03f5c4eb002fd559b10e393 SHA512 973260934d5fedfe86bddcf7320d2b3f9eface4dba9b703bd49ec555e43fe678d0e2b72a1bc61b0dd2cda235b2ba85402f3281d2d4d38934022db8c3c94dbc04
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2388839 BLAKE2B 94cb52c6b7b522a05d31af713be2809e3e089556062bad375088becd0a36d67e852dbccd8d1d89452ea04f8646a566df9fd5d055e06560065ebb4f84f75f5a1c SHA512 97a9081d3383613e10050bff1061234607ba9aa96db25ea5d0f9a6261c7b03ce3918a548837007c6173c562019eb4cfd44a2fa0f48f7e3b7eacc1f6efec7ff42
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2332804 BLAKE2B 235ca0a1c17e19c7a5b2f14b7e528eb7b365935df19e4bc92dfb8eb3d9618753449728f5ff90b907685e4add390004e74f72ad8e6b004c19892afc3267ef9209 SHA512 c91e30b38feca3a9c520db04f13f67d0802eb0ea133ca678249b487beb1949721e606cba63baf9fe7dd42ead0fc262926e261889bec198f218f823a2a7dc48cc
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ru.tar.gz 2241955 BLAKE2B 0286a7d55fa373a4023cf114ab7eb22f69d509e02ff2ff5bcdf9a6943b3d4762b1c6dc1c54dcc5556740ec6755a6173c5fcea2d2d9e15a8013fa5577a43c87f4 SHA512 4d02572bd0f60de79e70d095376af52012cc507a9447c708b0d0b1b2107ac43b7272eaf6f761649ea4e37f83181e14f679f84e9f6deb60f0b2a856bcb95aaa24
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_rw.tar.gz 280567 BLAKE2B de768856a113dab031094a81f51ac9880e0628835e8b906136fd09815bff759a0a437fea0f94f3e228314d1677b4ccf59b560ae209bae5340ce146fa222c1a2f SHA512 e3e67882c1ca92a90e35d172cfb5f35893024184536da521c6717c47245dbaae9e3e517849d35c92ecaf54cd4edf4d6b5aece01c385c7f13481f1c52e9bd9d8f
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 365527 BLAKE2B 74cd8edb0ce91792e08d321d08d16fd3ee225e981b863098438e4cd5ce4485bb7582cde58a1ff045f4714bd7fd9d2e01926fd750e61c4f84b3c69ff4a8c682d0 SHA512 b5ea1936ae133a9bdc4eb88325dbd5dfd66044c15716ede116e7acddd79a19e20511a55adda100332c659d32fd9875475767260b8598b8e86690f9b760357f6a
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sat.tar.gz 415982 BLAKE2B 2cd3cbd86b95e9dc8fbcdf980431b51ec6be3be465136a20f1d227ad4b9b74cd2721b3b835f59ef741dc87c6ad2b7a9f6af6397023246bd1547c5a722cceefd1 SHA512 74eccfc338e065e9a0b504ee4f2a629b8a766335ce7766abcb7e62e3cd7f911e7b7752017bef9cfcf2d223835af14d2d92f903a280eea5e3f67e46be0bf8e9a7
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sd.tar.gz 346046 BLAKE2B 2eec45492c490767da4376fda6d953afb1290d904e1e030e44e4b8597d2186318cd095ed7d17149da3a4fb2ea40ea305e58a9f4666dcc1d0da07c9aef92756a9 SHA512 6313ad30b38cda3a41f2f718d3cf881d919f7a72dd9c61db5f3a370c9212716bf24ae61b7bd8f1be7ee1b1c8c5f51a104e21d0816e8e773d1d192e861f2f8bc7
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_si.tar.gz 656972 BLAKE2B 6255467edc379e83677ff2f715470e187c7427d033f7253a4fa268dfc1f4956dd7074ead5857dc841cb1ca77e246975062f180df5cdb1545781b2519a387f4a9 SHA512 7a72ae201356df156c8aae7e5df983434613c77ac5605c81eb8ef4549b5c11a41c8580f5dc36b0a3894167ba34bb7d373bf3386971b1f4de7a87a6b234b87a23
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sid.tar.gz 418981 BLAKE2B 017ac2f1e6fbb868d707077a355412e0a6442205016f0277ace5efca781d222221ae8fa6d8968f031a5bada2f580d5db08301a8ade5e077577e6ab594306ec92 SHA512 4e1b1f6dbc286b32edd0b428e042ceea84f4f2cad32d515b2d99f48d328bfe1c2f006246bdedfa5eb6b2426529c2b04bbb5fd80ed0fe93ac2ecae1d2c4604989
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2105838 BLAKE2B 2922f31633bb674559b6d2ed2fb3f2ac99901c9a3d615022f6484181e4898d35910dcec7e1751b58849c7fff86ab635bc1d8b8b10b61a51086340ec0f7afc6ca SHA512 05539ef1a6a9884aec7f4f32b50c8a377be364b12d03fee0d3b726aceacee805c18f349d732ae8038ba6a1094285ef6a00af26783d2a5cc71df0bba84c25e6b3
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2497986 BLAKE2B 74d5e8eac7d7aabfdfdb6667e7130b97f0b35623d40ae89f0452e05010c61fd4a4d9697d804227cd746e894f5ca0b522fd56022490780fbc76ca7a58c5464df1 SHA512 1a46bbcda2365782b79dc824bc78f9d5f9409d972dc3000220ca8be04a4c9d2413dfb569d2e1c18e0204cb96114d673af6f89048723f16fda9221b2041e1bd5e
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1078091 BLAKE2B 9c8dce30bf820e7f93ad937dac7f1453b751d34af9aa0647c4dc4ecf84f3faa1483d2ce6a8c67942bf16df3f57d63e2ae7ab7e829029ec1d7391cc30cb7690b3 SHA512 9ed54127cb8ea43b5567c69bbf479a37f184c5c3ec1f73895c3a18eaeff611a4bf215af3c40ff7f1549d2a6db96404491e367628a71d61800c4e8078f763df9b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2293244 BLAKE2B 809ee4707ac594058c61208ecdb4f75683a12ea17e26b38ea411abddb5745e18ab5ccd6363b5ecbca964403530b98bd19c509cb6d062a2c2885800fa69fc98bc SHA512 a38ce5ddc07ddd254a91b3b0574b4291b4f78dc4f79cddc51e6ebd0457c4236a388d5e7e09017c5dd6d8aab62aa57675a0ed95c2c1e1727628fb0451117cdffb
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2700853 BLAKE2B f0c91a47396e764fd356258eae44dd54b7aa23d06fc648c06852e1355780f4c520b391391d1c6dc3daa84c7a30070cab8b057eebb1e6830cb97433ba09f5b250 SHA512 53e5b6f244e642605e36e9cc0e66b1cb58b2f39ef3e5f9a2f88e2959ec855c3dae9a8e21a6650e4402da46b1e9db41849109f361d0a0c3df6fb267fece1c1a5d
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ss.tar.gz 234618 BLAKE2B c683d72d7646d770a1771e8a17e18f80ad5607d3d32cafaf3d66c4cce078499efffaebd3d3bbbea3756a4553bac88a8200759cb61cff939db1a71464bfd245cd SHA512 257cdefd33ffb12ddbd904892260d32afc6ac9999ca37056c64cc42a6d668530839faac982220785c252c90d1828196c21e35c6492f7d8991856914be13cd86b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_st.tar.gz 229603 BLAKE2B af5281b2c5576675f3c8fd57be090e92a763d6e048b20096869a8d277bdcc09e3bcc91bb44fd3a28d9900fd09c38566740f0e68f5da563591004680dd247146b SHA512 da0df8046fe1bb4570b97d0e7a1a3758f22329f3735eb657061ba4218ce1bbc3f0fe9d1420eef17382b4c665c1c70b7792c2a640571a75499e23e6a6d015f3ee
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2633156 BLAKE2B a283136c6edb92557ec4c4914fb3c48c5bcfb9018c07081dd83a1c8ed0eac2b4391b94038d43093541cbc9f5c84af60a9bfdea8575b82f0731c8593442441b59 SHA512 936fe83569b2a5f4264998081fb539cddbd15887106b9a7955f8d9585eba1808d76e603a5fb6951a20e0b1324154bee55a6702934d377ebea871c0368538b34d
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 256860 BLAKE2B 27731849423dc2e20830295175bd41fe48d9c308e8f1c90fb889dbeb9d131e622e5ce49a7855f2ae2d8b645f09c532023d423875706e394b79c815a022ce6600 SHA512 ad25baa244926fe7992f023abe4c21f1827f15d4aef9046dae8fbc85787367a540c06e84146d07584d09a20433499ecf7c9131ae0976e49ecf442158a2ef8f9f
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_szl.tar.gz 585743 BLAKE2B 38e1860eb74a4901060dae83890dc9e35f738b0f70c100a8d52f5697c652e183ddbc11e04dad29451ff5fecf45f18b1ce28c368dbf94f6b39c541dd54c26ff0a SHA512 9e1313159572016318edc402dcfb5611d2cafab24374db7aa0e190ebf7b2cdd04ae98ed12a0eb615e6e0b61448639f43e9d4443aa34cb63095997a71b42dd926
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ta.tar.gz 616886 BLAKE2B a881c7d90824fe964924ca8c78af5756cefa434e6c035560eca46728baea2c30b28643b4120c9e053b428a6b9fdb0a34cd0df5fb1a2f0c233259e11c799b5a38 SHA512 a1ddaf420b9a92e89c02056fb9f00aacad64a8927b14901f30638352611370a82853ed1f44c39fea15bb59c52e145fc0d3fe82fbab9956e301bfccfecd09e3ba
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_te.tar.gz 973321 BLAKE2B 80b09d1c8e22d809a9995be08debb5dc83f57e37f371cb88ca0eeef4526b7c1c38e3ae9f83b110482b6a902e8c43fd231e978225baaa7c9fc98057c29f531d27 SHA512 dc9c5b9197323b225d70139461eedb837db591cf992503290f9751270aba477bb8042943f83eb28488916e40befdef73f930dac5c3a8f8e283478d9af5dc1704
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tg.tar.gz 312593 BLAKE2B d8edb2a82b60436834431d5c314a304e43e67d29a91c0b4b4158dd3090fd04a5760f499fc5d427717fe47ac75c609cc7a35064382a667ff36d5379a67e9b725e SHA512 6eefc85e9f40fb4c2a69fb4e5bbdec56c90f4b2b47f2dd75ce1639d7024e7befe7c25bc4c94f58e8f8ab777254d8efac35d1b5adaadd2767ee7145a2cfc73331
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_th.tar.gz 887091 BLAKE2B 211c93bbd33925d0d3ff69785fb19738c47af1320e248b16fc665796ef9429287d25ed7a71a9e092348a202c1a48682af1a502ac5fddd57f94d90851e590fa77 SHA512 3ec233ca077d520cd7934317426a084301572e16995a152b6d4df33f08dab628174c086cd4297eb0b7a18662f3a492db363c8ede470a49e2d2070d2d9c75e2fc
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tn.tar.gz 214747 BLAKE2B 6373da2b77c19b62c928ccc71e0a71d0c1a909e177f794dce116d5cdf186f26a9dea5632504f96ec32535c269c535c2d79aab884a64b70d8368bfc045d0d4a85 SHA512 6965ed99a31162da4c7763b4dff3103792f074f9e230e2dfb350686be704ecaf2f13a3d7b198427a5780d7e566337f752a6ffc0c57759b2d70d8c259fb6c3688
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tr.tar.gz 3005626 BLAKE2B d4d78f9db55d06c94b983fe8b741615f8a84e4d42f65d13aa5b666c37c460bd84a68e8f2b85a429f5cdff827f30cafb02703f30e5baf86c9136886c05d46c1ff SHA512 75dda0db8b0212627d6bf5348914abbc258b8c0a3a7996bbbca369507b5f86450f2ea64b0d1e4a90f62b3141203c7727c6915c97139496cb048c013ef0fa423d
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ts.tar.gz 227349 BLAKE2B 6d9438833fdadaa02178f50082ddc7aa724dffbade67ef022156a95ee2a6dbdf312ac35cee8cfeda10178aa86f10a011896fee1aa72fbc893a0c75c069bde60e SHA512 b0ac7786d49a6d151dbf8c910e3cb883cd2b4b11339bcc68aaf2ba80e8636426e15a12222663999ae83388259abdeb9c43a3799dbaa9facbad174566267ae0ba
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tt.tar.gz 148588 BLAKE2B 67b8ebbc88d474a27ae06bd156d4e0cbdd859bcd664a5f8e6c54314bbb5362b0da0b9a4797b04fb037ee21bbb627ed0f7773e6369b1e2d99a60b20407c64ecad SHA512 be2cbb63668b5122139fa418dd63369aab9d2bacc2b38008c7076d3756fbbac9f6814fbfc49983fcf9239fe02970be2db208a1c29510a760a170b39d9c9d037f
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ug.tar.gz 442419 BLAKE2B 240877e67445b3c5a64260aea6f36d569376737cdb97bfb67a998c5215e1eb72ba888aee412d976b2c6a876da379bfb22c8a811fb6e5288ab9670978b0a45a20 SHA512 22b3e20e2598796caaecdfcf3f352750d3d622a7d39a71c985663b1cd817afa200c48d29a21452989da85397d09ed8225ae7a8eff836a4ceb65f95832bbd5718
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uk.tar.gz 2716385 BLAKE2B abdf0e715e210b94f9a696f770c2c1bdfbf47f8f2c34437df38658735e08b0867c650d68eb7f84bb0fef0659e01d2e5ec87e35dff81b0ea153016ea7699dc394 SHA512 31372d4846eb5c4738483cb9816e8569d09dc59f1c1e7979d03d49d3d13ecccb9921b6fef99f7f1eb624b27ce52f4c99f552fe68cd984d4aa80aa5e7478de3f7
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uz.tar.gz 248445 BLAKE2B c4699def4d68bf6ca61f6c0bc16321294edc192fd6c657ebb47e46f92f8d219d690c3c5c298461f787799bfede780228f6e9da94ffc09ec9177c6a5807a3ddc6 SHA512 8d4dc15f4d16db8550ab0e2e01dc907731a77ce04f242cabd8e314bcfbb831d2724ad5ee406056faf586851c88b9c6e5eacf6e0253ec696fccae020ee36c41f3
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ve.tar.gz 230716 BLAKE2B 98d216f55b04c61084394bb0022c3017761591ecb6716816fb2a32a828493a8d67864e8b05216b6ba91bd08cc2e5e9d2b67b340684628b1589423a20926af47f SHA512 478e46f9aa7549bc2ad4da46e650faa37321675f014aa14affedace565e2858f0549406e00c81aa453c12f4910a214971d62cf2818cfa328a4b45a20609f7108
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vec.tar.gz 602647 BLAKE2B 8642019e63c98f6d0ebea77944bf18b5da9026bdd1ef115096b458785b580fdcae239710dd0497df9251cde5cbc26b0cdc95eebf2a25b62b079b6b92a0922a71 SHA512 65955c26f98f8fd9c3cab0c88bfdbc570838b8a8cbc57964e7fe84845117f1acf6919c94d6b552b93f83aca0ca1aceaebb052199a76e24135bfa6ecf241a4f6d
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vi.tar.gz 451165 BLAKE2B 9f207939eec797933904def45790732ee1ac50963361d69884c11b9e1fd9b7ee01711e552503a42b48ea547743d76820b8d682049d967fb4fd37afd423de7f0a SHA512 55b2643a48e2f1300d2ac675ee356b1f80b4358fc03a56a64593d6224578ff79af8d6c65a35c9229015a81a5c48269fba9183e80319bedfb83bfa3effabd647b
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_xh.tar.gz 235109 BLAKE2B 4f568c0689c57b969c9d9de8fcf4aee6001cf281a56bc222a41a0bd8d41994631dcf9a359590915c8e8cd788bd673e1bb71b39fe562ede2aefa0c21ea809321d SHA512 374b477e7761c45252388ee6416c9219b205a76c8d4bb7b1d117f7d5771845e48d50b913db48ecec7cb83ff95c40caf85219d3623ad8bc12c1cea1ab83d6b9da
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 914845 BLAKE2B f6bbb55d81f35137e0d95a1db11f5c43e4c33622fa2fead3f44d1acaeaeac8a87e45cbdc884ccaf93c9dde863696b29715d5c2c462d929bd8c4baae0fc54ad09 SHA512 74daf894376f5ed3419a3bd542391c0939d98e795c9737ff895aad33d56604fb609a7c1ed56c1b08545106e2a53f73cf977bd1113bea17f52ff3aa263111fced
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 944392 BLAKE2B eea956fba39d0e4134073eb0ca9c1fb85a8af6cd4410942b352d6a716a87e0962991b30ad9482c7fd728c18319058acf277b5fcca81d5b1a4810c345764ec657 SHA512 653a25a84a94907c7541c13dd4bb62af66615a5aead9e402acc45b7feaf1ca98ef3cef7eb4b2a90b54d0f511edca61e4cffe44120bcd0b9b91eeba189380b2a9
+DIST LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zu.tar.gz 258944 BLAKE2B f045b4d8792ce625d16bd6e284be9de6fe014e3cb460f31faec64b7312952489106e317727bdee7294990bba8957dc1cb5b72d64fce5c5dcbf67c142e424ee93 SHA512 ae30c9df1291f1acf83a5ff01b54c96b1bae98aacb08cd51f0b60b18473496b098ab9b18ebd665ea5d1d21c0b8e6d9ad8e0924f3df4f2c69e50c16b922d3d6a3
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.5.1.1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.5.1.2.ebuild
similarity index 100%
rename from app-office/libreoffice-l10n/libreoffice-l10n-7.5.1.1.ebuild
rename to app-office/libreoffice-l10n/libreoffice-l10n-7.5.1.2.ebuild
diff --git a/app-office/sc-im/Manifest b/app-office/sc-im/Manifest
index a085c5e62cde..e87e88fee0d7 100644
--- a/app-office/sc-im/Manifest
+++ b/app-office/sc-im/Manifest
@@ -1 +1,2 @@
 DIST sc-im-0.8.2.tar.gz 1619617 BLAKE2B 1957b79749012b5e8b24e26f3cde63c84bf971d2183791f986c98ec823a9ab74bf8a126dcdb2a58920af07e068520ebd7efe9c9394235c5a58670f120495e980 SHA512 ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c
+DIST sc-im-0.8.3.tar.gz 1664440 BLAKE2B 9f02e265ecd39b4f3a5e3ab61222094a1424f9591c04ff3ddf745576f2aa1c89345ea2e4d4c95a0565d7f287985e81d9eba849113f5b7aa61744cf69284ce312 SHA512 a3d7cf99c7c959d24ebf7e525abb665c02690674c9b3cdf5b234dcdb376fd73e9488bda522106802932084bbfd239928e39b35743c7051178aa14edf61ec2cb8
diff --git a/app-office/sc-im/sc-im-0.8.3.ebuild b/app-office/sc-im/sc-im-0.8.3.ebuild
new file mode 100644
index 000000000000..f0befe2dda44
--- /dev/null
+++ b/app-office/sc-im/sc-im-0.8.3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs flag-o-matic
+
+DESCRIPTION="Ncurses based, vim-like spreadsheet calculator"
+HOMEPAGE="https://github.com/andmarti1424/sc-im"
+SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="lua ods plots tmux wayland X xls xlsx"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	sys-libs/ncurses:=
+	lua? (
+		${LUA_DEPS}
+	)
+	ods? (
+		dev-libs/libxml2
+		dev-libs/libzip
+	)
+	plots? ( sci-visualization/gnuplot )
+	tmux? ( app-misc/tmux )
+	wayland? ( gui-apps/wl-clipboard )
+	X? ( x11-misc/xclip )
+	xls? (
+		dev-libs/libxls
+	)
+	xlsx? (
+		dev-libs/libxlsxwriter
+		dev-libs/libxml2
+		dev-libs/libzip
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-alternatives/yacc
+	virtual/pkgconfig"
+
+pkg_setup() {
+	CONFLICTING=$(usex tmux "tmux " "")$(usex wayland "wayland " "")$(usex X "X" "")
+	if ( use tmux && ( use wayland || use X ) ) ; then
+		elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+		elog "tmux support has been preferred."
+	elif ( use wayland && use X ) ; then
+		elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+		elog "Wayland support has been preferred."
+	fi
+
+	# Run lua setup
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Clean Makefile from all sorts of flag / lib setting
+	sed -i -e '/CFLAGS +=\|LDLIBS +=/d' Makefile \
+		|| die "sed fix failed. Uh-oh..."
+	# Also clean the now useless comments and logic
+	sed -i -e '/#\|if\|else/d' Makefile \
+		|| die "sed fix failed. Uh-oh..."
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	LDLIBS="-lm"
+
+	# default flags that dont need optional dependencies
+	append-cflags -Wall -g \
+		-DNCURSES \
+		-D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE \
+		'-DSNAME=\"sc-im\"' \
+		'-DHELP_PATH=\"/usr/share/sc-im\"' \
+		'-DLIBDIR=\"/usr/share/doc/sc-im\"' \
+		'-DDFLT_PAGER=\"less\"' \
+		'-DDFLT_EDITOR=\"vim\"' \
+		-DUSECOLORS \
+		'-DHISTORY_FILE=\"sc-iminfo\"' \
+		'-DHISTORY_DIR=\".cache\"' \
+		'-DCONFIG_FILE=\"scimrc\"' \
+		'-DCONFIG_DIR=\".config/sc-im\"' \
+		'-DINS_HISTORY_FILE=\"sc-iminfo\"' \
+		-DUNDO \
+		-DMAXROWS=65536 \
+		-DUSELOCALE \
+		-DMOUSE \
+		'-DDEFAULT_OPEN_FILE_UNDER_CURSOR_CMD=\""scopen"\"' \
+		-DAUTOBACKUP \
+		-DHAVE_PTHREAD
+
+	# setting default clipboard commands
+	if use tmux ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"'
+	elif use wayland ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""wl-copy <"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""wl-paste"\"'
+	elif use X ; then
+		append-cflags '-DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard <"\"'
+		append-cflags '-DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection clipboard"\"'
+	fi
+
+	# optional feature dependency
+	use plots && append-cflags -DGNUPLOT
+	if use xls; then
+		append-cflags -DXLS $(${PKG_CONFIG} --cflags libxls)
+		LDLIBS+=" $(${PKG_CONFIG} --libs libxls)"
+	fi
+	if use xlsx || use ods ; then
+		append-cflags -DODS -DXLSX $(${PKG_CONFIG} --cflags libxml-2.0 libzip)
+		LDLIBS+=" -DODS -DXLSX $(${PKG_CONFIG} --libs libxml-2.0 libzip)"
+	fi
+	if use xlsx ; then
+		append-cflags -DXLSX_EXPORT $(${PKG_CONFIG} --cflags xlsxwriter)
+		LDLIBS+=" -DXLSX_EXPORT $(${PKG_CONFIG} --libs xlsxwriter)"
+	fi
+	if use lua ; then
+		append-cflags -DXLUA $(${PKG_CONFIG} --cflags lua)
+		LDLIBS+=" -DXLUA $(${PKG_CONFIG} --libs lua) -rdynamic"
+	fi
+	append-cflags $(${PKG_CONFIG} --cflags ncursesw) || append-cflags $(${PKG_CONFIG} --cflags ncurses)
+	LDLIBS+=" $(${PKG_CONFIG} --libs ncursesw)" || LDLIBS+=" $(${PKG_CONFIG} --libs ncurses)"
+}
+
+src_compile() {
+	emake LDLIBS="${LDLIBS}" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" install
+	einstalldocs
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ff954b7d0573..6dc53176f3a7 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 26495c8a9f5f..372229f03bc7 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,2 +1,2 @@
-DIST gemato-18.0.gh.tar.gz 85575 BLAKE2B a923c3d7731b70798d9baf7e9faf0884723bb5e15b4e24712ecd807b79e8ca7e1532f894cf6a3b675bd72419eac41f1481fcd34fb21c9989871141819b036fa2 SHA512 9491579c3d80f9b500da2a50aed173641d049293e37f11c3c06616ff49949cae16dfd274ae79dcacca4bb4c27baf30a5f3900f45fc3dfb2b9fb5da8139db63e3
 DIST gemato-19.0.gh.tar.gz 86174 BLAKE2B b13e17f3b4388df4c0b6980db8347d68f9e6cb2657cdbcb28a8466bcdebed9e986ecac2f0f88e549741eb62accd91ed48a8ee4a714a5decce68e1529174a4c90 SHA512 3a8dfc94770e4063da8f1bf42ffc4c261345af89edd223bbf64033a82c2e31cb3369b98467fdbe9bf911b76e5ef964b676b94803579525697ddc31be1b83017b
+DIST gemato-20.0.gh.tar.gz 86296 BLAKE2B 663a479650fa6b7a989882c9233ba1cf11b5a528ef4ccc14aed2c32c7a52d877fd1efe9af29c5ed61ee0f8c846e89a52547a2cb6d0256ede5816527defe876ef SHA512 e8b3c515e7dcf32b34101d644ba658b3c534b117407f3b65543dfb684f9569969468c6a5d0290e698d204de6c4a2a18baf722c8e7a6d24d079319310e82e6803
diff --git a/app-portage/gemato/gemato-18.0.ebuild b/app-portage/gemato/gemato-18.0.ebuild
deleted file mode 100644
index b9fde110b002..000000000000
--- a/app-portage/gemato/gemato-18.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="
-	https://github.com/projg2/gemato/
-	https://pypi.org/project/gemato/
-"
-SRC_URI="
-	https://github.com/projg2/gemato/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg pretty-log tools"
-
-RDEPEND="
-	gpg? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	pretty-log? (
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		>=app-crypt/gnupg-2.2.20-r1
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-19.0.ebuild b/app-portage/gemato/gemato-19.0.ebuild
index 7e02cc9bba9d..b9fde110b002 100644
--- a/app-portage/gemato/gemato-19.0.ebuild
+++ b/app-portage/gemato/gemato-19.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+gpg pretty-log tools"
 
 RDEPEND="
diff --git a/app-portage/gemato/gemato-20.0.ebuild b/app-portage/gemato/gemato-20.0.ebuild
new file mode 100644
index 000000000000..7e02cc9bba9d
--- /dev/null
+++ b/app-portage/gemato/gemato-20.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="
+	https://github.com/projg2/gemato/
+	https://pypi.org/project/gemato/
+"
+SRC_URI="
+	https://github.com/projg2/gemato/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="+gpg pretty-log tools"
+
+RDEPEND="
+	gpg? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	pretty-log? (
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		>=app-crypt/gnupg-2.2.20-r1
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use tools; then
+		exeinto /usr/share/gemato
+		doexe utils/*.{bash,py}
+	fi
+}
diff --git a/app-portage/pkg-testing-tools/Manifest b/app-portage/pkg-testing-tools/Manifest
index 936e7ff08c1e..cff5875a1865 100644
--- a/app-portage/pkg-testing-tools/Manifest
+++ b/app-portage/pkg-testing-tools/Manifest
@@ -1 +1,2 @@
 DIST pkg-testing-tools-0.1.0.tar.gz 6131 BLAKE2B 6d8dddb81e57159df9f2e1897718433d29f330286afb868a1111db4e0bb7a53823df57a5d7084a24fd5807787f169fff137f5c6c0bdcddeec2c59090d9b90775 SHA512 05165d3790b4d38c939226d1149c0c44cd62fe222a199bce8f1e108d12475710f8482f82e2e2e45223ba24fd1b50451dea8b3761c8f474a59e660b9a67bf8ab4
+DIST pkg-testing-tools-0.1.1.gh.tar.gz 6184 BLAKE2B 6aa98fe5916a89bb1e4512e2fa015e1e48145e15c463476370247cc1447637e80ec485fdb2b9bb49a691ffc4a5c3bde3be04fbc91ba48e5e29cfc19ac66848ec SHA512 6fbd8dce11e6ba1427736585cab0496582e89b1a545017c4c59cff8735de29948d2b810bb6e01e3b66f6dfaa75c14e023e66b2dd7e01e81519bd2a4c90964561
diff --git a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.1.ebuild b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.1.ebuild
new file mode 100644
index 000000000000..7172c7fe5599
--- /dev/null
+++ b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Packages testing tools for Gentoo"
+HOMEPAGE="https://github.com/slashbeast/pkg-testing-tools"
+SRC_URI="https://github.com/slashbeast/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index cfb3f0574e14..55506d36436d 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -10,7 +10,7 @@
 		<flag name="qtegrity">Build qtegrity applet, this adds additional dependencies for OpenSSL</flag>
 	</use>
 	<upstream>
-		<remote-id type="cpe">cpe:/a:gentoo:portage</remote-id>
+		<remote-id type="cpe">cpe:/a:gentoo:portage-utils</remote-id>
 		<remote-id type="gentoo">proj/portage-utils</remote-id>
 		<remote-id type="github">gentoo/portage-utils</remote-id>
 	</upstream>
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index cf45f9ed1f0f..d9efc88decca 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/bash-5.1_p16-r3.ebuild b/app-shells/bash/bash-5.1_p16-r3.ebuild
new file mode 100644
index 000000000000..9ff113498a62
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p16-r3.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+	case ${PV} in
+		*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
+
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+	        patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="app-alternatives/yacc
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
+
+	"${FILESDIR}"/${PN}-5.1_p16-configure-clang16.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+
+			local patch
+			for patch in "${MY_PATCHES[@]}" ; do
+				verify-sig_verify_detached ${patch}{,.sig}
+			done
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
+	keepdir /etc/bash/bashrc.d
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/files/bash-5.1_p16-configure-clang16.patch b/app-shells/bash/files/bash-5.1_p16-configure-clang16.patch
new file mode 100644
index 000000000000..8d77fbd968a7
--- /dev/null
+++ b/app-shells/bash/files/bash-5.1_p16-configure-clang16.patch
@@ -0,0 +1,37 @@
+https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00000.html)
+
+From 2cdf8b42885189b3cf7c47096b01f104e520546a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 2 Feb 2023 05:43:37 +0000
+Subject: [PATCH] aclocal.m4: fix -Wimplicit-function-declaration in dup2 check
+
+dup2 requires a <unistd.h> include. Fixes the following when diffing config.log
+ when testing with a stricter compiler:
+```
+-warning: call to undeclared function 'dup2'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
++error: call to undeclared function 'dup2'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+```
+--- aclocal.m4
++++ aclocal.m4
+@@ -284,6 +284,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken,
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ int
+ main()
+ {
+--- configure
++++ configure
+@@ -16990,6 +16990,9 @@ else
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ int
+ main()
+ {
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index dd1caf4451c6..a01ef666b3cd 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1 +1,2 @@
 DIST yash-2.53.tar.xz 755956 BLAKE2B 191bdc6fcda7c3043d3db53b70fcdba86fab740df2aaf1249380c4679f51ec61b9a36c51a7982c516f51f8a2605729d7242d81f738523edfc07f21be1a06ff45 SHA512 9bc6dcc9864fbba6200b76dad50b9eb1620b578fceaea5d1dd34e2efda379be0e4255d56e49c9595dc184ddf45951418e87a88dc6507d41cc4220f38b7044994
+DIST yash-2.54.tar.xz 758916 BLAKE2B 902bb06fa70be4980ea2a9def3cc910ff33d51350a37c5ec5a12fe7282a8e41e5a4a55bc45f66d3dd45b33cacc9af46110dc37c37d2978f686c3a1a7a8fd23b5 SHA512 360dc55782def4ce8c1a5cf12836ec86405dfbe338c6a623c8031e84f76da1bfa2e5a5ad05c1a62ea7b516681457d124398e2194e2d23824c19216eb3807e155
diff --git a/app-shells/yash/yash-2.54.ebuild b/app-shells/yash/yash-2.54.ebuild
new file mode 100644
index 000000000000..c520a04f1b52
--- /dev/null
+++ b/app-shells/yash/yash-2.54.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="en ja"
+
+inherit flag-o-matic plocale toolchain-funcs
+
+DESCRIPTION="Yash is a POSIX-compliant command line shell"
+HOMEPAGE="https://yash.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/78345/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
+	test? ( sys-apps/ed )"
+
+src_configure() {
+	append-cflags -std=c99
+
+	sh ./configure \
+		--prefix="${EPREFIX}"/usr \
+		--exec-prefix="${EPREFIX}" \
+		$(use_enable nls) \
+		CC="$(tc-getCC)" \
+		LINGUAS="$(plocale_get_locales | sed "s/en/en@quot en@boldquot/")" \
+		|| die
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4de864818eb4..ad58cd7fcc84 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild
index 2db419cb5e12..ec1d75efbbdf 100644
--- a/app-text/hunspell/hunspell-1.7.2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index c6f3a254a35a..8108cfab629e 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1 +1,2 @@
 DIST iso-codes-v4.12.0.tar.gz 14977180 BLAKE2B 23590e9a4f246a0879e68c521ae7f72f4dd8d41ef85e7b6efaa4e4a29b7bf2e45d5e200ae14523e4ef8d3d4c8f45e783d4231a2a1c679be1898aa04528da30d3 SHA512 d0cdac626728e4de7c5bb2f8edd968a29380d49ba2b43ebe3820756591e46d4301859da7961ec9fc9e6832e18a9a0d5562ec02dd3d8a52bec7f7cbfc3190869e
+DIST iso-codes-v4.13.0.tar.gz 14990054 BLAKE2B e9e9a166675c09ecfe62da92608e91d4d6aeb53306e6162ea432bba418d074ef54cf510071aae6407bdc1fe59c295e52e2c7862e0d5b8962f467834c117f4912 SHA512 fd180b8462eb1ee2fd49bc144fd8b1b866067512a5deec3f580689641c596f623a11f0384e8c05cb48de520e1ce7c0270a649ef37542ba51f93e244b45bc5bba
diff --git a/app-text/iso-codes/iso-codes-4.13.0.ebuild b/app-text/iso-codes/iso-codes-4.13.0.ebuild
new file mode 100644
index 000000000000..2cb3270120b4
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.13.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 5dfa9ac206d7..682a1a0e30d6 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,2 +1 @@
-DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
 DIST kbibtex-0.9.3.1.tar.xz 4219496 BLAKE2B dc57f8f54ec6cbadc1b0b529387a47524f3ceb9e69a79e777a9b69c14c8cd2f240a6153bf9f95f5f5c57483a93c84505d6673625ccb38233c3a3b177bc20b4c4 SHA512 2e7406c16e1e520973166d6a4d27f4e3d51a4276ea25de611d09010ca40e3b0ea56fce6c29589ae51c58096c362cab11b439df0d80ff1b6951d4b92d46262e27
diff --git a/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch b/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch
deleted file mode 100644
index 91cc51f9303c..000000000000
--- a/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 84b0551eb141b3a7904ceec158d040200c995023 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 8 Apr 2021 22:07:15 +0200
-Subject: [PATCH] Fix crash with newer Qt versions
-
-Assign m_internalModel before calling into
-QSortFilterProxyModel::setSourceModel since that can end up calling filterAcceptsRow
----
- src/gui/file/sortfilterfilemodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/file/sortfilterfilemodel.cpp b/src/gui/file/sortfilterfilemodel.cpp
-index 73707cec..87657aa2 100644
---- a/src/gui/file/sortfilterfilemodel.cpp
-+++ b/src/gui/file/sortfilterfilemodel.cpp
-@@ -40,8 +40,8 @@ SortFilterFileModel::SortFilterFileModel(QObject *parent)
- 
- void SortFilterFileModel::setSourceModel(QAbstractItemModel *model)
- {
--    QSortFilterProxyModel::setSourceModel(model);
-     m_internalModel = dynamic_cast<FileModel *>(model);
-+    QSortFilterProxyModel::setSourceModel(model);
- }
- 
- FileModel *SortFilterFileModel::fileSourceModel() const
--- 
-GitLab
-
diff --git a/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch b/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch
deleted file mode 100644
index fdc42d97810b..000000000000
--- a/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1153930536abe9f0331acef67dc40b18210eb07e Mon Sep 17 00:00:00 2001
-From: Thomas Fischer <fischer@unix-ag.uni-kl.de>
-Date: Sat, 1 Oct 2022 23:15:52 +0200
-Subject: [PATCH] Fix creation of URL from user input
-
-... when opening a document associated with a bibliographic entry.
-
-BUG: 459150
----
- src/parts/part.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/parts/part.cpp b/src/parts/part.cpp
-index 5324647f..9dc35d1c 100644
---- a/src/parts/part.cpp
-+++ b/src/parts/part.cpp
-@@ -914,7 +914,7 @@ void KBibTeXPart::elementViewDocumentMenu(QObject *obj)
-     QString text = static_cast<QAction *>(obj)->data().toString(); ///< only a QAction will be passed along
- 
-     /// Guess mime type for url to open
--    QUrl url(text);
-+    QUrl url{QUrl::fromUserInput(text)};
-     QMimeType mimeType = FileInfo::mimeTypeForUrl(url);
-     const QString mimeTypeName = mimeType.name();
-     /// Ask KDE subsystem to open url in viewer matching mime type
--- 
-GitLab
-
diff --git a/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild b/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild
deleted file mode 100644
index 7d15539e9748..000000000000
--- a/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org optfeature
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="webengine zotero"
-
-RESTRICT="test"
-
-DEPEND="
-	app-text/poppler[qt5]
-	dev-libs/icu:=
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}: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/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/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	virtual/tex-base
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	zotero? (
-		>=app-crypt/qca-2.3.0:2[qt5(+)]
-		dev-libs/qoauth:5
-	)
-"
-RDEPEND="${DEPEND}
-	dev-tex/bibtex2html
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-w-newer-Qt.patch"
-	"${FILESDIR}/${P}-fix-creation-w-url-from-user-input.patch" # KDE-bug 459150
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package zotero Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "PDF or PostScript document previews" "kde-apps/okular:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index f9f9ef82da0e..83a532983584 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,2 +1 @@
-DIST libspectre-0.2.10.tar.gz 436690 BLAKE2B 8c1d25225a212b7e8d2bab7cffa4298509450cf727e38d0be22d27ed5fb161a0f838967afa3f8aa265c2bd243431bbfb92976cf51ee52ee7d3b0479000215546 SHA512 01738f452f99878beaa528b15d8df463ca22d625306d636e1a6199ade9f068d284f1def3882e954a06e5f066937343f79d0c2197fbb19ab53ef1ab0540c72f2f
 DIST libspectre-0.2.11.tar.gz 435887 BLAKE2B 46e289553dafe520c76a779ce64f8f5e320541221d885e5707284dd6d89ace7985a0a658fcf26c5ea750fd2751dd2bab0913333cda563ab5ee29c4132f8c99a5 SHA512 97335bc927006031fad8be55befae44bec33347f058f5b1fcf828a8a8d45a6fae2d51ceae4aaffcfa563c7592fdffe1e5a4993f145d6832ec81019c00ae0e37f
diff --git a/app-text/libspectre/libspectre-0.2.10.ebuild b/app-text/libspectre/libspectre-0.2.10.ebuild
deleted file mode 100644
index 50aad4538d17..000000000000
--- a/app-text/libspectre/libspectre-0.2.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library for rendering Postscript documents"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
-SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug doc"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND=">=app-text/ghostscript-gpl-9.53.0:="
-DEPEND="${RDEPEND}"
-
-# does not actually test anything, see bug 362557
-RESTRICT="test"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug asserts)
-		$(use_enable debug checks)
-		--disable-static
-		--disable-test
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libspectre/libspectre-0.2.11.ebuild b/app-text/libspectre/libspectre-0.2.11.ebuild
index 1eef15dbadcb..b7007809eeb6 100644
--- a/app-text/libspectre/libspectre-0.2.11.ebuild
+++ b/app-text/libspectre/libspectre-0.2.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc"
 
 RDEPEND=">=app-text/ghostscript-gpl-9.53.0:="
diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch
new file mode 100644
index 000000000000..bebdf3909e81
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch
@@ -0,0 +1,25 @@
+From 37757db262425d793b17b63821d9014d3655e50a Mon Sep 17 00:00:00 2001
+From: Sebastian Rasmussen <sebras@gmail.com>
+Date: Thu, 1 Dec 2022 00:04:40 +0100
+Subject: [PATCH] gl: Use posix_spawnp() in order to search PATH for binaries.
+
+---
+ platform/gl/gl-main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
+index d5ae69c95..271ac43a6 100644
+--- a/platform/gl/gl-main.c
++++ b/platform/gl/gl-main.c
+@@ -122,7 +122,7 @@ static void open_browser(const char *uri)
+ 	argv[0] = (char*) browser;
+ 	argv[1] = (char*) uri;
+ 	argv[2] = NULL;
+-	err = posix_spawn(&pid, browser, NULL, NULL, argv, environ);
++	err = posix_spawnp(&pid, browser, NULL, NULL, argv, environ);
+ 	if (err)
+ 		fz_warn(ctx, "cannot spawn browser '%s': %s", browser, strerror(err));
+ 
+-- 
+2.39.1
+
diff --git a/app-text/mupdf/mupdf-1.21.1-r1.ebuild b/app-text/mupdf/mupdf-1.21.1-r1.ebuild
new file mode 100644
index 000000000000..590791e7653f
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.21.1-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="+drm +javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+	dev-libs/gumbo
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[truetype]
+	media-libs/jbig2dec:=
+	media-libs/libpng:0=
+	>=media-libs/openjpeg-2.1:2=
+	>=media-libs/libjpeg-turbo-1.5.3-r2:0=
+	javascript? ( >=dev-lang/mujs-1.2.0:= )
+	opengl? ( >=media-libs/freeglut-3.0.0 )
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+	"${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
+	"${FILESDIR}"/${PN}-1.19.0-darwin.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+	"${FILESDIR}"/${P}-no-drm.patch
+	"${FILESDIR}"/${P}-fix-aliasing-violation.patch
+	# See bug 893604
+	# Fixed in upcoming release
+	"${FILESDIR}"/${P}-fix-url-processing.patch
+)
+
+src_prepare() {
+	default
+
+	use hppa && append-cflags -ffunction-sections
+
+	use drm && append-cflags -DGENTOO_MUPDF_DRM
+
+	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iCXX = $(tc-getCXX)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+	# Adjust MuPDF version in .pc file created by the
+	# mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+	sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+		-i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+	#
+	# * mujs
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
+		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	_emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+	if use opengl || use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon -s scalable docs/logo/new-${PN}-icon.svg
+	else
+		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+	fi
+
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+
+	# Respect libdir (bug #734898)
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \
+		|| die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/pandoc-bin/pandoc-bin-3.0.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.0.1.ebuild
index f5289c741e6a..254155b50637 100644
--- a/app-text/pandoc-bin/pandoc-bin-3.0.1.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-3.0.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 arm64"
 IUSE="+pandoc-symlink"
 
 RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 08cfb9abe240..e3a71b9a187f 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1 +1,2 @@
 DIST pytextile-4.0.1.tar.gz 49282 BLAKE2B b51220ff33fe43b83d0aefee840b5170747015073fbe88934798c2505c3455e9805eee8815ec8068521c88a44a309bd0eb32e84757d088536f1c12a1f9bc0ca0 SHA512 e299663fd71b935e9c948649baba80584b1339dd3393a3f37b39475fe1d6a4addaaa2adcd16ba57b4c5db43ab9f8de6e9332871915b1fff7b7882ad5e8d64580
+DIST python-textile-4.0.2.gh.tar.gz 49296 BLAKE2B e9ac36b0ecf401a07aea1037c1f4390e440123d7e16f8fef64c257d27f6ef9c6918018ff34e9f8ad367767f3ebc5ce7957be424b2e6dac62fe8a1f7736b8eff7 SHA512 eb59e44b9a8521bcfa98f476e23efd727ffd867277d24f102bbb9511a99a0d636c324e22f8562382074007f304490c4ec6a5fde529f41b15f055a9cf16d49b8e
diff --git a/app-text/pytextile/pytextile-4.0.2.ebuild b/app-text/pytextile/pytextile-4.0.2.ebuild
new file mode 100644
index 000000000000..e0c784fe396a
--- /dev/null
+++ b/app-text/pytextile/pytextile-4.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P="python-textile-${PV}"
+DESCRIPTION="A Python port of Textile, A humane web text generator"
+HOMEPAGE="
+	https://github.com/textile/python-textile/
+	https://pypi.org/project/textile/
+"
+SRC_URI="
+	https://github.com/textile/python-textile/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# tests that need network access
+		tests/test_getimagesize.py
+		tests/test_imagesize.py
+		tests/test_textile.py
+	)
+	epytest -o addopts=
+}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index c017d9f7b371..d2b68fab5f83 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -2,3 +2,5 @@ DIST qpdf-11.1.1-doc.zip 7062109 BLAKE2B f9ffa32efa3835427773ee6ef87985388722b86
 DIST qpdf-11.1.1.tar.gz 18464793 BLAKE2B 66fa80b513bc5ef033a60011e34df1c6e9ac6a8b777ab1eb30aeddfa077827dcfe30f6ea5816ab0ec208840d4dc2b4e3823449378b5bc50073ae1d754fb124c4 SHA512 da7540152a82cbb853089afa2503ece04086513bab662171758f1e0e928ac09cc7c00e61470bd5ec5285d99ef586b59ad66d5ff90e9060b1361d837fe18cbc24
 DIST qpdf-11.2.0-doc.zip 7066797 BLAKE2B c30d3d768bc0d49d751a4c15d3dd5c72040a0b983acc4844d57ab445a57b61023f24f21a4fedf5d336cc906c68feba511aa33ab8cfc45a463cc37e9162970ad9 SHA512 388fc34b34a1b2b1ad227c8dec8bc464472b150faba30d403e1256cc20a61921e33758e338a8fb2d177694d80af5b87c32ea3f7f258b4796f5e6688117ced768
 DIST qpdf-11.2.0.tar.gz 18450040 BLAKE2B e42aeaf911f9d912eb0abfbebbe737ab9927c337b46cf96f9286ec3ce562c887c23922695435da90f04e8149e16de204563832e1fd742ffe8665d123efc6c699 SHA512 6e28be1fc9cb6aa124229301a43a565ef80ffffab9bacaeabebfbf4ced17c9702a432330a995be390a8fe3d69ac1773ca72b6c24e40f1bf74a71219e02dbac70
+DIST qpdf-11.3.0-doc.zip 6781831 BLAKE2B 0b494ff62e197a60d82a170a27816676dc465d1a53f4201955dd8063980c09df31ddfd206e6625c5cfdc1994026651a2fe8278b1b73a4bc13de4b0a30c2cbbb4 SHA512 c652ba56b4c740af74889579732e18336910b09edbe125783ad4b6b1556df0cc3f32e2514c9bb611aebe233a8708d58701ed466ba6b4f3ff652ed56527650b9c
+DIST qpdf-11.3.0.tar.gz 18732977 BLAKE2B 80dd2a96f3b82b9e530f26c72cd24cd3b111e2e1cbe821b12af13807e8d54fbc7f5632130f5cbd03df1b7c70de3c94a7e889d4ea4f1a3670a28f726364564b16 SHA512 1c8a0b62d50efb4c09885f36244048797dea44f28917aefe0266e2b158858ea19d477bbc445abbd3b7180a3de56d6a819ff44275cdc0979827effba9739b53d2
diff --git a/app-text/qpdf/qpdf-11.3.0.ebuild b/app-text/qpdf/qpdf-11.3.0.ebuild
new file mode 100644
index 000000000000..c51d758ec28e
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="https://qpdf.sourceforge.net/"
+# TODO: verify-sig
+SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	doc? ( app-arch/unzip )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local mycmakeargs=(
+		-DINSTALL_EXAMPLES=$(usex examples)
+
+		# Breaks install with USE=-doc in 11.0.0?
+		#-DINSTALL_MANUAL=ON
+	)
+
+	if use ssl ; then
+		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+		local crypto_provider_lowercase=${crypto_provider,,}
+		mycmakeargs+=(
+			-DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+			-DREQUIRE_CRYPTO_${crypto_provider}=ON
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc ; then
+		mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
+	fi
+
+	cmake_src_install
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+}
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 8468144b98d1..75b9a6a5e99d 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,2 +1 @@
-DIST qpdfview-0.4.18_p20211227.tar.bz2 485165 BLAKE2B 1efdebf84ffbcedf464615e6ef2ef4092ef3210177e5faf17bb01c39243fdd5b11434459dad897a04acff0cf037129d2a524d37c670ae57556219421c363d1c5 SHA512 ea2206d9f2cbd5bf53ab75c8e78a5b3e30136febcf82630c375d664645d6b5e72c6128fb7b63cb65ec511c2c23014ceddd93495c520e9cddd1c52f01377bea17
 DIST qpdfview-0.5.tar.gz 925408 BLAKE2B 8ce8ff82893c90012ea1b35a582e87783da87e6eba3d4a10e78fe7810c269908ed1541cf40b1eb17fc474254131cebbc4832a3f46a2016262c485d48e222791b SHA512 1b6b479bb42f4568c21b5f6cb0c552c4323739ba9fe46cea80cc199f48b0b49a278e0a2fb0d21f83bafb467e43dd37352b99ef41795d140220bb82d704e03926
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild b/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild
deleted file mode 100644
index 5b11c1b9a136..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ast az be ber bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hi hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zgh zh_CN zh_TW"
-inherit plocale qmake-utils xdg
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-# bzr revision 2137
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	cups? ( net-print/cups )
-	djvu? ( app-text/djvu )
-	fitz? ( >=app-text/mupdf-1.7:= )
-	postscript? ( app-text/libspectre )
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5[cups?]
-	dev-qt/qtwidgets:5
-	dbus? ( dev-qt/qtdbus:5 )
-	pdf? ( >=app-text/poppler-0.35[qt5]
-		dev-qt/qtxml:5 )
-	sqlite? ( dev-qt/qtsql:5[sqlite] )
-	svg? ( dev-qt/qtsvg:5 )
-	!svg? ( virtual/freedesktop-icon-theme )
-	synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
-	default
-
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-	prepare_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_help() {
-		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
-	}
-
-	plocale_find_changes translations ${PN}_ .ts
-	plocale_for_each_locale prepare_locale
-	plocale_for_each_disabled_locale rm_help
-
-	# adapt for prefix
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-}
-
-src_configure() {
-	local myconfig=() i=
-	for i in cups dbus djvu pdf svg synctex; do
-		use ${i} || myconfig+=(without_${i})
-	done
-	use fitz && myconfig+=(with_fitz)
-	use postscript || myconfig+=(without_ps)
-	use sqlite || myconfig+=(without_sql)
-
-	local myqmakeargs=(
-		qpdfview.pro
-		CONFIG+="${myconfig[*]}"
-		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
deleted file mode 100644
index 0f90da8d9af7..000000000000
--- a/app-text/sword-modules/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<use>
-		<flag name="esoteric">Install modules with no linguistic content, in unknown languages etc.</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-text/sword-modules/sword-modules-2.6.ebuild b/app-text/sword-modules/sword-modules-2.6.ebuild
deleted file mode 100644
index 85a4aa416131..000000000000
--- a/app-text/sword-modules/sword-modules-2.6.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language"
-HOMEPAGE="https://www.crosswire.org/sword/modules/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-LANGS=" af ar az be bea bg br ceb ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
-IUSE="esoteric ${LANGS// / l10n_}"
-
-RDEPEND="
-	|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs )
-	app-dicts/sword-Personal
-	esoteric? (
-		app-dicts/sword-Phaistos
-		app-dicts/sword-Sentiment
-	)
-	l10n_af? (
-		app-dicts/sword-Afr1953
-	)
-	l10n_ar? (
-		app-dicts/sword-AraNAV
-		app-dicts/sword-AraSVD
-		app-dicts/sword-alzat
-	)
-	l10n_az? (
-		app-dicts/sword-Azeri
-		app-dicts/sword-NorthernAzeri
-	)
-	l10n_be? (
-		app-dicts/sword-Bela
-	)
-	l10n_bea? (
-		app-dicts/sword-BeaMRK
-	)
-	l10n_bg? (
-		app-dicts/sword-BulCarigradNT
-		app-dicts/sword-BulVeren
-	)
-	l10n_br? (
-		app-dicts/sword-BretonNT
-		app-dicts/sword-br_en
-	)
-	l10n_ceb? (
-		app-dicts/sword-CebPinadayag
-	)
-	l10n_ch? (
-		app-dicts/sword-Chamorro
-	)
-	l10n_chr? (
-		app-dicts/sword-Che1860
-	)
-	l10n_ckb? (
-		app-dicts/sword-Sorani
-	)
-	l10n_cop? (
-		app-dicts/sword-CopNT
-		app-dicts/sword-CopSahBible2
-		app-dicts/sword-CopSahHorner
-		app-dicts/sword-CopSahidicMSS
-		app-dicts/sword-CopSahidica
-		app-dicts/sword-SahidicBible
-	)
-	l10n_cs? (
-		app-dicts/sword-CzeB21
-		app-dicts/sword-CzeBKR
-		app-dicts/sword-CzeCEP
-		app-dicts/sword-CzeCSP
-	)
-	l10n_cu? (
-		app-dicts/sword-CSlElizabeth
-	)
-	l10n_cy? (
-		app-dicts/sword-WelBeiblNet
-	)
-	l10n_da? (
-		app-dicts/sword-DaNT1819
-		app-dicts/sword-DaOT1871NT1907
-		app-dicts/sword-DaOT1931NT1907
-	)
-	l10n_de? (
-		app-dicts/sword-GerAlbrecht
-		app-dicts/sword-GerAugustinus
-		app-dicts/sword-GerBoLut
-		app-dicts/sword-GerElb1871
-		app-dicts/sword-GerElb1905
-		app-dicts/sword-GerGruenewald
-		app-dicts/sword-GerKingComm
-		app-dicts/sword-GerLeoNA28
-		app-dicts/sword-GerLeoRP18
-		app-dicts/sword-GerLutherpredigten
-		app-dicts/sword-GerMenge
-		app-dicts/sword-GerNeUe
-		app-dicts/sword-GerOffBiSt
-		app-dicts/sword-GerReinhardt
-		app-dicts/sword-GerSch
-		app-dicts/sword-GerTafel
-		app-dicts/sword-GerTextbibel
-		app-dicts/sword-GerZurcher
-		app-dicts/sword-MAK
-		app-dicts/sword-Rieger
-	)
-	l10n_el? (
-		app-dicts/sword-GreVamvas
-	)
-	l10n_en? (
-		app-dicts/sword-2BabDict
-		app-dicts/sword-AB
-		app-dicts/sword-ABP
-		app-dicts/sword-ABS_Essay_GoodSam_SWB
-		app-dicts/sword-ACV
-		app-dicts/sword-AKJV
-		app-dicts/sword-ASV
-		app-dicts/sword-Abbott
-		app-dicts/sword-AbbottSmith
-		app-dicts/sword-AbbottSmithStrongs
-		app-dicts/sword-AmTract
-		app-dicts/sword-Anderson
-		app-dicts/sword-BBE
-		app-dicts/sword-BDBGlosses_Strongs
-		app-dicts/sword-BWE
-		app-dicts/sword-BaptistConfession1646
-		app-dicts/sword-BaptistConfession1689
-		app-dicts/sword-Barnes
-		app-dicts/sword-Burkitt
-		app-dicts/sword-CBC
-		app-dicts/sword-CPDV
-		app-dicts/sword-Catena
-		app-dicts/sword-Cawdrey
-		app-dicts/sword-Clarke
-		app-dicts/sword-Common
-		app-dicts/sword-Concord
-		app-dicts/sword-DBD
-		app-dicts/sword-DRC
-		app-dicts/sword-DTN
-		app-dicts/sword-Daily
-		app-dicts/sword-Darby
-		app-dicts/sword-DarkNightOfTheSoul
-		app-dicts/sword-Diaglott
-		app-dicts/sword-Dodson
-		app-dicts/sword-EMBReality
-		app-dicts/sword-EMTV
-		app-dicts/sword-Easton
-		app-dicts/sword-Etheridge
-		app-dicts/sword-Family
-		app-dicts/sword-Finney
-		app-dicts/sword-Geneva
-		app-dicts/sword-Geneva1599
-		app-dicts/sword-Godbey
-		app-dicts/sword-GodsWord
-		app-dicts/sword-Heretics
-		app-dicts/sword-Hitchcock
-		app-dicts/sword-ISBE
-		app-dicts/sword-ISV
-		app-dicts/sword-Imitation
-		app-dicts/sword-Institutes
-		app-dicts/sword-JCRHoliness
-		app-dicts/sword-JEAffections
-		app-dicts/sword-JESermons
-		app-dicts/sword-JFB
-		app-dicts/sword-JOChrist
-		app-dicts/sword-JOCommGod
-		app-dicts/sword-JOGlory
-		app-dicts/sword-JOMortSin
-		app-dicts/sword-JPS
-		app-dicts/sword-JST
-		app-dicts/sword-Josephus
-		app-dicts/sword-Jubilee2000
-		app-dicts/sword-KD
-		app-dicts/sword-KJV
-		app-dicts/sword-KJVA
-		app-dicts/sword-KJVPCE
-		app-dicts/sword-KingComm
-		app-dicts/sword-LEB
-		app-dicts/sword-LITV
-		app-dicts/sword-LO
-		app-dicts/sword-LawGospel
-		app-dicts/sword-Leeser
-		app-dicts/sword-Lightfoot
-		app-dicts/sword-Luther
-		app-dicts/sword-MHC
-		app-dicts/sword-MHCC
-		app-dicts/sword-MKJV
-		app-dicts/sword-MLStrong
-		app-dicts/sword-MollColossians
-		app-dicts/sword-Montgomery
-		app-dicts/sword-Murdock
-		app-dicts/sword-NETfree
-		app-dicts/sword-NETnotesfree
-		app-dicts/sword-NETtext
-		app-dicts/sword-NHEB
-		app-dicts/sword-NHEBJE
-		app-dicts/sword-NHEBME
-		app-dicts/sword-Nave
-		app-dicts/sword-Noyes
-		app-dicts/sword-OEB
-		app-dicts/sword-OEBcth
-		app-dicts/sword-OSHM
-		app-dicts/sword-OrthJBC
-		app-dicts/sword-Orthodoxy
-		app-dicts/sword-PNT
-		app-dicts/sword-Packard
-		app-dicts/sword-Passion
-		app-dicts/sword-Pilgrim
-		app-dicts/sword-Practice
-		app-dicts/sword-QuotingPassages
-		app-dicts/sword-RKJNT
-		app-dicts/sword-RNKJV
-		app-dicts/sword-RWP
-		app-dicts/sword-RWebster
-		app-dicts/sword-RecVer
-		app-dicts/sword-Robinson
-		app-dicts/sword-Rotherham
-		app-dicts/sword-SAOA
-		app-dicts/sword-SME
-		app-dicts/sword-SPE
-		app-dicts/sword-Scofield
-		app-dicts/sword-Smith
-		app-dicts/sword-Spurious
-		app-dicts/sword-StrongsGreek
-		app-dicts/sword-StrongsHebrew
-		app-dicts/sword-TCR
-		app-dicts/sword-TDavid
-		app-dicts/sword-TFG
-		app-dicts/sword-TSK
-		app-dicts/sword-Torrey
-		app-dicts/sword-Twenty
-		app-dicts/sword-Tyndale
-		app-dicts/sword-UKJV
-		app-dicts/sword-Webster
-		app-dicts/sword-Webster1806
-		app-dicts/sword-Webster1913
-		app-dicts/sword-Wesley
-		app-dicts/sword-Westminster
-		app-dicts/sword-Westminster21
-		app-dicts/sword-Weymouth
-		app-dicts/sword-Worsley
-		app-dicts/sword-Wycliffe
-		app-dicts/sword-YLT
-	)
-	l10n_eo? (
-		app-dicts/sword-Esperanto
-	)
-	l10n_es? (
-		app-dicts/sword-SpaPlatense
-		app-dicts/sword-SpaRV
-		app-dicts/sword-SpaRV1865
-		app-dicts/sword-SpaRV1909
-		app-dicts/sword-SpaRVG
-		app-dicts/sword-SpaTDP
-		app-dicts/sword-SpaVNT
-	)
-	l10n_et? (
-		app-dicts/sword-Est
-	)
-	l10n_eu? (
-		app-dicts/sword-BasHautin
-		app-dicts/sword-en_eu
-	)
-	l10n_fa? (
-		app-dicts/sword-FarHezareNoh
-		app-dicts/sword-FarOPV
-		app-dicts/sword-FarTPV
-	)
-	l10n_fi? (
-		app-dicts/sword-FinBiblia
-		app-dicts/sword-FinPR
-		app-dicts/sword-FinPR92
-		app-dicts/sword-FinRK
-		app-dicts/sword-FinSTLK2017
-	)
-	l10n_fr? (
-		app-dicts/sword-FreAug
-		app-dicts/sword-FreBBB
-		app-dicts/sword-FreBDM1707
-		app-dicts/sword-FreBDM1744
-		app-dicts/sword-FreBailly
-		app-dicts/sword-FreCJE
-		app-dicts/sword-FreChry
-		app-dicts/sword-FreCrampon
-		app-dicts/sword-FreDAW
-		app-dicts/sword-FreGBM
-		app-dicts/sword-FreGeneve1669
-		app-dicts/sword-FreJND
-		app-dicts/sword-FreKhan
-		app-dicts/sword-FreLSN1872
-		app-dicts/sword-FreLXX
-		app-dicts/sword-FreOltramare1874
-		app-dicts/sword-FrePGR
-		app-dicts/sword-FrePilgrim
-		app-dicts/sword-FreSegond1910
-		app-dicts/sword-FreStapfer1889
-		app-dicts/sword-FreSynodale1921
-	)
-	l10n_ga? (
-		app-dicts/sword-IriODomhnuill
-	)
-	l10n_gd? (
-		app-dicts/sword-ScotsGaelic
-	)
-	l10n_gez? (
-		app-dicts/sword-Geez
-	)
-	l10n_got? (
-		app-dicts/sword-Wulfila
-	)
-	l10n_grc? (
-		app-dicts/sword-ABPGRK
-		app-dicts/sword-Antoniades
-		app-dicts/sword-Byz
-		app-dicts/sword-Elzevir
-		app-dicts/sword-GreekHebrew
-		app-dicts/sword-LXX
-		app-dicts/sword-MorphGNT
-		app-dicts/sword-Nestle1904
-		app-dicts/sword-OxfordTR
-		app-dicts/sword-SBLGNT
-		app-dicts/sword-SBLGNTApp
-		app-dicts/sword-TNT
-		app-dicts/sword-TR
-		app-dicts/sword-Tisch
-		app-dicts/sword-VarApp
-		app-dicts/sword-WHNU
-		app-dicts/sword-f35
-	)
-	l10n_gv? (
-		app-dicts/sword-ManxGaelic
-	)
-	l10n_he? (
-		app-dicts/sword-Aleppo
-		app-dicts/sword-HebDelitzsch
-		app-dicts/sword-HebModern
-		app-dicts/sword-HebrewGreek
-		app-dicts/sword-MapM
-		app-dicts/sword-OSHB
-		app-dicts/sword-SP
-		app-dicts/sword-SPDSS
-		app-dicts/sword-SPMT
-		app-dicts/sword-SPVar
-		app-dicts/sword-WLC
-	)
-	l10n_hi? (
-		app-dicts/sword-HinERV
-	)
-	l10n_hr? (
-		app-dicts/sword-CroSaric
-	)
-	l10n_ht? (
-		app-dicts/sword-Haitian
-	)
-	l10n_hu? (
-		app-dicts/sword-HunIMIT
-		app-dicts/sword-HunKNB
-		app-dicts/sword-HunKar
-		app-dicts/sword-HunRUF
-		app-dicts/sword-HunUj
-	)
-	l10n_hy? (
-		app-dicts/sword-ArmEastern
-		app-dicts/sword-ArmWestern
-	)
-	l10n_it? (
-		app-dicts/sword-ItDizGreco
-		app-dicts/sword-ItNomiBibbia
-		app-dicts/sword-ItaDio
-		app-dicts/sword-ItaRive
-	)
-	l10n_ja? (
-		app-dicts/sword-JapBungo
-		app-dicts/sword-JapDenmo
-		app-dicts/sword-JapKougo
-		app-dicts/sword-JapMeiji
-		app-dicts/sword-JapRaguet
-	)
-	l10n_kek? (
-		app-dicts/sword-Kekchi
-	)
-	l10n_kk? (
-		app-dicts/sword-Kaz
-	)
-	l10n_km? (
-		app-dicts/sword-KhmerNT
-	)
-	l10n_ko? (
-		app-dicts/sword-KorHKJV
-		app-dicts/sword-KorRV
-	)
-	l10n_kpg? (
-		app-dicts/sword-Kapingamarangi
-	)
-	l10n_ktu? (
-		app-dicts/sword-KtuVB
-	)
-	l10n_la? (
-		app-dicts/sword-VulgClementine
-		app-dicts/sword-VulgConte
-		app-dicts/sword-VulgGlossa
-		app-dicts/sword-VulgHetzenauer
-		app-dicts/sword-VulgSistine
-		app-dicts/sword-Vulgate
-		app-dicts/sword-Vulgate_HebPs
-		app-dicts/sword-la_en
-	)
-	l10n_ln? (
-		app-dicts/sword-LinVB
-	)
-	l10n_lt? (
-		app-dicts/sword-LtKBB
-	)
-	l10n_lv? (
-		app-dicts/sword-Latvian
-		app-dicts/sword-LvGluck8
-	)
-	l10n_mg? (
-		app-dicts/sword-Mg1865
-	)
-	l10n_mi? (
-		app-dicts/sword-Maori
-	)
-	l10n_ml? (
-		app-dicts/sword-Mal1910
-	)
-	l10n_mn? (
-		app-dicts/sword-MonKJV
-	)
-	l10n_my? (
-		app-dicts/sword-BurCBCM
-		app-dicts/sword-BurJudson
-	)
-	l10n_nb? (
-		app-dicts/sword-NorBroed
-		app-dicts/sword-Norsk
-	)
-	l10n_nd? (
-		app-dicts/sword-Ndebele
-	)
-	l10n_nl? (
-		app-dicts/sword-DutKant
-		app-dicts/sword-DutKingComm
-		app-dicts/sword-DutSVV
-		app-dicts/sword-DutSVVA
-		app-dicts/sword-NlCanisius1939
-	)
-	l10n_nn? (
-		app-dicts/sword-NorSMB
-	)
-	l10n_pl? (
-		app-dicts/sword-PolGdanska
-		app-dicts/sword-PolUGdanska
-	)
-	l10n_pon? (
-		app-dicts/sword-PohnOld
-		app-dicts/sword-Pohnpeian
-	)
-	l10n_pot? (
-		app-dicts/sword-PotLykins
-	)
-	l10n_ppk? (
-		app-dicts/sword-Uma
-	)
-	l10n_prs? (
-		app-dicts/sword-Dari
-	)
-	l10n_pt? (
-		app-dicts/sword-PorAR
-		app-dicts/sword-PorAlmeida1911
-		app-dicts/sword-PorBLivre
-		app-dicts/sword-PorBLivreTR
-		app-dicts/sword-PorCap
-		app-dicts/sword-PorIBP
-	)
-	l10n_rmq? (
-		app-dicts/sword-Calo
-	)
-	l10n_ro? (
-		app-dicts/sword-RomCor
-	)
-	l10n_ru? (
-		app-dicts/sword-RusCARS
-		app-dicts/sword-RusCARSA
-		app-dicts/sword-RusCARSADICT
-		app-dicts/sword-RusCARSDict
-		app-dicts/sword-RusCARST
-		app-dicts/sword-RusCARSTDICT
-		app-dicts/sword-RusMakarij
-		app-dicts/sword-RusSynodal
-		app-dicts/sword-RusSynodalLIO
-		app-dicts/sword-RusVZh
-	)
-	l10n_sl? (
-		app-dicts/sword-SloKJV
-		app-dicts/sword-SloOjacano
-		app-dicts/sword-SloStritar
-	)
-	l10n_sml? (
-		app-dicts/sword-sml_BL_2008
-	)
-	l10n_sn? (
-		app-dicts/sword-Shona
-	)
-	l10n_so? (
-		app-dicts/sword-SomKQA
-	)
-	l10n_sq? (
-		app-dicts/sword-Alb
-	)
-	l10n_sr? (
-		app-dicts/sword-SrKDEkavski
-		app-dicts/sword-SrKDIjekav
-	)
-	l10n_sv? (
-		app-dicts/sword-Swe1917
-		app-dicts/sword-Swe1917Of
-		app-dicts/sword-SweFolk1998
-		app-dicts/sword-SweKarlXII
-		app-dicts/sword-SweKarlXII1873
-	)
-	l10n_sw? (
-		app-dicts/sword-Swahili
-	)
-	l10n_syr? (
-		app-dicts/sword-Peshitta
-	)
-	l10n_th? (
-		app-dicts/sword-ThaiKJV
-	)
-	l10n_tl? (
-		app-dicts/sword-TagAngBiblia
-		app-dicts/sword-Tagalog
-	)
-	l10n_tlh? (
-		app-dicts/sword-KLV
-		app-dicts/sword-KLVen_iklingon
-		app-dicts/sword-KLViklingon_en
-	)
-	l10n_tr? (
-		app-dicts/sword-TurHADI
-		app-dicts/sword-TurNTB
-	)
-	l10n_tsg? (
-		app-dicts/sword-Tausug
-	)
-	l10n_ug? (
-		app-dicts/sword-UyCyr
-	)
-	l10n_uk? (
-		app-dicts/sword-UkrKulish
-		app-dicts/sword-Ukrainian
-	)
-	l10n_ur? (
-		app-dicts/sword-UrduGeo
-		app-dicts/sword-UrduGeoDeva
-		app-dicts/sword-UrduGeoRoman
-	)
-	l10n_vi? (
-		app-dicts/sword-FVDPVietAnh
-		app-dicts/sword-VieRobinson
-		app-dicts/sword-VieStrongsGreek
-		app-dicts/sword-Viet
-		app-dicts/sword-VietLCCMN
-		app-dicts/sword-VietLCCMNCT
-		app-dicts/sword-VietNVB
-	)
-	l10n_vls? (
-		app-dicts/sword-vlsJoNT
-	)
-	l10n_zh? (
-		app-dicts/sword-ChiNCVs
-		app-dicts/sword-ChiNCVt
-		app-dicts/sword-ChiSB
-		app-dicts/sword-ChiUn
-		app-dicts/sword-ChiUnL
-		app-dicts/sword-ChiUns
-		app-dicts/sword-ZhEnglish
-		app-dicts/sword-ZhHanzi
-		app-dicts/sword-ZhPinyin
-	)
-"
diff --git a/app-text/texlive-core/files/texlive-core-2021-clang-16.patch b/app-text/texlive-core/files/texlive-core-2021-clang-16.patch
index fcfbd26c8ed2..8d5f421544f8 100644
--- a/app-text/texlive-core/files/texlive-core-2021-clang-16.patch
+++ b/app-text/texlive-core/files/texlive-core-2021-clang-16.patch
@@ -3,6 +3,7 @@ https://bugs.gentoo.org/882245
 
 https://github.com/TeX-Live/texlive-source/commit/3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a
 https://github.com/TeX-Live/texlive-source/commit/60b60503b21ea43c68d1ffbe214141a79a36190b
+https://github.com/TeX-Live/texlive-source/commit/bb307f8bd91c5ea4f191b9c788056470626893b7
 
 From 3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a Mon Sep 17 00:00:00 2001
 From: Karl Berry <karl@freefriends.org>
@@ -170,3 +171,51 @@ git-svn-id: svn://tug.org/texlive/trunk/Build/source@64953 c570f23f-e606-0410-a8
  {
  xargc = argc;
 
+From bb307f8bd91c5ea4f191b9c788056470626893b7 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Thu, 2 Feb 2023 22:57:47 +0000
+Subject: [PATCH] avoid implicit wait and exit declarations for C99
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@65717 c570f23f-e606-0410-a88d-b1316a301751
+--- a/texk/xdvik/configure
++++ b/texk/xdvik/configure
+@@ -15455,6 +15455,9 @@ else
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif
+@@ -15476,7 +15479,7 @@ main ()
+ 
+     while (wait(&status) != child)
+       ;
+-    exit(
++    _exit(
+ 	 /* Was there some problem with vforking?  */
+ 	 child < 0
+ 
+--- a/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4
++++ b/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4
+@@ -22,6 +22,9 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif]],
+@@ -40,7 +43,7 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+ 
+     while (wait(&status) != child)
+       ;
+-    exit(
++    _exit(
+ 	 /* Was there some problem with vforking?  */
+ 	 child < 0
+ 
diff --git a/app-text/texlive-core/texlive-core-2021-r5.ebuild b/app-text/texlive-core/texlive-core-2021-r5.ebuild
deleted file mode 100644
index 0c150524ab97..000000000000
--- a/app-text/texlive-core/texlive-core-2021-r5.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TL_SOURCE_VERSION=20210325
-
-# autotools/reautoconf in src_prepare only needed for Cairo patch
-inherit autotools flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-PATCHLEVEL=1
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/${MY_P}.tar.xz
-	https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
-	https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
-
-# We ship binextra collection alongside
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk
-	clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro
-	dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph
-	fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize
-	latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg
-	listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdfjam
-	pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps
-	seetexk spix srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten
-	texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate
-	texware tie tlcockpit tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
-	checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc
-	ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc
-	dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc
-	dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc
-	ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc
-	latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc pdfjam.doc
-	pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc
-	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc spix.doc srcredact.doc
-	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
-	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc
-	texloganalyser.doc texosquery.doc texware.doc tie.doc tlcockpit.doc tpic2pdftex.doc
-	typeoutfileinfo.doc texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc
-"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source
-	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
-	texdef.source texosquery.source texplate.source tlcockpit.source
-"
-# Macros that are not a part of texlive-sources or collection-binextra but still needed
-# for other packages during installation
-TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libX11
-				x11-libs/libXmu
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!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:=
-	dev-libs/mpfr:=
-	>=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:="
-
-BDEPEND="sys-apps/ed
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	>=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
-	)"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-
-	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
-
-	# From texlive-module.eclass.
-	sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
-	sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
-		sort -u |
-		xargs mkdir -p || die
-	local i
-	while read i; do
-		mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
-	done < "${T}/reloclist"
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}" || die
-
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
-		texk/web2c/configure || die
-
-	eapply "${WORKDIR}"/patches
-	eapply "${FILESDIR}"/${P}-cairo-strings.patch
-	eapply "${FILESDIR}"/${P}-slibtool.patch
-	eapply "${FILESDIR}"/${P}-clang-16.patch
-
-	default
-
-	elibtoolize
-
-	# Drop this on 2022 bump!
-	"${B}"/reautoconf libs/cairo || die
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	# Disable freetype-config as this is considered obsolete.
-	# Also only pkg-config works for prefix as described in bug #690094
-	export ac_cv_prog_ac_ct_FT2_CONFIG=no
-
-	# revisit/upstream once we bupm to 2022, bug #882245
-	append-cppflags -D_GNU_SOURCE
-
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--with-system-gmp \
-		--with-system-gd \
-		--with-system-mpfr \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-chktex \
-		--enable-epsfwin \
-		--enable-detex \
-		--enable-dvi2tty \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-shared \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--enable-vlna \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-lcdf-typetools \
-		--disable-ps2pk \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--enable-luatex \
-		--disable-dvisvgm \
-		--disable-ps2eps \
-		--disable-static \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		--disable-build-in-source-tree \
-		--disable-xindy-docs \
-		--disable-xindy-rules \
-		--with-banner-add=" Gentoo Linux" \
-		$(use_enable luajittex) \
-		$(use_enable luajittex luajithbtex) \
-		$(use_enable luajittex mfluajit) \
-		$(use_enable xetex) \
-		$(use_enable cjk dviout-util) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable cjk pmp) \
-		$(use_enable cjk upmp) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x) \
-		$(use_enable xindy)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-
-	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk" || die
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk" || die
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk" || die
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c" || die
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	einfo "Regenerating TeX formats"
-	fmtutil-sys --all &> /dev/null
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-}
diff --git a/app-text/texlive-core/texlive-core-2021-r6.ebuild b/app-text/texlive-core/texlive-core-2021-r6.ebuild
new file mode 100644
index 000000000000..6ef89fc8bfd5
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021-r6.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20210325
+
+# autotools/reautoconf in src_prepare only needed for Cairo patch
+inherit autotools flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+PATCHLEVEL=1
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/${MY_P}.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
+
+# We ship binextra collection alongside
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk
+	clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro
+	dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph
+	fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize
+	latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg
+	listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdfjam
+	pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps
+	seetexk spix srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten
+	texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate
+	texware tie tlcockpit tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc
+	ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc
+	dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc
+	dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc
+	ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc
+	latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc pdfjam.doc
+	pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc spix.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc
+	texloganalyser.doc texosquery.doc texware.doc tie.doc tlcockpit.doc tpic2pdftex.doc
+	typeoutfileinfo.doc texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source texplate.source tlcockpit.source
+"
+# Macros that are not a part of texlive-sources or collection-binextra but still needed
+# for other packages during installation
+TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libX11
+				x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!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:=
+	dev-libs/mpfr:=
+	>=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:="
+
+BDEPEND="sys-apps/ed
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	>=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
+	)"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+
+	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
+
+	# From texlive-module.eclass.
+	sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+	sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+		sort -u |
+		xargs mkdir -p || die
+	local i
+	while read i; do
+		mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+	done < "${T}/reloclist"
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}" || die
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	eapply "${WORKDIR}"/patches
+	eapply "${FILESDIR}"/${P}-cairo-strings.patch
+	eapply "${FILESDIR}"/${P}-slibtool.patch
+	eapply "${FILESDIR}"/${P}-clang-16.patch
+
+	default
+
+	elibtoolize
+
+	# Drop this on 2022 bump!
+	"${B}"/reautoconf libs/cairo || die
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable freetype-config as this is considered obsolete.
+	# Also only pkg-config works for prefix as described in bug #690094
+	export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+	# revisit/upstream once we bupm to 2022, bug #882245
+	append-cppflags -D_GNU_SOURCE
+
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-gd \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-chktex \
+		--enable-epsfwin \
+		--enable-detex \
+		--enable-dvi2tty \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-shared \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--enable-vlna \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-lcdf-typetools \
+		--disable-ps2pk \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--enable-luatex \
+		--disable-dvisvgm \
+		--disable-ps2eps \
+		--disable-static \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		--disable-build-in-source-tree \
+		--disable-xindy-docs \
+		--disable-xindy-rules \
+		--with-banner-add=" Gentoo Linux" \
+		$(use_enable luajittex) \
+		$(use_enable luajittex luajithbtex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk dviout-util) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x) \
+		$(use_enable xindy)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+
+	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk" || die
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk" || die
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk" || die
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c" || die
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+
+	local display_migration_hint=false
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local new_texlive_ver=$(ver_cut 1)
+		local replaced_version
+		for replaced_version in ${REPLACING_VERSIONS}; do
+			replaced_version=$(ver_cut 1 ${replaced_version})
+			if (( replaced_version < new_texlive_version )); then
+				display_migration_hint=true
+				break
+			fi
+		done
+	fi
+
+	if ! ${display_migration_hint}; then
+		return
+	fi
+
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 304401f86477..3524725f2335 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1 +1,2 @@
+DIST zathura-cb-0.1.10.tar.xz 6300 BLAKE2B d541fb78f5ee52a22e58bb885103560bd544a9725cfe210f6b343e97429163a90dd0e9533e6c807134386e6f347bdd17cfc506ffe16642819eae4d1fd27c3b6e SHA512 b85894d052fda45933582299e8c3406413bcb47ed451d81f5906d7bfef94b169c59a57db8b37273c838381ffc7ba55205d714d2e2ec3b597371578a77e131029
 DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index e0e23d23393f..2905913bb5c1 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>nrk@disroot.org</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild
new file mode 100644
index 000000000000..fa6f6f40d74b
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+RDEPEND="app-arch/libarchive:=
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index 3686e39e9456..fa6f6f40d74b 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit meson xdg-utils optfeature
+inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -20,24 +20,15 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND="app-arch/libarchive:=
+RDEPEND="app-arch/libarchive:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
+	x11-libs/gdk-pixbuf:2[jpeg]
 	x11-libs/gtk+:3"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 BDEPEND="virtual/pkgconfig"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index e4c6a7fc5d1c..bb8f92f40d3e 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index b28c0b65bc0f..50c35ebf4357 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,2 +1,2 @@
 DIST ebuild-mode-1.60.tar.xz 36996 BLAKE2B a566c9f602ec6ac4126a4a13610e515faf2a02b8ca89f417a037a28f4b9ea633518d589d78f6deb54084be34cdc30c2a1896546b2f86c1166cedd47289edcfd8 SHA512 b04b37b7a376dc48a7f80ec0e60bf36a8b7ea92edcbdd45fbd002e80e8ea29111905a726177a869d607adffe78094efcdc94b1aad32afe1444a09b4e714dcecd
-DIST ebuild-mode-1.61.tar.xz 38632 BLAKE2B f13f251918cf13533611c4d98a9aeceff10e9253c207a10c047c59952d6c8e50cdddb7c3ff65ed7b9565bd09fb45203c9cb57a277165b9cc7bbb47c5d8978a59 SHA512 a7087894299c3882ff0993a1a33cd192ebec078e7cea2f8964610d758a439350dcf36fe43aa43a42b89446d36b62a9b80bfce531e701b0183f3d69e56528ab62
+DIST ebuild-mode-1.62.tar.xz 39080 BLAKE2B 91bb206f7ca3fecebc80d946d5840ce6e02610171d6179d360b188e270226e4f1dbe4ceddbc1e41f8e627c787b28454a20720d563bbabcffb3a99b7b10a1251d SHA512 9e7caafb45a7538dd66221d2a5dd9fef764c72f6f42db1ad1615e4017b7d4db14dcde09edfa0e8777a528af918e219521072040215d05a9c8a5cdc57ca395bd8
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.61.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.61.ebuild
deleted file mode 100644
index f424613d55e5..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.61.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-BDEPEND="${RDEPEND}"
-
-src_compile() {
-	local XEMACS="${EPREFIX}/usr/bin/xemacs"
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(setq autoload-package-name \"${PN}\")" \
-		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
-		-l autoload -f batch-update-autoloads \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-}
-
-src_install() {
-	insinto /usr/share/xemacs/site-packages/lisp/${PN}
-	doins *.el *.elc
-}
-
-pkg_postinst() {
-	optfeature "ebuild commands support" sys-apps/portage
-	optfeature "additional development tools" dev-util/pkgdev
-	optfeature "ebuild QA utilities" dev-util/pkgcheck
-}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.62.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.62.ebuild
new file mode 100644
index 000000000000..89d7b413d785
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.62.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+	app-xemacs/sh-script"
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+	local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(setq autoload-package-name \"${PN}\")" \
+		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+		-l autoload -f batch-update-autoloads \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+}
+
+src_install() {
+	insinto /usr/share/xemacs/site-packages/lisp/${PN}
+	doins *.el *.elc
+}
+
+pkg_postinst() {
+	optfeature "ebuild commands support" sys-apps/portage
+	optfeature "additional development tools" dev-util/pkgdev
+	optfeature "ebuild QA utilities" dev-util/pkgcheck
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index ce138e5b59b4..fc8af3989c7e 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild b/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
index b692bb33f385..c18985825446 100644
--- a/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
+++ b/dev-ada/e3-testsuite/e3-testsuite-25.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-ada/libadalang/files/libadalang-23.0.0-test.patch b/dev-ada/libadalang/files/libadalang-23.0.0-test.patch
new file mode 100644
index 000000000000..ac5738d5a685
--- /dev/null
+++ b/dev-ada/libadalang/files/libadalang-23.0.0-test.patch
@@ -0,0 +1,11 @@
+--- a/user_manual/changes/V325-006.yaml	2022-09-15 14:51:28.000000000 +0200
++++ b/user_manual/changes/V325-006.yaml	2023-02-26 16:41:25.121927720 +0100
+@@ -1,7 +1,7 @@
+ type: bugfix
+ title: Fix exponentiation in Ada integer literal decoding
+ description: |
+-  Libadalang’s decoder for integer literals (the
++  Libadalang's decoder for integer literals (the
+   ``Libadalang.Sources.Decode_Integer_Literal`` procedure) applied the exponent
+   in base 10 regardless of the base of the literal being evaluated. This is
+   wrong, as the ARM (2.4.2) states:
diff --git a/dev-ada/libadalang/libadalang-23.0.0-r1.ebuild b/dev-ada/libadalang/libadalang-23.0.0-r1.ebuild
new file mode 100644
index 000000000000..6df305d7916c
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-23.0.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 )
+
+inherit ada python-single-r1 multiprocessing
+
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test +static-libs static-pic"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml
+	<dev-ada/gnatcoll-bindings-2021
+	>=dev-ada/gnatcoll-bindings-23.0.0[${ADA_USEDEP},gmp,iconv]
+	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
+	${ADA_DEPS}
+	${PYTHON_DEPS}
+	dev-ada/langkit[${ADA_USEDEP},shared,static-libs?,static-pic?]
+	$(python_gen_cond_dep '
+		dev-ada/langkit[${PYTHON_USEDEP}]
+	')"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]
+"
+BDEPEND="test? (
+		dev-ml/dune
+		dev-ml/zarith
+		dev-ml/camomile
+		dev-ml/ocaml-ctypes
+		dev-ada/e3-testsuite
+		<dev-lang/ocaml-4.14
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+	libType=''
+	if use static-libs; then
+		libType+=',static'
+	fi
+	if use static-pic; then
+		libType+=',static-pic'
+	fi
+	libType+=',relocatable'
+	libType=${libType:1}
+}
+
+src_prepare() {
+	default
+	rm -r testsuite/tests/misc/copyright || die
+	rm -r testsuite/tests/name_resolution/field_hiding_2 || die
+	rm -r testsuite/tests/ocaml_api/auto_provider || die
+	rm -r testsuite/tests/ocaml_api/project_unit_provider || die
+}
+
+src_configure() {
+	${EPYTHON} manage.py generate -v debug || die
+}
+
+src_compile() {
+	${EPYTHON} manage.py build -v \
+		--build-mode "prod" \
+		-j$(makeopts_jobs) \
+		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS}" \
+		--library-types=${libType} || die
+	GPR_PROJECT_PATH="${S}"/build \
+		gprbuild -P contrib/highlight/highlight.gpr \
+		-j$(makeopts_jobs) -v \
+		-XBUILD_MODE=prod \
+		-XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		-largs ${LDFLAGS} \
+		|| die
+}
+
+src_test() {
+	BUILD_MODE=prod \
+	${EPYTHON} manage.py test \
+		--build-mode "prod" \
+		--restricted-env -j 1 \
+		|& tee libadalang.testOut
+	grep -qw FAIL libadalang.testOut && die
+}
+
+src_install() {
+	${EPYTHON} manage.py \
+		install "${D}"/usr \
+		--build-mode "prod" \
+		--library-types=${libType} || die
+	rm -r "${D}"/usr/python || die
+	python_domodule build/python/libadalang
+	rm -r "${D}"/usr/ocaml || die
+}
diff --git a/dev-ada/libadalang/libadalang-23.0.0.ebuild b/dev-ada/libadalang/libadalang-23.0.0.ebuild
deleted file mode 100644
index 7ebaec865511..000000000000
--- a/dev-ada/libadalang/libadalang-23.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-
-inherit ada python-single-r1 multiprocessing
-
-DESCRIPTION="high performance semantic engine for the Ada programming language"
-HOMEPAGE="https://libre.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test +static-libs static-pic"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml
-	<dev-ada/gnatcoll-bindings-2021
-	>=dev-ada/gnatcoll-bindings-23.0.0[${ADA_USEDEP},gmp,iconv]
-	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
-	${ADA_DEPS}
-	${PYTHON_DEPS}
-	dev-ada/langkit[${ADA_USEDEP},shared,static-libs?,static-pic?]
-	$(python_gen_cond_dep '
-		dev-ada/langkit[${PYTHON_USEDEP}]
-	')"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-"
-BDEPEND="test? (
-		dev-ml/dune
-		dev-ml/zarith
-		dev-ml/camomile
-		dev-ml/ocaml-ctypes
-		dev-ada/e3-testsuite
-		<dev-lang/ocaml-4.14
-	)"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-	libType=''
-	if use static-libs; then
-		libType+=',static'
-	fi
-	if use static-pic; then
-		libType+=',static-pic'
-	fi
-	libType+=',relocatable'
-	libType=${libType:1}
-}
-
-src_prepare() {
-	default
-	rm -r testsuite/tests/misc/copyright || die
-	rm -r testsuite/tests/name_resolution/field_hiding_2 || die
-	rm -r testsuite/tests/ocaml_api/auto_provider || die
-	rm -r testsuite/tests/ocaml_api/project_unit_provider || die
-}
-
-src_configure() {
-	${EPYTHON} manage.py generate -v debug || die
-}
-
-src_compile() {
-	${EPYTHON} manage.py build -v \
-		--build-mode "prod" \
-		-j$(makeopts_jobs) \
-		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS}" \
-		--library-types=${libType} || die
-	GPR_PROJECT_PATH="${S}"/build \
-		gprbuild -P contrib/highlight/highlight.gpr \
-		-j$(makeopts_jobs) -v \
-		-XBUILD_MODE=prod \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_test() {
-	BUILD_MODE=prod \
-	${EPYTHON} manage.py test \
-		--build-mode "prod" \
-		--restricted-env -j 1 \
-		|& tee libadalang.testOut
-	grep -qw FAIL libadalang.testOut && die
-}
-
-src_install() {
-	${EPYTHON} manage.py \
-		install "${D}"/usr \
-		--build-mode "prod" \
-		--library-types=${libType} || die
-	rm -r "${D}"/usr/python || die
-	python_domodule build/python/libadalang
-	rm -r "${D}"/usr/ocaml || die
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 55fd401adf00..d7b03eaf30ac 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index aa416ce883fd..5317505bbc18 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,3 +1,2 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.22.2.tar.bz2 3077065 BLAKE2B b3660cf3c72d2d7ae122f89e8afb967cb89cc1de3f4859d481bbb8250cad6f03f187a4deb9e500a6231abdc5c9e727ef910c59d7c8b75bc6ba0f12ef94f05252 SHA512 93ea423cec8d13e525bf654291b6edd685f079c2af2da5a6f44dfe0b913e0f3df0a4770f1240ff760bae7842eee8ee3a13bed621c2ee1499abc76b100ebe3885
 DIST asio-1.24.0.tar.bz2 3150924 BLAKE2B 4c9b913452fd4288684020ca58b48e22745a39c6a0d682ba84ff561b94c695dc6f5203ed06817f4dd0b9098ea3012578f7c6b2f251b3857e660b0c222dbc003e SHA512 c877968229bc5c4c21156b2bbb9775c7b11c3878cd62e8df3afaa70b2f221c59c6e4fa425cfb028cd170f9453ac1c32c5229f89437b13ac39142e4b52304c820
diff --git a/dev-cpp/asio/asio-1.22.2.ebuild b/dev-cpp/asio/asio-1.22.2.ebuild
deleted file mode 100644
index 198901e907cf..000000000000
--- a/dev-cpp/asio/asio-1.22.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/boost
-		dev-libs/openssl
-	)
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-
-		# Make links to the example .cpp files work
-		# https://bugs.gentoo.org/828648
-		if use doc; then
-			dosym ../examples /usr/share/doc/${PF}/src/examples
-		fi
-	fi
-}
diff --git a/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch
new file mode 100644
index 000000000000..76b1591d1150
--- /dev/null
+++ b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch
@@ -0,0 +1,22 @@
+From d98236beaf015f2693589fca1904fb0dd01b2e6d Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Wed, 1 Mar 2023 10:16:49 +0100
+Subject: [PATCH] json11.pc: do not state the defaults
+
+This appearantly breaks multi-arch installations. See
+https://bugs.gentoo.org/863098
+
+Suggested-by: Thomas Scheider <qsx@chaotikum.eu>
+Signed-off-by: Florian Schmaus <flow@gentoo.org>
+--- a/json11.pc.in
++++ b/json11.pc.in
+@@ -5,5 +5,4 @@ includedir=${prefix}/include/@CMAKE_LIBRARY_ARCHITECTURE@
+ Name: @PROJECT_NAME@
+ Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
+ Version: @PROJECT_VERSION@
+-Libs: -L${libdir} -ljson11
+-Cflags: -I${includedir}
++Libs: -ljson11
+-- 
+2.39.2
+
diff --git a/dev-cpp/json11/json11-1.0.0-r1.ebuild b/dev-cpp/json11/json11-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..31d7acab3239
--- /dev/null
+++ b/dev-cpp/json11/json11-1.0.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A tiny JSON library for C++11"
+HOMEPAGE="https://github.com/dropbox/json11"
+SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-multiarch-install.patch
+	"${FILESDIR}"/${PN}-1.0.0-json11.pc-do-not-state-the-defaults.patch
+)
diff --git a/dev-cpp/json11/metadata.xml b/dev-cpp/json11/metadata.xml
index a7fa285c7476..6947f6c749e8 100644
--- a/dev-cpp/json11/metadata.xml
+++ b/dev-cpp/json11/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dropbox/json11</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b2f4969e9400..3c60b3a99ee8 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 45e3f918e0a0..cc2468208fc5 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,3 +1 @@
-DIST mycli-1.24.1.tar.gz 275983 BLAKE2B cc03ebd0f4de1fabbd1c186139aac04a50d01529190972cac63765a4d3e688e994c112d001489bf1dfb17541370e0c348a368d85a86b7eed335b775b96897765 SHA512 5f8ffb98fd285d2e556bef7cefdc77588983c0028c7c24084710633fb469ae3c5ab2232ca23e87406d44d87e503c113039e6884ec9efd603f45b3ab7ed7c0925
-DIST mycli-1.25.0.gh.tar.gz 277022 BLAKE2B eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895 SHA512 e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
-DIST mycli-1.25.0.tar.gz 277022 BLAKE2B eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895 SHA512 e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
+DIST mycli-1.26.1.gh.tar.gz 279221 BLAKE2B 2bb178110b5aba3e381541a7892cc1d8bed8e41c499d1dc36fa39435805a118536de44bf21b2ca2652afefcd15f8bc86ed77de876f703740e796444ff8cea6b0 SHA512 bce9def37718444f2445ed3a7ad91c54df4cc3dc5d207a4a2e0fc72eb27b75fca687958241fc40f5494efcdf9e4bae251f3cf94c13b967dd922d5ff653348c77
diff --git a/dev-db/mycli/mycli-1.24.1.ebuild b/dev-db/mycli/mycli-1.24.1.ebuild
deleted file mode 100644
index 43d494e9b859..000000000000
--- a/dev-db/mycli/mycli-1.24.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=yes
-inherit distutils-r1
-
-MY_PV=$(ver_cut 1-3)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-HOMEPAGE="https://www.mycli.net"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssh"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
-		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-		dev-python/pyperclip[${PYTHON_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
-"
-BDEPEND="
-	test? ( $(python_gen_cond_dep '
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-	') )
-"
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		setup.py
-		mycli/magic.py
-		mycli/packages/parseutils.py
-		test/features
-		mycli/packages/paramiko_stub/__init__.py
-	)
-	epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
-}
diff --git a/dev-db/mycli/mycli-1.25.0-r1.ebuild b/dev-db/mycli/mycli-1.25.0-r1.ebuild
deleted file mode 100644
index 7adb613b75a5..000000000000
--- a/dev-db/mycli/mycli-1.25.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-HOMEPAGE="
-	https://www.mycli.net/
-	https://github.com/dbcli/mycli/
-	https://pypi.org/project/mycli/
-"
-SRC_URI="
-	https://github.com/dbcli/mycli/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssh"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
-		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-		dev-python/pyperclip[${PYTHON_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )'
-	)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/paramiko[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		setup.py
-		mycli/magic.py
-		mycli/packages/parseutils.py
-		test/features
-		mycli/packages/paramiko_stub/__init__.py
-	)
-	epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
-}
diff --git a/dev-db/mycli/mycli-1.25.0.ebuild b/dev-db/mycli/mycli-1.25.0.ebuild
deleted file mode 100644
index 8d0f0c8fe9b3..000000000000
--- a/dev-db/mycli/mycli-1.25.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=yes
-inherit distutils-r1
-
-MY_PV=$(ver_cut 1-3)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-HOMEPAGE="https://www.mycli.net"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssh"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
-		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-		dev-python/pyperclip[${PYTHON_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
-"
-BDEPEND="
-	test? ( $(python_gen_cond_dep '
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-	') )
-"
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		setup.py
-		mycli/magic.py
-		mycli/packages/parseutils.py
-		test/features
-		mycli/packages/paramiko_stub/__init__.py
-	)
-	epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
-}
diff --git a/dev-db/mycli/mycli-1.26.1.ebuild b/dev-db/mycli/mycli-1.26.1.ebuild
new file mode 100644
index 000000000000..437959885397
--- /dev/null
+++ b/dev-db/mycli/mycli-1.26.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+HOMEPAGE="
+	https://www.mycli.net/
+	https://github.com/dbcli/mycli/
+	https://pypi.org/project/mycli/
+"
+SRC_URI="
+	https://github.com/dbcli/mycli/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssh"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		dev-python/pyperclip[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )'
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/paramiko[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		setup.py
+		mycli/magic.py
+		mycli/packages/parseutils.py
+		test/features
+		mycli/packages/paramiko_stub/__init__.py
+	)
+	epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
+}
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index ede861eeb297..a7e9fc8f8841 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 967f7ec47ecb..0290f16669cd 100644
Binary files a/dev-dotnet/Manifest.gz and b/dev-dotnet/Manifest.gz differ
diff --git a/dev-dotnet/csharp-language-server/metadata.xml b/dev-dotnet/csharp-language-server/metadata.xml
index b3f9def38188..fc392ffaa1b7 100644
--- a/dev-dotnet/csharp-language-server/metadata.xml
+++ b/dev-dotnet/csharp-language-server/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xgqt@gentoo.org</email>
-    <name>Maciej Barć</name>
+  <maintainer type="project">
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
   </maintainer>
   <upstream>
     <changelog>https://raw.githubusercontent.com/razzmatazz/csharp-language-server/master/CHANGELOG.md</changelog>
diff --git a/dev-dotnet/dotnet-sdk-bin/metadata.xml b/dev-dotnet/dotnet-sdk-bin/metadata.xml
index 941e6d94878f..e32a6dd41575 100644
--- a/dev-dotnet/dotnet-sdk-bin/metadata.xml
+++ b/dev-dotnet/dotnet-sdk-bin/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xgqt@gentoo.org</email>
-    <name>Maciej Barć</name>
+  <maintainer type="project">
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
   </maintainer>
   <use>
     <flag name="dotnet-symlink">
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 8995a7dddd07..5ee16d9e5da8 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r2.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r2.ebuild
new file mode 100644
index 000000000000..226ed4cd05d2
--- /dev/null
+++ b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="A Device Firmware Update based USB programmer for Atmel chips"
+HOMEPAGE="https://dfu-programmer.github.io/ https://sourceforge.net/projects/dfu-programmer/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+RDEPEND="
+	acct-group/plugdev
+	virtual/libusb:1
+	virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Upstream has fixed this in their configure already.
+	tc-export CPP PKG_CONFIG
+	sed -i \
+		-e "/LIBUSB_1_0_CFLAGS=/s:=.*:='$(${PKG_CONFIG} --cflags libusb-1.0)':" \
+		-e "/LIBUSB_1_0_LIBS=/s:=.*:='$(${PKG_CONFIG} --libs libusb-1.0)':" \
+		configure || die
+}
+
+src_install() {
+	default
+
+	cat <<-EOF > 70-dfu-programmer.rules
+	#
+	# do not edit this file, it will be overwritten on update
+	#
+	EOF
+	printf 'SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="%s", MODE="660", GROUP="plugdev", SYMLINK+="dfu-%%n"\n' \
+		2ff{a,b,9,7,4,3} >> 70-dfu-programmer.rules
+
+	udev_dorules 70-dfu-programmer.rules
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog "To update device firmware as user you must be in the plugdev group:"
+	elog
+	elog "usermod -aG plugdev <user>"
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index c1383c0aec53..510db381b482 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,5 +1,3 @@
-DIST esptool-3.3.1.tar.gz 7261340 BLAKE2B c6ee391dcbc331d9f931bfd969333fc3bfc5628d422d52e2963c9d465f4680dca5debaf17cd2f6aca0db9dcc06563fe775d7d6c15dacdff481c52577c26d4364 SHA512 8da34f7b555513d499141ce403f19c3e77b6944eecde440c757faf3bbf5e915e44ff0bcabf1b2cb7f5fe26caa717bb47104ad808c46feaf1dea254d548048095
 DIST esptool-3.3.2.tar.gz 7263375 BLAKE2B 8a24a94c5d8acaa9647a5057cbacb57bdf292651529572d7084dbee1013b6174a383bebacccd75bb08e6de94054f28303d5a9b182f0d30dad9081fd8d61d1c4d SHA512 9f31ab5b702c8aede2062a27943fa655d7fbb07fb4c4c377f2ab5552e5453e7c8126bacc5b8e1e859ee6b81e21a75ed1343639815e395b974cc1aaa005367d84
-DIST esptool-4.2.1.tar.gz 7271498 BLAKE2B af1c17e08cad057e4534599481da6366460e9eff02de0dfe1cd1163885d315cefd780e034550e7cf09f09f4f3430108675722b9a57109a94c5519bf0c0c158b2 SHA512 b2b7209371330ae0764da5650b48a37ec750a3514951b8e39576b4e54ea682e2a43faf56ce95327071fe88bf4f74762a39483e1edfe2bdf9c5457537888c469f
-DIST esptool-4.3.tar.gz 7216987 BLAKE2B 9c48b6884667913b5ffe8d0bef22fcb27142a42a89c802f2f1f2f5355d1a967c398f86a398574310fcb1de5b37a1f5fb7e9e7f78058e5ad38008b097d8debd66 SHA512 aa761dae802d67553096698b40a97ae1fa33995dbc81a16a521ffa3ed1ec87470b1457853e4a1aaedfb94c46770e58712a25cac62a4bd05d85503881e507b493
 DIST esptool-4.4.tar.gz 7213588 BLAKE2B a88269ff1bfe2e865dab73cafe2bb567fab027f0679c078a9b7c03b8705763390e3e774ff20ebec0d3dbee5a29d1b1e3d2c1931a3a18ff59b82321a6d0ee0da7 SHA512 97d44a5553be380a2d26469bea42b6995c0d97fa3d50e0f6c1673548801983243d204d140ecfc17ee6c9f9c6580e6c6c42a6e953655a06053fa56064af650cf8
+DIST esptool-4.5.tar.gz 7263652 BLAKE2B 7d77a61159e2fbd7abd4897202c1a1c6622a12ac30e453e74258cf1151f2ae2e2332c79abb81fbc9a2ee897db01006afa86ce4f9ef9a700f12a04a13ef932597 SHA512 b55cb334ee82048195c60afe0a86e1a9952e3e91aa3c5c97b1b44709cf24c793ed0da4607b1ecefc87ed5f5f16951f9e4db68bc33a8f96d193479e7f73964763
diff --git a/dev-embedded/esptool/esptool-3.3.1.ebuild b/dev-embedded/esptool/esptool-3.3.1.ebuild
deleted file mode 100644
index 0cda006a3dcf..000000000000
--- a/dev-embedded/esptool/esptool-3.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
-	test? ( $(python_gen_cond_dep '
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	') )
-"
-
-python_test() {
-	"${EPYTHON}" test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py || die "espefuse_host test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_merge_bin.py || die "espefuse_host test failed with ${EPYTHON}"
-	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
-}
diff --git a/dev-embedded/esptool/esptool-4.2.1.ebuild b/dev-embedded/esptool/esptool-4.2.1.ebuild
deleted file mode 100644
index cdfa690dbb34..000000000000
--- a/dev-embedded/esptool/esptool-4.2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
-	test? ( $(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	') )
-"
-
-python_test() {
-	"${EPYTHON}" test/test_imagegen.py || die "test_imagegen.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espsecure.py || die "test_espsecure.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py || die "test_espefuse_host.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_merge_bin.py || die "test_merge_bin.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_modules.py || die "test_modules.py failed with ${EPYTHON}"
-	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
-}
-
-pkg_postinst() {
-	if ver_test ${REPLACING_VERSIONS} -lt 4; then
-		ewarn "${P} - new 4.x release with breaking changes:"
-		ewarn "  - Public API has been defined by limiting access to internals that have been refactored into multiple source files"
-		ewarn "  - If active security features are detected, the default behavior changes to prevent unintentional bricking"
-		ewarn "  - Flash parameters in an image header can now be changed only when no SHA256 digest is appended"
-		ewarn "  - The ESP8684 alias has been removed, ESP32-C2 has to be used"
-		ewarn "  - Megabit flash sizes have been deprecated, use megabyte units from now on"
-	fi
-}
diff --git a/dev-embedded/esptool/esptool-4.3.ebuild b/dev-embedded/esptool/esptool-4.3.ebuild
deleted file mode 100644
index 98189323de60..000000000000
--- a/dev-embedded/esptool/esptool-4.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
-	test? ( $(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	') )
-"
-
-python_test() {
-	"${EPYTHON}" test/test_imagegen.py || die "test_imagegen.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espsecure.py || die "test_espsecure.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_merge_bin.py || die "test_merge_bin.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_image_info.py || die "test_image_info.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_modules.py || die "test_modules.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32|| die "test_espefuse_host.py esp32 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32c2 || die "test_espefuse_host.py esp32c2 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32c3 || die "test_espefuse_host.py esp32c3 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32s2 || die "test_espefuse_host.py esp32s2 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32s3 || die "test_espefuse_host.py esp32s3 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32s3beta2 || die "test_espefuse_host.py esp32s3beta2 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32h2beta1 || die "test_espefuse_host.py esp32h2beta1 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32c6 || die "test_espefuse_host.py esp32c6 failed with ${EPYTHON}"
-	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
-}
-
-pkg_postinst() {
-	if ver_test ${REPLACING_VERSIONS} -lt 4; then
-		ewarn "${P} - new 4.x release with breaking changes:"
-		ewarn "  - Public API has been defined by limiting access to internals that have been refactored into multiple source files"
-		ewarn "  - If active security features are detected, the default behavior changes to prevent unintentional bricking"
-		ewarn "  - Flash parameters in an image header can now be changed only when no SHA256 digest is appended"
-		ewarn "  - The ESP8684 alias has been removed, ESP32-C2 has to be used"
-		ewarn "  - Megabit flash sizes have been deprecated, use megabyte units from now on"
-	fi
-}
diff --git a/dev-embedded/esptool/esptool-4.5.ebuild b/dev-embedded/esptool/esptool-4.5.ebuild
new file mode 100644
index 000000000000..68ef41735cdc
--- /dev/null
+++ b/dev-embedded/esptool/esptool-4.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
+HOMEPAGE="https://github.com/espressif/esptool"
+SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bitstring[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+	test? ( $(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	') )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
+	test/test_esptool.py
+	test/test_espefuse.py
+)
+
+src_prepare() {
+	default
+
+	# test_espsecure_hsm.py calls unavailable python modules and is broken anyway
+	rm test/test_espsecure_hsm.py || die
+}
+
+pkg_postinst() {
+	if ver_test ${REPLACING_VERSIONS} -lt 4; then
+		ewarn "${P} - new 4.x release with breaking changes:"
+		ewarn "  - Public API has been defined by limiting access to internals that have been refactored into multiple source files"
+		ewarn "  - If active security features are detected, the default behavior changes to prevent unintentional bricking"
+		ewarn "  - Flash parameters in an image header can now be changed only when no SHA256 digest is appended"
+		ewarn "  - The ESP8684 alias has been removed, ESP32-C2 has to be used"
+		ewarn "  - Megabit flash sizes have been deprecated, use megabyte units from now on"
+	fi
+}
diff --git a/dev-embedded/mspdebug/mspdebug-0.25-r1.ebuild b/dev-embedded/mspdebug/mspdebug-0.25-r1.ebuild
new file mode 100644
index 000000000000..1b68b8fafadc
--- /dev/null
+++ b/dev-embedded/mspdebug/mspdebug-0.25-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A free debugger for use with MSP430 MCUs"
+HOMEPAGE="https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug"
+SRC_URI="https://github.com/dlbeer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="readline"
+
+DEPEND="readline? ( sys-libs/readline:0= )
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i "s:-O1 \(.*\) -ggdb:\1:" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR=/usr/$(get_libdir) $(usex readline "" "WITHOUT_READLINE=1")
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR=/usr/$(get_libdir) PREFIX=/usr install
+	einstalldocs
+}
diff --git a/dev-embedded/mspdebug/mspdebug-0.25.ebuild b/dev-embedded/mspdebug/mspdebug-0.25.ebuild
deleted file mode 100644
index a4ff1ba9081b..000000000000
--- a/dev-embedded/mspdebug/mspdebug-0.25.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A free debugger for use with MSP430 MCUs"
-HOMEPAGE="https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug"
-SRC_URI="https://github.com/dlbeer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i "s:-O1 \(.*\) -ggdb:\1:" Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR=/usr/lib $(usex readline "" "WITHOUT_READLINE=1")
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR=/usr/lib PREFIX=/usr install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/dev-embedded/stm32flash/Manifest b/dev-embedded/stm32flash/Manifest
index 5a1228bf3493..e4e097bf8308 100644
--- a/dev-embedded/stm32flash/Manifest
+++ b/dev-embedded/stm32flash/Manifest
@@ -1 +1,2 @@
 DIST stm32flash-0.6.tar.gz 376186 BLAKE2B 82e479b4fad2c3ff832aea9d0d62d556500fd8c0530e879690b9b83cdf05f078b0051e1e104e7cb64b9c360ef84415904639ee67ee147045ce8e15ca3f6c61e1 SHA512 2d92ecf4f82b8a702b596cbf3c4ff594f67083f7dcec82c064555f73b47834b41a918efa1846e47fc8740ae63fa818b16dfb5b38fa242c17f465666a651eee3a
+DIST stm32flash-0.7.tar.gz 380166 BLAKE2B 98522968072821e3cf110e62486a3b9ee90ac6c7e600f6633acbfac904024390157743f0895cae181fc9b20f4f14dc5b833c36e02de4adbfc644c797abd12d63 SHA512 328254dd043dc707cf8c3edf8ddd4a9441c85d9cb2ca1682bcb3f5301d526b04ed6fb335e72a94e3d26341f18bef45968bf321f0ffeb80eaa0c3add6701349ff
diff --git a/dev-embedded/stm32flash/stm32flash-0.7.ebuild b/dev-embedded/stm32flash/stm32flash-0.7.ebuild
new file mode 100644
index 000000000000..3ecab4e33410
--- /dev/null
+++ b/dev-embedded/stm32flash/stm32flash-0.7.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Open source flash program for STM32 using the ST serial bootloader"
+HOMEPAGE="https://sourceforge.net/projects/stm32flash/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 60194cbd17ee..8acfd9b56747 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index ee4531c5b8f3..d8a13a0b3d4e 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,2 +1 @@
-DIST freecell-solver-6.6.0.tar.xz 432564 BLAKE2B 8bd4acc29eb2b934ae8666dd2877a428ed7b7f7f9eec87c8c7e395cd364dde91caac98895fa1abe61eeb7fd2ea84c4abf9924fc136879d53f9dd43ec5221b55a SHA512 55844426ca7e8c01916b94aca13ef579923b28ef88376bade6899a2b791a4a8198160a05169915fb484a12363c8c1b2f1bfaa7bd18afbc46c9ba86058cbba2bb
 DIST freecell-solver-6.8.0.tar.xz 450320 BLAKE2B b33b9ae51485d5f028817bfed01c167cbcc42366d7e44cfb75c1c3f86f7ef17d1d6e8fdfe41da5af390e6db9527dee7998118a5e3440e104a18e97001017992a SHA512 3baed3cc02405036b882b8eb71f0e54d11051789b9071081a26a6feca653e13129b7d2e5f3ffcbbbac528e67eccdb95d0adcbf598b35f0849a220c90bed131ee
diff --git a/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild b/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild
deleted file mode 100644
index 7b10c7858e9e..000000000000
--- a/dev-games/freecell-solver/freecell-solver-6.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-single-r1
-
-DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
-HOMEPAGE="https://fc-solve.shlomifish.org/"
-SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="tcmalloc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/rinutils
-	$(python_gen_cond_dep '
-		dev-python/pysol_cards[${PYTHON_USEDEP}]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	dev-perl/Moo
-	dev-perl/Path-Tiny
-	dev-perl/Template-Toolkit
-"
-
-DOCS=( README.html )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.22.1-no-docs.patch"
-	"${FILESDIR}/${P}-no-git-clone-kthxbye.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	python_fix_shebang board_gen
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBRARY=OFF
-		-DFCS_BUILD_DOCS=OFF
-		-DFCS_WITH_TEST_SUITE=OFF # requires unpackaged dependencies
-		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 63a9f08d4b73..26b51903f1c2 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,2 +1,2 @@
 DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
-DIST godot-4.0-rc5.tar.xz 29376936 BLAKE2B bc8de477a4597576165fb1a7f38822aa499dcba696368bb47a0b018bfaedb573d2d822e80e1e4364abfb40a72c7badc2a3ef1d2ce9b9a10a1d7d29811b4f489e SHA512 8001f0d021798e6521855ab41c1fa4db93ea898cac9267305745a822f46a8ef3f58174e3c9d402c5d22b94404e411cb56b69e018d3ea00febb885aad42c5eca7
+DIST godot-4.0-stable.tar.xz 29435592 BLAKE2B 0802631f2995144b63c98c3a6031e7f9df771e7dd9491d38a5fcb3f52581c1f3d6a29cde5a43f9a3a83c9aaeaba9e53b22c22cdb67117f65189d916564db614b SHA512 a1de87425861dfd71bf6c6387008d72a0c80322865ffb4dbb4a87e58244d37d4d45d6f6df8e06ea6c4f979de80b364932891c65cf11c7f80727f33e28460cbd9
diff --git a/dev-games/godot/godot-4.0.ebuild b/dev-games/godot/godot-4.0.ebuild
new file mode 100644
index 000000000000..55c23ad5eab7
--- /dev/null
+++ b/dev-games/godot/godot-4.0.ebuild
@@ -0,0 +1,230 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz"
+S="${WORKDIR}/${P}-stable"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
+SLOT="4"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
+# TODO: tests still need more figuring out
+RESTRICT="test"
+
+# dlopen: libglvnd
+RDEPEND="
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		vulkan? ( media-libs/vulkan-loader[X] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
+	"${FILESDIR}"/${PN}-4.0_rc2-gcc13.patch
+	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
+		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
+		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		builtin_certs=no
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_pcre2=no
+		builtin_recastnavigation=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these, e.g. can pass -flto as-is
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
diff --git a/dev-games/godot/godot-4.0_rc5.ebuild b/dev-games/godot/godot-4.0_rc5.ebuild
deleted file mode 100644
index 584b6bf6273e..000000000000
--- a/dev-games/godot/godot-4.0_rc5.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
-SLOT="4"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
-# tests need more figuring out, they are still somewhat new and volatile
-RESTRICT="test"
-
-# dlopen: libglvnd
-RDEPEND="
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/freetype[brotli,harfbuzz]
-	media-libs/harfbuzz:=[icu]
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libvorbis
-	<net-libs/mbedtls-3:=
-	net-libs/wslay
-	sys-libs/zlib:=
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxkbcommon
-		tools? ( raycast? ( media-libs/embree:3 ) )
-		vulkan? ( media-libs/vulkan-loader[X] )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/miniupnpc:= )
-	webp? ( media-libs/libwebp:= )"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
-	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
-	"${FILESDIR}"/${PN}-4.0_rc2-gcc13.patch
-	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		doctest embree freetype graphite harfbuzz icu4c libogg
-		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
-		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-}
-
-src_compile() {
-	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		use_sowrap=no
-
-		alsa=$(usex alsa)
-		dbus=$(usex dbus)
-		deprecated=$(usex deprecated)
-		fontconfig=$(usex fontconfig)
-		opengl3=$(usex gui)
-		pulseaudio=$(usex pulseaudio)
-		speechd=$(usex speech)
-		udev=$(usex udev)
-		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui $(usex vulkan))
-		x11=$(usex gui)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_certs=no
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_glslang=yes #879111
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu4c=no
-		builtin_libogg=no
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=no
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=$(usex !upnp)
-		builtin_msdfgen=yes # not wired for unbundling nor packaged
-		builtin_pcre2=no
-		builtin_recastnavigation=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (more is bundled in third_party/ but they lack builtin_* switches)
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
-		module_mono_enabled=no # unhandled
-		# note raycast is only enabled on amd64+arm64, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these, e.g. can pass -flto as-is
-		debug_symbols=no
-		lto=none
-		optimize=custom
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		target=$(usex tools editor template_$(usex debug{,} release))
-		dev_build=$(usex debug)
-
-		# harmless but note this bakes in --test in the final binary
-		tests=$(usex tools $(usex test))
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-	bin/godot*.main --headless --test || die
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	bashcomp_alias ${s}{,-runner}
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins misc/dist/shell/godot.fish ${s}.fish
-	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/dist/shell/_godot.zsh-completion _${s}
-	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 34baef84ed81..cde903b302f6 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 229b6632d7b3..b9140ee1a927 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,3 +1 @@
-DIST asm-ASM_4_0.tar.bz2 14706135 BLAKE2B 20bed2b10b6107e9af74dafd8f7c9db93be1c26e073a8f7d8b25a94b99a1e89659dd03ed9094c4a56fe8a9b8d206b00e3db35eb4074e16396292d2fe75c2bb41 SHA512 046b36fe664a58e65daca2e3820f431436f27242fb548723ec02e829637f4d27d3329edd5014d3c84855d827a2fb2a87107043951a83f4fee2e83d89bb0ba74d
-DIST asm-ASM_5_1.tar.bz2 16191369 BLAKE2B 30e0f97fe200f09c78b3ba743ad70f25715b411d5e0be330234d97dec98b997db78736b5e005fdac8ed5339c553783a4e12386c34cb2c5a45bd8d8b42d7e8465 SHA512 6e73fe0787cfa974c598be44b5d735bbd6cba88f64db24169ec481281aea2169bce65fb08a677aa99f0d71f876a204c86432d2a4a79e85cc5286eb2ccf7617d7
 DIST asm-ASM_9_4.tar.bz2 1380417 BLAKE2B 612fc6669294f2926ec77522f642f2878a96a9c977579ceda9feb955041ff53fa698c75b26c27bae478a41dca59357d9cf824263df39d60ea5c6722e5f0efc75 SHA512 a59268808ac54a238bd6e117eb0164d28c5c3572c12d7ad42c2f3dbd32714c03056f330255756511db4f1ede8d66bf32c7347128b8ec179beba11cca27927687
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild
deleted file mode 100644
index 1caebff74cf0..000000000000
--- a/dev-java/asm/asm-5.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 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="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2 https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.bz2"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-
-CDEPEND=""
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/asm-${MY_P}"
-
-# Needs dependencies we don't have yet.
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this objectweb.ant.tasks.path is not set.
-# Java generics seem to break unless product.noshrink is set.
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar -Dproduct.noshrink=true"
-
-src_prepare() {
-	default
-	# Borrow some ant scripts from an old version to avoid requiring
-	# bndlib and friends. This may not work forever!
-	cp -vf "../asm-ASM_4_0/archive"/*.xml archive/ || die
-}
-
-src_install() {
-	local x
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
-	done
-
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 45f1210949a7..ad27f0978a5e 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1 +1,2 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
+DIST bsh-2.1.1.tar.gz 1922883 BLAKE2B d60ebfab96f81a17120733887468571dd991dce663d725d9bee2dc44146e320d36600be70a3b7f76516645030d40fcda17db70989d54e98ffdc69c91738bcaf1 SHA512 585fcb9fdc8c36063a7d4dfe9a909e68b61d611f023731c955b7ced3f894cb6c48b0d463735e6825cb6f0181ba97902279212d285e325267aa533490e0bbfe00
diff --git a/dev-java/bsh/bsh-2.1.1.ebuild b/dev-java/bsh/bsh-2.1.1.ebuild
new file mode 100644
index 000000000000..f593111f6a84
--- /dev/null
+++ b/dev-java/bsh/bsh-2.1.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache-extras.beanshell:bsh:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/beanshell/beanshell/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/beanshell-${PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# There was 1 failure:
+# 1) do_not_access_non_open_methods(bsh.Java_9_Test)
+# bsh.TargetError: Sourced file: inline evaluation of: ``import java.net.URL;
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CP_DEPEND="
+	dev-java/bsf:2.3
+	dev-java/jakarta-servlet-api:4"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8"
+
+DOCS=(
+	CHANGES.md
+	NOTICE
+	README.md
+)
+
+JAVA_LAUNCHER_FILENAME="bsh-console"
+JAVA_MAIN_CLASS="bsh.Console"
+JAVA_RESOURCE_DIRS="resources/src"
+JAVA_SRC_DIR=( src bsf/src engine/src )
+JAVA_TEST_EXCLUDES=(
+	bsh.TestUtil	# invalid test class
+	bsh.TestFilter	# invalid test class
+	bsh.Class3_Test
+	bsh.Class13Test
+	bsh.Issue_7_Test
+	bsh.Issue_8_Test
+	bsh.OldScriptsTest # ?? As the name says Old...
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="tests/junitTests/src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	# These classes are not in upstream jar file
+	rm engine/src/bsh/TestBshScriptEngine.java || die
+	rm src/bsh/JThis.java || die
+
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir resources || die
+	find src -type f \
+		! -name '*.java' \
+		! -name 'bsh.jj*' \
+		! -name '*.scripted' \
+		! -name '*.txt' \
+		! -name '*.xml' \
+		! -name '.errLog' \
+		! -name 'index.html' \
+		! -name 'Changes.html' \
+		! -name 'CodeMap.html' \
+		! -name 'Manifest.*' \
+		| xargs cp --parent -t resources || die
+
+	# Some but not all tests in these test classes fail
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/diamond_operator()/i @Ignore' \
+		-e '/try_with_resource()/i @Ignore' \
+		-e '/integer_literal_enhancements()/i @Ignore' \
+		-i tests/junitTests/src/bsh/Project_Coin_Test.java || die
+
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/parsing_very_large_hex_literal()/i @Ignore' \
+		-e '/integer_literal_enhancements_binary()/i @Ignore' \
+		-e '/parsing_large_hex_literal()/i @Ignore' \
+		-i tests/junitTests/src/bsh/NumberLiteralTest.java || die
+
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/define_interface_with_constants()/i @Ignore' \
+		-i tests/junitTests/src/bsh/ClassGeneratorTest.java || die
+}
+
+src_test() {
+	# tests/junitTests/src/bsh/Issue_55_Test.java:47: error: cannot find symbol
+	#                 final Object scriptEngineResult = new BshScriptEngineFactory().getScriptEngine().eval(script);
+	#                                                       ^
+	#   symbol:   class BshScriptEngineFactory
+	#   location: class Issue_55_Test
+	rm tests/junitTests/src/bsh/Issue_55_Test.java || die
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+}
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 3517eba86a3c..9afea2d4b31d 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -4,5 +4,5 @@ DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc9
 DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
 DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf
 DIST gradle-bin-7.5.1.zip 166101707 BLAKE2B e018f8ae0e4cbe1fff2e3fb3029ef4c3f35e1bf541ce75f22561e16c43d8501c2f2501db72081656a836ab1c3358020dbf0be3499e7c16b385d9940c852c62ae SHA512 89189d529df1258a01ad2e6c38b1374dfb3a1440706c1c7f27ace89b6fd5b6849f9809f209e3e410f226aeeb9348d144de70397ac94b4e59fd311a2b0dee0dc9
-DIST gradle-bin-7.6.zip 165398808 BLAKE2B e9ffb8157184a4977f72a5267501ad3bf7201ad77216b64cc99e9c54e4c4787a0c26ca94302cc507ca747dd4c073bfdf8e9ae931b1b329d6d7df339e26d665a5 SHA512 5c5b9ade91898ec2fe142ff98dc7ae681a9f3b923ce40998a731cb84fdfcdbde6510cc9da026a9359526569e37472b06c1a6bc5a2794d2af5e9d6f1d13a21ac8
+DIST gradle-bin-7.6.1.zip 165594858 BLAKE2B 623ed41b7e0dfbfa015578c6915ca382cb441082e181f96d00d058a1bd42b5e749b807f8c0444c4cd41de17a7f754960f55aa69e8dd4339bd64444432ad8748e SHA512 72d051d8cf348c13dda20eec56526a3c212e9a9635920b3260281e2f98cf113ffaf4efb8efbb96081c36b9fae847c291125e24d175d6fb832b8dd6e0e74779ae
 DIST gradle-bin-8.0.1.zip 167663052 BLAKE2B e1d08ea2b78c86c4b1e7676856b0311cda7dabb79458193a15cc082317f7f63d194eef5044bc91bd971d1c831976a95bb69569b210fa42ecf708fe99ea2d4634 SHA512 148453411eb554c7606bc200491952c77b4cdd170d9306bc634e1c32e99b52142cb20cfec7d7ed899bc21098a15a45b255d6ea238d432d529a6270f84d2887c5
diff --git a/dev-java/gradle-bin/gradle-bin-7.6.ebuild b/dev-java/gradle-bin/gradle-bin-7.6.1.ebuild
similarity index 100%
rename from dev-java/gradle-bin/gradle-bin-7.6.ebuild
rename to dev-java/gradle-bin/gradle-bin-7.6.1.ebuild
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
index be69299aa916..3186460aa436 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
@@ -1,19 +1,17 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# This version provides module java.xml.soap and package javax.xml.soap
-MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2"
-
 JAVA_PKG_IUSE="doc source test"
 JAVA_TESTING_FRAMEWORKS="junit-4"
+MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
 HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
-SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jakartaee/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 # EDL-1.0 equivalent to BSD
 # - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
diff --git a/dev-java/jakarta-xml-soap-api/metadata.xml b/dev-java/jakarta-xml-soap-api/metadata.xml
index 24700dcb8731..cceeb17a326d 100644
--- a/dev-java/jakarta-xml-soap-api/metadata.xml
+++ b/dev-java/jakarta-xml-soap-api/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/saaj-api</remote-id>
+		<remote-id type="github">jakartaee/saaj-api</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild
index 0678a35a78ae..39cd7d500a85 100644
--- a/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild
+++ b/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="
 	dev-java/commons-cli:1
diff --git a/dev-java/java-dep-check/java-dep-check-0.5.ebuild b/dev-java/java-dep-check/java-dep-check-0.5.ebuild
deleted file mode 100644
index ef6057f4e111..000000000000
--- a/dev-java/java-dep-check/java-dep-check-0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Dependency checker"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="
-	dev-java/commons-cli:1
-	dev-java/asm:4"
-RDEPEND=">=virtual/jre-1.8:*
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.8:*
-	${COMMON_DEP}"
-
-JAVA_GENTOO_CLASSPATH="asm-4,commons-cli-1"
-
-src_unpack() {
-	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main javadepchecker.Main
-}
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
new file mode 100644
index 000000000000..22bd218ccce3
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+JAVA_PKG_IUSE="examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="
+	dev-java/javax-jsp-api:2.0
+	dev-java/javax-servlet-api:2.5
+"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="virtual/jdk:1.8
+	${CDEPEND}"
+
+JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+_eant() {
+	local \
+		servlet_jar=$(java-pkg_getjars javax-servlet-api-2.5) \
+		jsp_jar=$(java-pkg_getjars javax-jsp-api-2.0)
+
+	eant \
+		-f javahelp_nbproject/build.xml \
+		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
+		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
+		-Dservlet-jar="${servlet_jar}" \
+		-Djsp-jar="${jsp_jar}" \
+		-Dservlet-jar-present=true \
+		-Djsp-jar-present=true \
+		-Dtomcat-zip-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use source && java-pkg_dosrc \
+		jhMaster/JSearch/*/com \
+		jhMaster/JavaHelp/src/*/{javax,com}
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/javax-el-api/Manifest b/dev-java/javax-el-api/Manifest
new file mode 100644
index 000000000000..db9d616a19e7
--- /dev/null
+++ b/dev-java/javax-el-api/Manifest
@@ -0,0 +1 @@
+DIST el-api-2.2-sources.jar 77708 BLAKE2B 4d31cf6ee76954fb4b16128e6cf162bcc5abe446500713a33010850bc9d416c754a1c61544dabfb1423cb3aed1f7fe06fbd367000679c04ab0f88beaf082dd4a SHA512 83db61c50735f33e6895a0ebb1f0198e4dad7868a35997180e86c68e4f833a202882120fda2f9657b3698faff852bba40affa29daa818e0dcd00a4caa6fc1c65
diff --git a/dev-java/javax-el-api/javax-el-api-2.2.ebuild b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
new file mode 100644
index 000000000000..2bd0a3f73432
--- /dev/null
+++ b/dev-java/javax-el-api/javax-el-api-2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.el:el-api:2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Expression Language API"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://repo1.maven.org/maven2/javax/el/el-api/${PV}/el-api-${PV}-sources.jar"
+
+# https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2.pom
+LICENSE="CDDL GPL-2"
+SLOT="2.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir resources || die
+	cp --parents javax/el/*.properties resources || die
+}
diff --git a/dev-java/javax-el-api/metadata.xml b/dev-java/javax-el-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/javax-el-api/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/javax-jsp-api/Manifest b/dev-java/javax-jsp-api/Manifest
new file mode 100644
index 000000000000..d1bdfd42d152
--- /dev/null
+++ b/dev-java/javax-jsp-api/Manifest
@@ -0,0 +1,2 @@
+DIST jsp-api-2.0-sources.jar 118348 BLAKE2B d9f615961a6ef2afb1447477d44e4f49eaf9137f62ba596c40d7437c8d4973a68f689189255bcc6bae5e5970b23c8e93fbabcad2fb230f54963dad55eef2a8f7 SHA512 4f38ed56e9e51a979488a26fde36905748674e225a10df82259891fa85f8493575a58babb7620b27a96ab7e83002433ae4ee60f700a866e330642c7dd0a0f7a8
+DIST jsp-api-2.2-sources.jar 163137 BLAKE2B 8bac5428393518cb3edb8488eaaab772d37db51dfbc5b466eabcb5b8ccd90cfa4869ebe65d861c64a6c588c8ede3ab1f5ab0c2e9080dde16c0585a7f774abb05 SHA512 ff79c34904372b722501b4479cbf88796017839d636a31b9343ef9104d93e3554154b3124f366295d05a41dc8320ff8bc83e9f8ee971df35c791220065b70647
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild
new file mode 100644
index 000000000000..719f7a2a80d6
--- /dev/null
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet.jsp:jsp-api:2.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServer Pages(TM) API JSR-000152 JSR-000245"
+HOMEPAGE="https://jcp.org/aboutJava/communityprocess/final/jsr152/"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2-with-classpath-exception"
+SLOT="2.0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="dev-java/javax-servlet-api:2.5"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/javax/servlet/jsp/resources" || die
+	mv dtd/* "${JAVA_RESOURCE_DIRS}/javax/servlet/jsp/resources" || die
+}
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
new file mode 100644
index 000000000000..a4d45d389408
--- /dev/null
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet.jsp:jsp-api:2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServer Pages(TM) API JSR-000152 JSR-000245"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2-with-classpath-exception"
+SLOT="2.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CP_DEPEND="
+	dev-java/javax-el-api:2.2
+	dev-java/javax-servlet-api:2.5
+"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
diff --git a/dev-java/javax-jsp-api/metadata.xml b/dev-java/javax-jsp-api/metadata.xml
new file mode 100644
index 000000000000..882410dd6f2e
--- /dev/null
+++ b/dev-java/javax-jsp-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<slots>
+		<slot name="2.0">https://jcp.org/aboutJava/communityprocess/final/jsr152/</slot>
+		<slot name="2.2">https://jcp.org/aboutJava/communityprocess/mrel/jsr245/</slot>
+	</slots>
+</pkgmetadata>
diff --git a/dev-java/javax-servlet-api/Manifest b/dev-java/javax-servlet-api/Manifest
new file mode 100644
index 000000000000..1dff3cf160fc
--- /dev/null
+++ b/dev-java/javax-servlet-api/Manifest
@@ -0,0 +1 @@
+DIST servlet-api-2.5-sources.jar 158114 BLAKE2B 84997b9cc2122f49a850ac32089eb484bc4f68c4e73c7541cf70f453f0a0eaa0c037d6f2b8c8270d4122502f224a6943011f6a964da406093d0ad4bb173dc71e SHA512 6590adea214ba7f59e033b8f450ca8fd3a0764ac6aaf2789d5824ddeecc4c520d004242e42e3a058517d5f556a41a970f782dfde35b2cf184874a77063dc0fef
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
new file mode 100644
index 000000000000..4964c46c94c5
--- /dev/null
+++ b/dev-java/javax-servlet-api/javax-servlet-api-2.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet:servlet-api:2.5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServlet(TM) Specification"
+HOMEPAGE="https://javaee.github.io/servlet-spec/"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/javax/servlet/resources" || die
+	mv dtd/* "${JAVA_RESOURCE_DIRS}/javax/servlet/resources" || die
+	find . -type f -name '*.properties' | xargs cp --parent -t resources || die
+}
diff --git a/dev-java/javax-servlet-api/metadata.xml b/dev-java/javax-servlet-api/metadata.xml
new file mode 100644
index 000000000000..8295711f93e1
--- /dev/null
+++ b/dev-java/javax-servlet-api/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Java Servlet is the foundation web specification in the Java Enterprise Platform. Developers can build web applications using the Servlet API to interact with the request/response workflow.
+	</longdescription>
+	<upstream>
+		<doc>https://jcp.org/aboutJava/communityprocess/mrel/jsr154/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jax-rpc-api/Manifest b/dev-java/jax-rpc-api/Manifest
new file mode 100644
index 000000000000..a188d7d0974f
--- /dev/null
+++ b/dev-java/jax-rpc-api/Manifest
@@ -0,0 +1 @@
+DIST jax-rpc-api-1.1.4.tar.gz 91556 BLAKE2B a8d830a34fcd829bd44b66aadd473d25bcff788d01822b50b4eafafa3cc4ee002118904d79a38054f716bfd1fe68bd49dc7e74ae2f7ab8f9249277ddc863934d SHA512 4b2a15050d989754f93f7771622e5df286de633f4bcdeb750dbf3df6aa1115cf8de5fe84b809c15b9ccb85bd14283696df76cbe619b06ca48ce048b728525496
diff --git a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild
new file mode 100644
index 000000000000..64da18d9673c
--- /dev/null
+++ b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.xml.rpc:jakarta.xml.rpc-api:1.1.4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Eclipse Project for Stable EE4J APIs"
+HOMEPAGE="https://github.com/eclipse-ee4j/jax-rpc-api"
+SRC_URI="https://github.com/eclipse-ee4j/jax-rpc-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: api/pom.xml
+# jakarta.servlet:jakarta.servlet-api:4.0.3 -> >=dev-java/jakarta-servlet-api-4.0.4:4
+
+CP_DEPEND="
+	dev-java/jakarta-servlet-api:4
+	dev-java/jakarta-xml-soap-api:1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jax-rpc-api/metadata.xml b/dev-java/jax-rpc-api/metadata.xml
new file mode 100644
index 000000000000..4f37e2c488cf
--- /dev/null
+++ b/dev-java/jax-rpc-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/jax-rpc-api</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 1417241bf1c7..6dfe7544ed64 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1 +1,2 @@
+DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7 SHA512 9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268
 DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
new file mode 100644
index 000000000000..38a54daf093d
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jffi:1.3.10"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Foreign Function Interface"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="1.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	>=dev-libs/libffi-3.4.2-r2:="
+RDEPEND=">=virtual/jre-1.8:*
+	>=dev-libs/libffi-3.4.2-r2:="
+
+PATCHES=( "${FILESDIR}"/jffi-1.3.8-GNUmakefile.patch )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.jffi"
+JAVA_SRC_DIR="src/main/java"
+
+# https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/build.xml#L26
+JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		import java.lang.annotation.Native;
+		public final class Version {
+			private Version() {}
+			@Native
+			public static final int MAJOR = $(ver_cut 1);
+			@Native
+			public static final int MINOR = $(ver_cut 2);
+			@Native
+			public static final int MICRO = $(ver_cut 3);
+		}
+	EOF
+
+	# https://bugs.gentoo.org/829820
+	if use arm; then
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/invokeHeapDO()/i @Ignore' \
+			-e '/invokeHeapNO()/i @Ignore' \
+			-e '/invokeHeapOD()/i @Ignore' \
+			-e '/invokeHeapON()/i @Ignore' \
+			-e '/invokeHeapOO()/i @Ignore' \
+			-e '/invokeHeapO()/i @Ignore' \
+			-e '/invokeNativeDO()/i @Ignore' \
+			-e '/invokeNativeNO()/i @Ignore' \
+			-e '/invokeNativeOD()/i @Ignore' \
+			-e '/invokeNativeON()/i @Ignore' \
+			-e '/invokeNativeOO()/i @Ignore' \
+			-e '/invokeNativeO()/i @Ignore' \
+			-i src/test/java/com/kenai/jffi/InvokerTest.java || die
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/returnDefaultF128HighPrecision/i @Ignore' \
+			-i src/test/java/com/kenai/jffi/NumberTest.java || die
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javac -h build/jni -classpath target/classes \
+		${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(ver_cut 1-2)
+		USE_SYSTEM_LIBFFI=1
+		CCACHE=
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	# https://github.com/jnr/jffi/issues/60
+	LC_ALL=C java-pkg-simple_src_test
+}
+
+src_install() {
+	local libname=".so"
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
+
+	# must be after _doso to have JAVA_PKG_LIBDEST set
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf ${PN}.jar boot.properties || die
+
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index f9acdf1a6917..42da06b5a460 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1 +1,2 @@
 DIST jnr-constants-0.10.3-sources.tar.gz 261921 BLAKE2B f8137455c067e774dd30d64fe457dd859692315f43415bdfbffa4870b981db26de23d73fa7682bbd924523ac17dec56caa7078580cf817d8df3eae4d87c61343 SHA512 f7cd6a3778670c9835f8dce87c8470c8b8cfeda6f30d68051c09dae40c4f7dd7db88bed016450c33ab5c8da9a802b4bd050adf358680d5ec6735467e398404dc
+DIST jnr-constants-0.10.4.tar.gz 261915 BLAKE2B 61ed310837a27cd5a03627db6d9a2c46874f9140d046ac653c6deb6409411ab69b6103c52aab64fff99a311fc9d9e85bf97bd361291e13685d836cdf7253993c SHA512 4ab82699e58523a5f3dbc5cfba333569a605e9d3fafe828fed726aa8fe08de0aba32af431d53565ed19b67f08a63b7a28d533617aa424f95b552e3d6ec3994cb
diff --git a/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild
new file mode 100644
index 000000000000..45ccaeef10fa
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.10.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-constants:0.10.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="https://github.com/jnr/jnr-constants"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.constants"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 99cac23713ca..144578a163ba 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1 +1,2 @@
 DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91
+DIST jnr-posix-3.1.16.tar.gz 120553 BLAKE2B b430d4699b84e9c4139291c34c328ade600adade68081167d3b47ce52caa6f96a818702dcb26652d186d7de825b32b00f2f1329b79f9c459cbbb6f6a4260d9f3 SHA512 988221a9a499db64c2bc3fe4e798fb77ce1bce44a31b51ace4f1e52b9a76a3af9a1521477a64413b44f36da9ab5446feb1b2ffd4e7dc50be055f6092d9e1f977
diff --git a/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
new file mode 100644
index 000000000000..8a1490e9b7d9
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.1.16.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-posix:3.1.16"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common cross-project/cross-platform POSIX APIs"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="EPL-2.0 GPL-2 LGPL-2.1"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	>=dev-java/jnr-ffi-2.2.12:2
+	dev-java/jnr-constants:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.posix"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-i src/test/java/jnr/posix/FileTest.java || die
+
+	if use ppc64; then
+		# Ignore testMessageHdrMultipleControl
+		# https://bugs.gentoo.org/866199
+		# https://github.com/jnr/jnr-posix/issues/178
+		sed \
+			-e '/testMessageHdrMultipleControl/i @Ignore' \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
+	fi
+
+	if use arm; then
+		# https://bugs.gentoo.org/866692
+		sed \
+			-e '/utimensatRelativePath()/i @Ignore' \
+			-e '/utimesDefaultValuesTest()/i @Ignore' \
+			-e '/futimeTest()/i @Ignore' \
+			-e '/utimesTest()/i @Ignore' \
+			-e '/utimesPointerTest()/i @Ignore' \
+			-e '/utimensatAbsolutePath()/i @Ignore' \
+			-e '/futimens()/i @Ignore' \
+			-i src/test/java/jnr/posix/FileTest.java || die
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/ioprioThreadedTest()/i @Ignore' \
+			-e '/testPosixFadvise()/i @Ignore' \
+			-i src/test/java/jnr/posix/LinuxPOSIXTest.java || die
+		sed \
+			-e '/import org.junit.Test/a import org.junit.Ignore;' \
+			-e '/testSetRlimitPointerLinux()/i @Ignore' \
+			-e '/testGetRLimitPointer()/i @Ignore' \
+			-i src/test/java/jnr/posix/ProcessTest.java || die
+	fi
+
+	JAVA_TEST_EXCLUDES=(
+		# https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.16/pom.xml#L185
+		# <exclude>**/windows/*Test.java</exclude>
+		"jnr.posix.windows.WindowsFileTest"
+		"jnr.posix.windows.WindowsHelpersTest"
+	)
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
+		# Some tests in jnr.posix.FileTest fail with jdk-17
+		sed \
+			-e '/flockTest()/i @Ignore' \
+			-e '/dupTest()/i @Ignore' \
+			-e '/closeTest()/i @Ignore' \
+			-e '/fcntlDupfdWithArgTest()/i @Ignore' \
+			-i src/test/java/jnr/posix/FileTest.java || die
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jstl-api/Manifest b/dev-java/jstl-api/Manifest
new file mode 100644
index 000000000000..0133dc5a57f2
--- /dev/null
+++ b/dev-java/jstl-api/Manifest
@@ -0,0 +1 @@
+DIST jstl-1.2.7.tar.gz 291252 BLAKE2B 37383f519615f41e4247b1e2207cf1cc57df3a3d01f939bb41cc400dbdb49b331fc0bc3e5ee26c3d9d1e361bd4ec11efd5b6e6a9cc6cafee2b196c1d9491d07f SHA512 2b52869fe5f6d586b8505a2a417790ffad7112db17af667cd52fb567fb6c7ee4a3b3906a072d0d4e7ef463b56a1e5cf9a955b9fbaab97c91a1a286e05add23c3
diff --git a/dev-java/jstl-api/jstl-api-1.2.7.ebuild b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
new file mode 100644
index 000000000000..1818a42cc5da
--- /dev/null
+++ b/dev-java/jstl-api/jstl-api-1.2.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Standard Tag Library API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jstl"
+SRC_URI="https://github.com/jakartaee/tags/archive/${PV}-RELEASE.tar.gz -> jstl-${PV}.tar.gz"
+S="${WORKDIR}/tags-${PV}-RELEASE"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CP_DEPEND="
+	dev-java/javax-el-api:2.2
+	dev-java/javax-jsp-api:2.2
+	dev-java/javax-servlet-api:2.5
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+DOCS=(
+	CONTRIBUTING.md
+	NOTICE.md
+	README.md
+)
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jstl-api/metadata.xml b/dev-java/jstl-api/metadata.xml
new file mode 100644
index 000000000000..6f95d33b7ee3
--- /dev/null
+++ b/dev-java/jstl-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/tags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jstl/Manifest b/dev-java/jstl/Manifest
new file mode 100644
index 000000000000..0133dc5a57f2
--- /dev/null
+++ b/dev-java/jstl/Manifest
@@ -0,0 +1 @@
+DIST jstl-1.2.7.tar.gz 291252 BLAKE2B 37383f519615f41e4247b1e2207cf1cc57df3a3d01f939bb41cc400dbdb49b331fc0bc3e5ee26c3d9d1e361bd4ec11efd5b6e6a9cc6cafee2b196c1d9491d07f SHA512 2b52869fe5f6d586b8505a2a417790ffad7112db17af667cd52fb567fb6c7ee4a3b3906a072d0d4e7ef463b56a1e5cf9a955b9fbaab97c91a1a286e05add23c3
diff --git a/dev-java/jstl/jstl-1.2.7.ebuild b/dev-java/jstl/jstl-1.2.7.ebuild
new file mode 100644
index 000000000000..351e0735dbe7
--- /dev/null
+++ b/dev-java/jstl/jstl-1.2.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.glassfish.web:javax.servlet.jsp.jstl:1.2.7"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Standard Tag Library API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jstl"
+SRC_URI="https://github.com/jakartaee/tags/archive/${PV}-RELEASE.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/tags-${PV}-RELEASE"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CP_DEPEND="
+	dev-java/javax-el-api:2.2
+	dev-java/javax-jsp-api:2.2
+	dev-java/javax-servlet-api:2.5
+	dev-java/jstl-api:0
+	dev-java/xalan:0
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+DOCS=(
+	CONTRIBUTING.md
+	NOTICE.md
+	README.md
+)
+
+JAVA_JAR_FILENAME="jstl-impl.jar"
+JAVA_RESOURCE_DIRS="impl/src/main/resources"
+JAVA_SRC_DIR="impl/src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# java-pkg-simple expects resource files in JAVA_RESOURCE_DIRS
+	cp -r impl/src/main/java/* impl/src/main/resources || die
+	find impl/src/main/resources -type f \
+		\( -name '*.java' \
+		-o -name '*.txt' \
+		-o -name '*Parser.jj' \
+		-o -name 'spath.tld' \
+		\) -exec rm -rf {} + || die "deleting classes failed"
+}
diff --git a/dev-java/jstl/metadata.xml b/dev-java/jstl/metadata.xml
new file mode 100644
index 000000000000..6f95d33b7ee3
--- /dev/null
+++ b/dev-java/jstl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jakartaee/tags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
new file mode 100644
index 000000000000..f9ae58282ad4
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Enterprise Release 5 Companion Code"
+HOMEPAGE="http://www.osgi.org/Main/HomePage"
+SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RESTRICT="bindist"
+
+CP_DEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	dev-java/javax-servlet-api:2.5"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+src_prepare() {
+	default
+	rm -r org || die
+}
diff --git a/dev-java/reflections/reflections-0.9.12-r5.ebuild b/dev-java/reflections/reflections-0.9.12-r5.ebuild
new file mode 100644
index 000000000000..3ca2b5f13dd3
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.12-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild reflections-0.9.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.reflections:reflections:0.9.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reflections - a Java runtime metadata analysis"
+HOMEPAGE="https://github.com/ronmamo/reflections"
+SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
+# org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
+# org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-simple:1.7.24 -> >=dev-java/slf4j-simple-1.7.30:0
+
+CP_DEPEND="
+	dev-java/dom4j:1
+	dev-java/gson:2.6
+	dev-java/javassist:3
+	dev-java/slf4j-api:0
+	dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:servlet-api:2.5 -> java-virtuals/servlet-api:2.5
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	dev-java/javax-servlet-api:2.5
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5"
+JAVA_SRC_DIR=( "src/main/java" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_EXCLUDES=(
+	# Upstream does not run this test
+	"org.reflections.TestModel"
+	# 1) testMethodParameterNames(org.reflections.ReflectionsCollectTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsCollectTest
+	# 2) testMethodParameterNames(org.reflections.ReflectionsParallelTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsParallelTest
+	# 3) testMethodParameterNames(org.reflections.ReflectionsTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsTest
+	#
+	# https://github.com/ronmamo/reflections/issues/277#issuecomment-927152981
+	# scanner was not configured exception - this is a known issue in 0.9.12, a simple workaround is to
+	# check if the getStore() contains index for the scanner before querying. next version 0.10 fixes this.
+)
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 994d06d1ac39..65b7f063364d 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/boogie/metadata.xml b/dev-lang/boogie/metadata.xml
index e0e4670c63ec..c2b44bcc70fc 100644
--- a/dev-lang/boogie/metadata.xml
+++ b/dev-lang/boogie/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xgqt@gentoo.org</email>
-    <name>Maciej Barć</name>
+  <maintainer type="project">
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
   </maintainer>
   <longdescription>
     Boogie is an intermediate verification language (IVL), intended as a layer
diff --git a/dev-lang/dafny-bin/metadata.xml b/dev-lang/dafny-bin/metadata.xml
index f0b8fd07b684..9533d79f1088 100644
--- a/dev-lang/dafny-bin/metadata.xml
+++ b/dev-lang/dafny-bin/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xgqt@gentoo.org</email>
-    <name>Maciej Barć</name>
+  <maintainer type="project">
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
   </maintainer>
   <longdescription>
     Dafny is a verification-ready programming language. As you type in your
diff --git a/dev-lang/eisl/eisl-2.70.ebuild b/dev-lang/eisl/eisl-2.70.ebuild
index 82b169ce706a..c79630e56a74 100644
--- a/dev-lang/eisl/eisl-2.70.ebuild
+++ b/dev-lang/eisl/eisl-2.70.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sasagawa888/eisl/archive/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"  # Tests run cppcheck (and fail)
 
 DOCS=( README{,-ja}.md documents )
diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild
index 6f2ee56c5a5e..a343a4857794 100644
--- a/dev-lang/ispc/ispc-1.18.0.ebuild
+++ b/dev-lang/ispc/ispc-1.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 LLVM_MAX_SLOT=14
 inherit cmake python-any-r1 llvm
 
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index d0d56a746a2a..fa475e22b192 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,5 +1 @@
-DIST MoarVM-2021.06.tar.gz 5449936 BLAKE2B 2bf6fc2e1a4dd0741819305e506945b09ed2a0fc1348ff98565cae397e76044176f05e87faeed1f52d5efadccb6d44edcb987553f5e164417153a8f23ba09493 SHA512 b23e20ed3e0830395ac09bd84a33ea3ab7ba52bce835c67b1feec45823ca2f0c9d04957d1f1b48b400fc30a48db37c5f89c3975b0273f684d9677145e2296f2c
-DIST MoarVM-2021.08.tar.gz 13643526 BLAKE2B 433cfaaad4138d8b98fc4bacd5495281f2a8da5195aa74aded118126afdf11cdf0175fd033472e951e91ab3c1eb11877ab039cd24d911553d5854be18021a87e SHA512 6199871f51a4998e1b5260ba833e3bf09c6115e12334a94de5aa4135b93f8dc754967712ce8e092a36b4940368433be840cbf1a8ce7aec52219f768acd90078d
-DIST MoarVM-2021.10.tar.gz 13711924 BLAKE2B 18e0c8b5429242f7588dc5ad47d92a46146223e8dc7dcef93e2cb3332c2400b29754f1f03ceb9016665771554940667e1373a48c96921922834fd103a73d985a SHA512 a376d0388d9e53b9f07a960ab23ddf8e35379a6dff168d2f726c0f05431804bf4e09b0a2a0eab9a39b9df493030e384e9680a7654bdf9e5c129a6c70aead833d
-DIST MoarVM-2022.02.tar.gz 14640429 BLAKE2B 5e64855514c33d97408353756ba88f29bfd2da39d8d2aa03b8c096645ca7dc680df47a246d224920aa466b76005c1be9d6e7096933046e0fa0caf836cfd09eb2 SHA512 12385cc6cfc5308240d841842ac1b2ff880e786c9724dc6c7fa776c1c6422b345e1f4ab870579b7051726b2655668caed33e1bbb75a7201948431a7b2897e9f7
-DIST MoarVM-2022.06.tar.gz 14867282 BLAKE2B 2c9d00098fe610890698c5f8ef8eca0b02196a69f6f28d83e1dc4cfa32e337aede984176464ec8a9ce55fc8a9ac424fd206edca8b3c9ee3532964b32ec4bfef2 SHA512 2a47fcd2e3d8ed0bd3845ec04f0bb8ead87190985e7b83acfa4f726ccc0f544d93bfb7fad5dcedfd09739c41632abb1618a128936a1053c5b0b85ca1857f87c3
+DIST MoarVM-2023.02.tar.gz 14917710 BLAKE2B 57ea0a3871f51f2cf2bf7f7d9d70f4d00052cf3ab255916fc73eb33fabd0e96e44155582e73158cf98042705817b5541f3fea0d557b09e38ad6e45cad14f172f SHA512 a3dd172a84aba72df4bb9228f50eea3c4d74d4db285b06f19dc4502523f3de09580ad8a5525cf181038928263e47f72b0187a5d57dba019f18b9783ba4247203
diff --git a/dev-lang/moarvm/moarvm-2021.06-r1.ebuild b/dev-lang/moarvm/moarvm-2021.06-r1.ebuild
deleted file mode 100644
index fd7e4e0ccdf4..000000000000
--- a/dev-lang/moarvm/moarvm-2021.06-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Raku"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-
-IUSE="asan clang debug doc +jit optimize static-libs ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26:=
-		dev-libs/libffi:="
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	MAKEOPTS+=" NOISY=1"
-	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
-	local myconfigargs=(
-		"--prefix" "${prefix}"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir" "${libdir}"
-		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
-	)
-
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
-}
diff --git a/dev-lang/moarvm/moarvm-2021.08.ebuild b/dev-lang/moarvm/moarvm-2021.08.ebuild
deleted file mode 100644
index fd7e4e0ccdf4..000000000000
--- a/dev-lang/moarvm/moarvm-2021.08.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Raku"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-
-IUSE="asan clang debug doc +jit optimize static-libs ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26:=
-		dev-libs/libffi:="
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	MAKEOPTS+=" NOISY=1"
-	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
-	local myconfigargs=(
-		"--prefix" "${prefix}"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir" "${libdir}"
-		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
-	)
-
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
-}
diff --git a/dev-lang/moarvm/moarvm-2021.10.ebuild b/dev-lang/moarvm/moarvm-2021.10.ebuild
deleted file mode 100644
index fd7e4e0ccdf4..000000000000
--- a/dev-lang/moarvm/moarvm-2021.10.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Raku"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-
-IUSE="asan clang debug doc +jit optimize static-libs ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26:=
-		dev-libs/libffi:="
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	MAKEOPTS+=" NOISY=1"
-	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
-	local myconfigargs=(
-		"--prefix" "${prefix}"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir" "${libdir}"
-		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
-	)
-
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
-}
diff --git a/dev-lang/moarvm/moarvm-2022.02.ebuild b/dev-lang/moarvm/moarvm-2022.02.ebuild
deleted file mode 100644
index 5ba74d4a28f6..000000000000
--- a/dev-lang/moarvm/moarvm-2022.02.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Raku"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-
-IUSE="asan clang debug doc +jit optimize static-libs ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26:=
-		dev-libs/libffi:="
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	MAKEOPTS+=" NOISY=1"
-	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
-	local myconfigargs=(
-		"--prefix" "${prefix}"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir" "${libdir}"
-		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
-	)
-
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
-}
diff --git a/dev-lang/moarvm/moarvm-2022.06.ebuild b/dev-lang/moarvm/moarvm-2022.06.ebuild
deleted file mode 100644
index 5ba74d4a28f6..000000000000
--- a/dev-lang/moarvm/moarvm-2022.06.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Raku"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-
-IUSE="asan clang debug doc +jit optimize static-libs ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26:=
-		dev-libs/libffi:="
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	MAKEOPTS+=" NOISY=1"
-	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
-	local myconfigargs=(
-		"--prefix" "${prefix}"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir" "${libdir}"
-		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
-	)
-
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
-}
diff --git a/dev-lang/moarvm/moarvm-2023.02.ebuild b/dev-lang/moarvm/moarvm-2023.02.ebuild
new file mode 100644
index 000000000000..81688dce5b74
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2023.02.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Raku"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+
+IUSE="asan clang debug doc +jit optimize static-libs ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		>=dev-libs/libuv-1.26:=
+		dev-libs/libffi:="
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	MAKEOPTS+=" NOISY=1"
+	use doc && DOCS+=( docs/* )
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
+	einfo "--prefix '${prefix}'"
+	einfo "--libdir '${libdir}'"
+	local myconfigargs=(
+		"--prefix" "${prefix}"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir" "${libdir}"
+		"--compiler" "$(usex clang clang gcc)"
+		"$(usex asan        --asan)"
+		"$(usex debug       --debug            --no-debug)"
+		"$(usex optimize    --optimize=        --no-optimize)"
+		"$(usex static-libs --static)"
+		"$(usex ubsan       --ubsan)"
+	)
+
+	perl Configure.pl "${myconfigargs[@]}" moarshared || die
+}
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index df3dea7875a4..71cb25f7c82f 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit flag-o-matic
+EAPI=8
 
 MY_PN="MoarVM"
 if [[ ${PV} == "9999" ]]; then
diff --git a/dev-lang/nim/metadata.xml b/dev-lang/nim/metadata.xml
index b544028faf59..43513b90b646 100644
--- a/dev-lang/nim/metadata.xml
+++ b/dev-lang/nim/metadata.xml
@@ -6,6 +6,10 @@
     <email>xgqt@gentoo.org</email>
     <name>Maciej Barć</name>
   </maintainer>
+  <maintainer type="project">
+    <email>nim@gentoo.org</email>
+    <name>Gentoo Nim Project</name>
+  </maintainer>
   <longdescription>
     Nim is a statically typed compiled systems programming language.
     It combines successful concepts from mature languages like Python,
diff --git a/dev-lang/nim/nim-1.6.10-r2.ebuild b/dev-lang/nim/nim-1.6.10-r2.ebuild
index 5bbd9b8328f5..282de83f53e2 100644
--- a/dev-lang/nim/nim-1.6.10-r2.ebuild
+++ b/dev-lang/nim/nim-1.6.10-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc experimental test-js test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index e3376e5fab95..d89650a4df4b 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,5 +1 @@
-DIST nqp-2021.06.tar.gz 5208065 BLAKE2B 7314f425e418161befc55f9490453a3a4c3caa0ddf13e2b3bbcc9a20a6204aba9517885b6ecccddbbaf078b60c74be90fe556bf99dcc6014e57a7c873e96381d SHA512 482ec4a99d09b3660f03fd3c822a2f8c72dbdfeda1bcfdac0b4bcfa364ec57cbfdebf3b2872f8649c86d3d2d7603961d75e00d73dc417e5ac2a32f643bcfcabe
-DIST nqp-2021.08.tar.gz 5208527 BLAKE2B 1f2e454e63484a8a636f61c9110b4a20775ec59dd7734fe32a93b01aaad5ea977ea74678085a66d9f072234de5768d8023182d6df56a448f2a0aa0fd3c1c76c3 SHA512 fca1dc8c36f914304f97330cb33be3a94c539f3cb6cc80d898c734dcf04b12b8be30ffce358a0a5320c6ea56afd627f792b4a8fa3f94134776922ae088b92814
-DIST nqp-2021.10.tar.gz 5207621 BLAKE2B 85b6627bc843d211ef8c296e63a97b0f80e019f89080f7c94b1e55767e4fab430c426c77aea741d601e75f6fb354a1f8b6c6077c70ab5cbfd2edef1621137af3 SHA512 d308045cc8a01298bcc544e8fd27752d1fc28e421b1cd24f1d5675333ba8cd71cb946e760ba485710456aebf21eeab1d2f85abffe49336471f1148071df6aa98
-DIST nqp-2022.02.tar.gz 5220819 BLAKE2B eba57834cc883e5bab26d0496df5bb059cc31f893e25833ada26cfa4796b9f822d1bb17e6ac0eb2474238e78565cf1da3be6f82d34a82bb4ac70cc19e03e11aa SHA512 0a51eb96486a254543ffbc2dac5d32a2b218a7fd774ccd3c8d4ba23f33dacbebdc0190e7cc919103f57573ea74ff8592200759c9768485044a4433647958ba8f
-DIST nqp-2022.06.tar.gz 5222082 BLAKE2B bf5f3e98ad40d76ca45887ed1d64d3a5d11b91493f5af7324c5ebe62c3c34c9ababaf64e4083c30a4f4a16db46710b28054e423bd84aa259e8b293330265e2c7 SHA512 e044701d77ea6baeb51202a808a86a46e99cae1db03888cd2848424e9dfbb318a82ccf21476050f26e388f3c5137e4389626d52a7434d0ffb1d2c97501e23407
+DIST nqp-2023.02.tar.gz 6023282 BLAKE2B 546ef7c0039857a2be07b2a0601c32f5f8719674a64f599dc1c6faa34dcc12bf7b205da9356c3c2632e01eb3cdc22a8c6bbb7d70180773d58c7a6989c56df2b7 SHA512 c71b7d5b0237501a10b30985dcd48f17f9741dc09360b2a98c24134cd1dde8fbb868eef39d97aba2ba031b52e06b5220095792c834d5d154218e45dd1af87cdd
diff --git a/dev-lang/nqp/nqp-2021.06.ebuild b/dev-lang/nqp/nqp-2021.06.ebuild
deleted file mode 100644
index 849aaaf6aaee..000000000000
--- a/dev-lang/nqp/nqp-2021.06.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2021.08.ebuild b/dev-lang/nqp/nqp-2021.08.ebuild
deleted file mode 100644
index 849aaaf6aaee..000000000000
--- a/dev-lang/nqp/nqp-2021.08.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2021.10.ebuild b/dev-lang/nqp/nqp-2021.10.ebuild
deleted file mode 100644
index 849aaaf6aaee..000000000000
--- a/dev-lang/nqp/nqp-2021.10.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2022.02.ebuild b/dev-lang/nqp/nqp-2022.02.ebuild
deleted file mode 100644
index 6b6f6e70f126..000000000000
--- a/dev-lang/nqp/nqp-2022.02.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.9 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.9 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2022.06.ebuild b/dev-lang/nqp/nqp-2022.06.ebuild
deleted file mode 100644
index 6b6f6e70f126..000000000000
--- a/dev-lang/nqp/nqp-2022.06.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.9 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.9 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2023.02.ebuild b/dev-lang/nqp/nqp-2023.02.ebuild
new file mode 100644
index 000000000000..fc12e500ef7b
--- /dev/null
+++ b/dev-lang/nqp/nqp-2023.02.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Raku bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:9
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-11 )"
+DEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-11 )
+	dev-lang/perl"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use moar && MULTIBUILD_VARIANTS+=( moar )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=${EPREFIX}/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+nqp_compile() {
+	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}" \
+			JAVAC="$(java-pkg_get-javac)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}"
+	fi
+}
+
+nqp_test() {
+	emake -j1 \
+		-C "${BUILD_DIR}" \
+		test
+}
+
+nqp_install() {
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	case "${MULTIBUILD_VARIANT}" in
+		moar)
+			emake \
+				DESTDIR="${ED}" \
+				-C "${BUILD_DIR}" \
+				install
+			;;
+		jvm)
+			pushd "${BUILD_DIR}" > /dev/null || die
+			# Set JAVA_PKG_JARDEST early.
+			java-pkg_init_paths_
+
+			# Upstream sets the classpath to this location. Perhaps it's
+			# used to locate the additional libraries?
+			java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+			insinto "${JAVA_PKG_JARDEST}"
+			local jar
+
+			for jar in *.jar; do
+				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+					# jars for NQP itself.
+					java-pkg_dojar ${jar}
+				else
+					# jars used by NQP.
+					doins ${jar}
+				fi
+			done
+
+			# Upstream uses -Xbootclasspath/a, which is faster due to lack
+			# of verification, but gjl isn't flexible enough yet. :(
+			java-pkg_dolauncher ${PN}-j --main ${PN}
+			dosym ${PN}-j /usr/bin/${PN}
+			dobin tools/jvm/eval-client.pl
+			popd > /dev/null || die
+			;;
+		*)
+			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+			;;
+	esac
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index 849aaaf6aaee..fc12e500ef7b 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-opt-2 multibuild
 
@@ -23,17 +23,16 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 
 CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
+		dev-java/asm:9
 		dev-java/jna:4
 	)
 	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
+	java? ( >=virtual/jre-11 )"
 DEPEND="${CDEPEND}"
 BDEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
+	java? ( >=virtual/jdk-11 )
 	dev-lang/perl"
 
 pkg_pretend() {
@@ -45,16 +44,6 @@ pkg_pretend() {
 	fi
 }
 
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
 src_prepare() {
 	MULTIBUILD_VARIANTS=()
 	use moar && MULTIBUILD_VARIANTS+=( moar )
@@ -80,8 +69,7 @@ nqp_compile() {
 	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+			JAVAC="$(java-pkg_get-javac)"
 	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
 		emake -j1 \
 			-C "${BUILD_DIR}"
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index ec83837afd57..87b3df81499e 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -19,10 +19,10 @@
       useful for extension developers, and requires GCC.
     </flag>
     <flag name="ctype">Enable ctype functions</flag>
-    <flag name="embed">Enable embed SAPI </flag>
-    <flag name="enchant">Add supports Enchant spelling library. </flag>
-    <flag name="ffi"> Add foreign function interface (ffi extension) support</flag>
-    <flag name="fileinfo"> Add fileinfo extension support</flag>
+    <flag name="embed">Enable embed SAPI</flag>
+    <flag name="enchant">Add supports Enchant spelling library</flag>
+    <flag name="ffi">Add foreign function interface (ffi extension) support</flag>
+    <flag name="fileinfo">Add fileinfo extension support</flag>
     <flag name="filter">Add filter extension support</flag>
     <flag name="flatfile">Add dbm support for flat files</flag>
     <flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index d61d1c902a0b..76cdea07b865 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -18,10 +18,13 @@ DIST Python-3.9.16.tar.xz 19738796 BLAKE2B 70dedeb70d9d8f27e4f6db5106623e087c61d
 DIST Python-3.9.16.tar.xz.asc 833 BLAKE2B 416b4a4be06e101c5971c12a6f21229c425bcabaea58487e0d1b24d6dea318c58806ee43892fc704df8252670451bd6a4a2610c25672d3983ddb081fed34b92d SHA512 468959c36a3ec6136f57a39475fff4745a25be0cb5d3d58cf3e5faf0b9ce2d2a8b89f1f9fea1479c4c6ad12ac49e97c1cfd4291c978bb3d30df5a582ec315210
 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
 DIST python-gentoo-patches-3.10.10_p1.tar.xz 12836 BLAKE2B 2a146138e4c34b35e7a3e79215ca03afb97c61b52fe68fe6b930aad2af748925c46b1faec9b38ec1b6be11c19b2e9ebecfa2acd86486a01babbe695fe305a284 SHA512 4821b0ba9731d5868dce31d6f51b6fa429331f49b1d07f1425d9561fb57b47719ef91ede9af33beb2d96d9824b755ba9d3fec867bbcc3462507c315153db57d2
+DIST python-gentoo-patches-3.10.10_p2.tar.xz 13992 BLAKE2B e18e708888dd28c8f238d4897aff79483a679396a168d8b5ff4f5e8c7f09cec5f1b13aeb327d3dc3e2149c2117c25da050987f1f1c3322b56c87245ba2d0b54d SHA512 14bc218a2f3c64ef9f42682fd1364208bcaa74f787dee39bd9566e40764c260a65fd42961be47a6e6c6227091cb2fef83e1d689302448647560689e20e07efe0
 DIST python-gentoo-patches-3.10.9.tar.xz 12216 BLAKE2B ced4f951089c51ddaab6c62ade9d2c84f69e7e1baf2acf5247559534c7d0fb0e88dca1222f5bd2209b4e61f5aca17279b8054f269535dbc10de0786c2c5779f5 SHA512 2d01f0f3831beeba004517bb82f7d616f25f08e5c755409ecff79cd68e0a619b5bf6802fffd0e5f7f39f1d9d93e65b018b91cdeb337a5e47f1651f36bea0e96e
 DIST python-gentoo-patches-3.11.1.tar.xz 7076 BLAKE2B 3ec45f7529d34eabc9d9ba7fa7f8dd51d8754d9758a605b61857a9fd80386a0357837c925263ad7b0e207ff916944b94cc0e03c0f59921f839d5e51d92f0e47e SHA512 4253dbfa057a91db584b92550e2d39d87986f33041233bc400dd0254cbd95415b33fc47b0fe997bb84192c755bc16d3d31941bba4c216ee4d65facf0b48c7862
 DIST python-gentoo-patches-3.11.2_p1.tar.xz 7788 BLAKE2B 9652c46cd323958a43e26fd6b0afdd8f214953db59d9acf133366f7576502578c10e0a80ca13a9d768442d79c71dd6d095d73ef2bbbd1f79ef269a9ee20fc4b8 SHA512 7c5794e582d8ea5f99acb9ccf87c7e1f45a6557d0eb95de2b8c0cd7831f22e53eef0f03f32ca37568d1742024be127f0219463351f5b604f258c8a9985f89ea9
 DIST python-gentoo-patches-3.12.0a4.tar.xz 8504 BLAKE2B 1257c1fe428fc967ef7d3107f99e4fcef0758a2bfa5b345bf69bb47bc0af1644b449f2b11b61148a8f79ed583a80365432d78ec4bade3d92070f08ad2ff568c2 SHA512 142f5d2ee8c1beeb6084bb6b48a0bbdcde907f48f514ac7743f0e6898a761696bb7788861fcb5c938cc36f212d444ddcfe874880ac8b4d0d54bc8ec04b166ca0
 DIST python-gentoo-patches-3.12.0a5.tar.xz 7704 BLAKE2B 7224d3e4318313183a10dc0d4fa73ab589b9de8096945750f31d45371b926f7e2cbeb2c672c254e369f04bb5588a79335ceea2e3ce4968e76f70206bdc3c9672 SHA512 951d6fd25e113bf29fb334a9162bc132d27a8c3186c8b6cbaddfbdea8ccd221fe126d09cf7c6df59942d49dac8561a4e168468daa0e7cd0d0d3a925166b4d835
 DIST python-gentoo-patches-3.8.16_p2.tar.xz 30888 BLAKE2B c1816cd8b043b9aa3629a7753b7a9afa7c9af5d35b81954113af40632c97dabaa2148f0b920d9a37e8f4ebeadc1d76788a904c254ea842ea1062d552d2208e8e SHA512 6383c3f07fc7d6f37bb0cf9af27544323784eb2ded9b6f7913f3f59f5011ccb5615fb1adcc9eb3f9a58a98b7a2c24393bfbeef0b85728d77404621e29cb72656
+DIST python-gentoo-patches-3.8.16_p3.tar.xz 31900 BLAKE2B ae3787f223407c34c1a8c442c0e05bea8307cbace6140dc0ed08085d4a507bc2b6307cb89efa738750affc29320a3ec562fef5c066804abe25a856e4cbe88685 SHA512 df90a99b316c967a1176909a47450b02f771ded695b5f63486d85da7ff5755a27b9410b71bd27fb4217f8555e278c91bd88db53a9108aa84559bfbfd0ce4e5e7
 DIST python-gentoo-patches-3.9.16_p1.tar.xz 25564 BLAKE2B e6b7f20bb0457011d74f441d58eb0c9c4426a61bf0f8a2146f0180104c7b8b5054a04afc664374a17f3770d3ae94836099c362e841e4c00631a75fc56a2b352d SHA512 43f473dba8f6bd19c6a30f169ec8e8abb9eefe7d26c357884ee27cabf1b5876c079ea0e9454b9e52021d15f070e0a824e3366cfde20d57175f5f89774ee50a5b
+DIST python-gentoo-patches-3.9.16_p2.tar.xz 26664 BLAKE2B 7176c58fd4bfe40489de33d67a0c106f9d170656e6ae47318b103ac45a4e0aca14e89790300c3881a3c9b8ca556996573621eb5dac0a71106ea0ae9bbf3e82c2 SHA512 792fcd53385d95e3ba5937b26099fcc19e62d3512783c25e734ee0cd153c8717e618dba010dd98b8647d3265bf94e40665e30494aae1a84181febbd7dbab3f36
diff --git a/dev-lang/python/python-2.7.18_p16-r1.ebuild b/dev-lang/python/python-2.7.18_p16-r1.ebuild
index 46d496829651..16af9e8af96f 100644
--- a/dev-lang/python/python-2.7.18_p16-r1.ebuild
+++ b/dev-lang/python/python-2.7.18_p16-r1.ebuild
@@ -80,6 +80,8 @@ RDEPEND+="
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
 QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
 
 pkg_setup() {
 	if use berkdb; then
@@ -187,6 +189,9 @@ src_configure() {
 		# Python on glibc upgrade, remove it proactively to give
 		# a chance for users rebuilding python before glibc
 		ac_cv_header_stropts_h=no
+		# Test program has missing includes.  This doesn't change
+		# the result but it's cleaner to force it.
+		ac_cv_broken_poll=no
 
 		--with-fpectl
 		--enable-shared
diff --git a/dev-lang/python/python-3.10.10_p2.ebuild b/dev-lang/python/python-3.10.10_p2.ebuild
new file mode 100644
index 000000000000..e1bc4f518468
--- /dev/null
+++ b/dev-lang/python/python-3.10.10_p2.ebuild
@@ -0,0 +1,488 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit prefix python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk valgrind +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
+	dev-libs/libffi:=
+	dev-python/gentoo-common
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	valgrind? ( dev-util/valgrind )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			--libdir="${cbuild_libdir:2}"
+
+			# Avoid needing to load the right libpython.so.
+			--disable-shared
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	hprefixify setup.py
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.11.2_p1.ebuild b/dev-lang/python/python-3.11.2_p1.ebuild
index 8eade19a658d..05ca11231574 100644
--- a/dev-lang/python/python-3.11.2_p1.ebuild
+++ b/dev-lang/python/python-3.11.2_p1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
@@ -97,6 +97,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 CHECKREQS_DISK_BUILD=5500M
 
 QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
 
 pkg_pretend() {
 	use test && check-reqs_pkg_pretend
diff --git a/dev-lang/python/python-3.12.0_alpha5.ebuild b/dev-lang/python/python-3.12.0_alpha5.ebuild
index c2c9e1492070..abbc74ddf678 100644
--- a/dev-lang/python/python-3.12.0_alpha5.ebuild
+++ b/dev-lang/python/python-3.12.0_alpha5.ebuild
@@ -97,6 +97,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 CHECKREQS_DISK_BUILD=5500M
 
 QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
 
 pkg_pretend() {
 	use test && check-reqs_pkg_pretend
diff --git a/dev-lang/python/python-3.8.16_p3.ebuild b/dev-lang/python/python-3.8.16_p3.ebuild
new file mode 100644
index 000000000000..38a5f8659fad
--- /dev/null
+++ b/dev-lang/python/python-3.8.16_p3.ebuild
@@ -0,0 +1,427 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils
+inherit prefix python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk valgrind wininst +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	valgrind? ( dev-util/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	if ! use wininst; then
+		rm Lib/distutils/command/wininst*.exe || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with valgrind)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			--libdir="${cbuild_libdir:2}"
+
+			# Avoid needing to load the right libpython.so.
+			--disable-shared
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	hprefixify setup.py
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.9.16_p2.ebuild b/dev-lang/python/python-3.9.16_p2.ebuild
new file mode 100644
index 000000000000..176c8f919be3
--- /dev/null
+++ b/dev-lang/python/python-3.9.16_p2.ebuild
@@ -0,0 +1,483 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit prefix python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk valgrind +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_9(-)]
+	dev-libs/libffi:=
+	dev-python/gentoo-common
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	valgrind? ( dev-util/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with valgrind)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			--libdir="${cbuild_libdir:2}"
+
+			# Avoid needing to load the right libpython.so.
+			--disable-shared
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	hprefixify setup.py
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index fe0df5862b9b..0ed5e88032c3 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1,5 +1 @@
-DIST rakudo-2021.06.tar.gz 5211187 BLAKE2B e6a73ada3bc7550ad9e2415374f8ecd9aeed021faf8bc52697c8d4bd1fc16782036fecf346f1b132f2d50b894f99ebca548e6e4209b1ff643a045679415ae3fd SHA512 1141979c63a5128919d24c4660cff8011fade12487bd7f437dbaeb6d121ab2d93e42022227ad47d6d840ddb12118c9f1cde8285d87677ff88b135c4e9f079ecc
-DIST rakudo-2021.08.tar.gz 5906537 BLAKE2B 73a70ac0524ef41355e835173bccca743db5aa0f7b41ac0b152537da84337f6281c0619b86cd282d8e103bcc37573e0c42e147d2f6cb7d626b5bfaac9c6917d6 SHA512 6b58ddf47742cb8abc7c017ccbc658dac04a7a2e9802e3c656f775f94a97264a92c24f0a88c0f7baae3fa5b531acb407a652eea6c9d9cdc2f00afef00c92a018
-DIST rakudo-2021.10.tar.gz 6093348 BLAKE2B b2a49c7ee5561cabaae20a573d93b2510b117697ac7c56819a776a890e12a50f8efd726329d69d1f1cbe194114a715db6253d7ce47b5ca9f817254b7eb517ba8 SHA512 6792d77f566c77f23371b2445b67f72ba3c74da9f3b3fa75bbb7db3c1f59f1aa4b8d964af4889caa82b19404304cf4d27ecd562e86b8fc0194f202ba5d7aceff
-DIST rakudo-2022.02.tar.gz 6140289 BLAKE2B 213f2b0384bbf5d92c19ac78cc13cdb9a0a886c926a2cad27827c993e4fcf1dc88ac0390ca351f063db65c7b56e44ea2b79f5330b22fe23692c03a7d690bf77b SHA512 b02cab995700d82e3c100e24d8d4b1497030def568ad674085f3231750c69d42d8847c3a85cdfcbbaadb9c42fd0c44b36774abee4db131851e229ed076710588
-DIST rakudo-2022.06.tar.gz 6011585 BLAKE2B b1d7b46082b790e42e6c0491c1df7e3edc9b477105aeefee6e942226a69bc1ae7868227d03295fe33436419049e6dd1db7ffb5be005fa69e2e23b8df6a41a34d SHA512 e6dec83de464f87180057324bbbef5ac6487a70c101b6f5bc97a28dfe5c4fc782d39af376b08147d64b6336c4e239ebaf5a610cf49f36773fdb53960ebf7ef30
+DIST rakudo-2023.02.tar.gz 6692654 BLAKE2B 9a63e92d278235aac75fd15e2de90d2de55af2d92a650b8f0ccf61e12b41942ec47b8ecaf1f4e7bd9c55d98d09667f3ea916a79d9b3161fede264e47a3eecadc SHA512 bb631cb23e981d7bb269888d8302f95b5356a443abb93dc0ae8ca9a0e03b3da9b3ff0c03dabda405107498a36f589333001b81ebd971a0dc225f03406438f74e
diff --git a/dev-lang/rakudo/rakudo-2021.06.ebuild b/dev-lang/rakudo/rakudo-2021.06.ebuild
deleted file mode 100644
index 85295f02db25..000000000000
--- a/dev-lang/rakudo/rakudo-2021.06.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Raku programming language"
-HOMEPAGE="https://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7 )
-	>=dev-lang/perl-5.10"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo; then
-		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
-		ewarn "then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_configure() {
-	local backends
-	use moar && backends+="moar,"
-	use java && backends+="jvm"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}" || die
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2021.08.ebuild b/dev-lang/rakudo/rakudo-2021.08.ebuild
deleted file mode 100644
index 85295f02db25..000000000000
--- a/dev-lang/rakudo/rakudo-2021.08.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Raku programming language"
-HOMEPAGE="https://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7 )
-	>=dev-lang/perl-5.10"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo; then
-		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
-		ewarn "then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_configure() {
-	local backends
-	use moar && backends+="moar,"
-	use java && backends+="jvm"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}" || die
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2021.10.ebuild b/dev-lang/rakudo/rakudo-2021.10.ebuild
deleted file mode 100644
index 85295f02db25..000000000000
--- a/dev-lang/rakudo/rakudo-2021.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Raku programming language"
-HOMEPAGE="https://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7 )
-	>=dev-lang/perl-5.10"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo; then
-		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
-		ewarn "then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_configure() {
-	local backends
-	use moar && backends+="moar,"
-	use java && backends+="jvm"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}" || die
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2022.02.ebuild b/dev-lang/rakudo/rakudo-2022.02.ebuild
deleted file mode 100644
index 6ece484ee5ec..000000000000
--- a/dev-lang/rakudo/rakudo-2022.02.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Raku programming language"
-HOMEPAGE="https://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.9 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.9 )
-	>=dev-lang/perl-5.10"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo; then
-		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
-		ewarn "then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_configure() {
-	local backends
-	use moar && backends+="moar,"
-	use java && backends+="jvm"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}" || die
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2022.06.ebuild b/dev-lang/rakudo/rakudo-2022.06.ebuild
deleted file mode 100644
index 6ece484ee5ec..000000000000
--- a/dev-lang/rakudo/rakudo-2022.06.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Raku programming language"
-HOMEPAGE="https://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.9 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.9 )
-	>=dev-lang/perl-5.10"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo; then
-		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
-		ewarn "then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_configure() {
-	local backends
-	use moar && backends+="moar,"
-	use java && backends+="jvm"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}" || die
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2023.02.ebuild b/dev-lang/rakudo/rakudo-2023.02.ebuild
new file mode 100644
index 000000000000..a8a18519d240
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2023.02.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Raku programming language"
+HOMEPAGE="https://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.9 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.9 )
+	>=dev-lang/perl-5.10"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo; then
+		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_configure() {
+	local backends
+	use moar && backends+="moar,"
+	use java && backends+="jvm"
+
+	local myargs=(
+		"--prefix=/usr"
+		"--sysroot=/"
+		"--sdkroot=/"
+		"--backends=${backends}"
+	)
+
+	perl Configure.pl "${myargs[@]}" || die
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
+}
+
+src_compile() {
+	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild
new file mode 100644
index 000000000000..217681fdca9e
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.65.0-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+MY_P="rust-${PV}"
+# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2022-11-03/rust-src-${PV}.tar.xz"
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
+# Keep this separate to allow easy commenting out if not yet built
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+
+DEPEND=""
+
+RDEPEND="
+	>=app-eselect/eselect-rust-20190311
+	|| (
+		dev-libs/openssl-compat:1.1.1
+		<dev-libs/openssl-3
+	)
+	sys-apps/lsb-release
+"
+
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_src_unpack
+
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rustfmt && components="${components},rustfmt-preview"
+	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}" || die
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# make all capital underscored variable
+	local CARGO_TRIPLET="$(rust_abi)"
+	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
+	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild b/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
deleted file mode 100644
index a6d5802e3a9c..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-
-MY_P="rust-${PV}"
-# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
-MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2022-11-03/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="$(rust_all_arch_uris ${MY_P})
-	rust-src? ( ${MY_SRC_URI} )
-"
-# Keep this separate to allow easy commenting out if not yet built
-SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
-
-DEPEND=""
-
-RDEPEND="
-	>=app-eselect/eselect-rust-20190311
-	sys-apps/lsb-release
-"
-
-BDEPEND="
-	prefix? ( dev-util/patchelf )
-	verify-sig? ( sec-keys/openpgp-keys-rust )
-"
-
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-QA_PREBUILT="
-	opt/${P}/bin/.*
-	opt/${P}/lib/.*.so
-	opt/${P}/libexec/.*
-	opt/${P}/lib/rustlib/.*/bin/.*
-	opt/${P}/lib/rustlib/.*/lib/.*
-"
-
-# An rmeta file is custom binary format that contains the metadata for the crate.
-# rmeta files do not support linking, since they do not contain compiled object files.
-# so we can safely silence the warning for this QA check.
-QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	# sadly rust-src tarball does not have corresponding .asc file
-	# so do partial verification
-	if use verify-sig; then
-		for f in ${A}; do
-			if [[ -f ${DISTDIR}/${f}.asc ]]; then
-				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
-			fi
-		done
-	fi
-
-	default_src_unpack
-
-	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
-}
-
-patchelf_for_bin() {
-	local filetype=$(file -b ${1})
-	if [[ ${filetype} == *ELF*interpreter* ]]; then
-		einfo "${1}'s interpreter changed"
-		patchelf ${1} --set-interpreter ${2} || die
-	elif [[ ${filetype} == *script* ]]; then
-		hprefixify ${1}
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-
-	# start native abi install
-	pushd "${S}" >/dev/null || die
-	local analysis std
-	analysis="$(grep 'analysis' ./components)"
-	std="$(grep 'std' ./components)"
-	local components="rustc,cargo,${std}"
-	use doc && components="${components},rust-docs"
-	use clippy && components="${components},clippy-preview"
-	use rustfmt && components="${components},rustfmt-preview"
-	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
-	# Rust component 'rust-src' is extracted from separate archive
-	if use rust-src; then
-		einfo "Combining rust and rust-src installers"
-		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
-		echo rust-src >> ./components || die
-		components="${components},rust-src"
-	fi
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${ED}/opt/${P}" \
-		--mandir="${ED}/opt/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	if use prefix; then
-		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
-		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
-		find "${ED}/opt/${P}/bin" -type f -print0 | \
-			while IFS=  read -r -d '' filename; do
-				patchelf_for_bin ${filename} ${interpreter} \; || die
-			done
-		eend $?
-	fi
-
-	local symlinks=(
-		cargo
-		rustc
-		rustdoc
-		rust-gdb
-		rust-gdbgui
-		rust-lldb
-	)
-
-	use clippy && symlinks+=( clippy-driver cargo-clippy )
-	use rustfmt && symlinks+=( rustfmt cargo-fmt )
-	use rust-analyzer && symlinks+=( rust-analyzer )
-
-	einfo "installing eselect-rust symlinks and paths"
-	local i
-	for i in "${symlinks[@]}"; do
-		# we need realpath on /usr/bin/* symlink return version-appended binary path.
-		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
-		local ver_i="${i}-bin-${PV}"
-		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}" || die
-		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
-	done
-
-	# symlinks to switch components to active rust in eselect
-	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
-	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
-	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
-	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
-
-	# make all capital underscored variable
-	local CARGO_TRIPLET="$(rust_abi)"
-	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
-	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
-	cat <<-_EOF_ > "${T}/50${P}"
-	LDPATH="${EPREFIX}/usr/lib/rust/lib"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
-	_EOF_
-	doenvd "${T}/50${P}"
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-_EOF_ > "${T}/provider-${P}"
-	/usr/bin/cargo
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	/usr/bin/rust-gdbgui
-	/usr/bin/rust-lldb
-	/usr/lib/rustlib
-	/usr/lib/rust/lib
-	/usr/lib/rust/man
-	/usr/share/doc/rust
-	_EOF_
-
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	if use rust-analyzer; then
-		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-	popd >/dev/null || die
-	#end native abi install
-
-	else
-		local rust_target
-		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
-		dodir "/opt/${P}/lib/rustlib"
-		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
-			"${ED}/opt/${P}/lib/rustlib" || die
-	fi
-
-	# BUG: installs x86_64 binary on other arches
-	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild
new file mode 100644
index 000000000000..4c965e1f5dd4
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.66.1-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+MY_P="rust-${PV}"
+# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-01-10/rust-src-${PV}.tar.xz"
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
+# Keep this separate to allow easy commenting out if not yet built
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+
+DEPEND=""
+
+RDEPEND="
+	>=app-eselect/eselect-rust-20190311
+	|| (
+		dev-libs/openssl-compat:1.1.1
+		<dev-libs/openssl-3
+	)
+	sys-apps/lsb-release
+"
+
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_src_unpack
+
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rustfmt && components="${components},rustfmt-preview"
+	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}" || die
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# make all capital underscored variable
+	local CARGO_TRIPLET="$(rust_abi)"
+	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
+	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.66.1.ebuild b/dev-lang/rust-bin/rust-bin-1.66.1.ebuild
deleted file mode 100644
index a6a9eceb56be..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.66.1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-
-MY_P="rust-${PV}"
-# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
-MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-01-10/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="$(rust_all_arch_uris ${MY_P})
-	rust-src? ( ${MY_SRC_URI} )
-"
-# Keep this separate to allow easy commenting out if not yet built
-SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
-
-DEPEND=""
-
-RDEPEND="
-	>=app-eselect/eselect-rust-20190311
-	sys-apps/lsb-release
-"
-
-BDEPEND="
-	prefix? ( dev-util/patchelf )
-	verify-sig? ( sec-keys/openpgp-keys-rust )
-"
-
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-QA_PREBUILT="
-	opt/${P}/bin/.*
-	opt/${P}/lib/.*.so
-	opt/${P}/libexec/.*
-	opt/${P}/lib/rustlib/.*/bin/.*
-	opt/${P}/lib/rustlib/.*/lib/.*
-"
-
-# An rmeta file is custom binary format that contains the metadata for the crate.
-# rmeta files do not support linking, since they do not contain compiled object files.
-# so we can safely silence the warning for this QA check.
-QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	# sadly rust-src tarball does not have corresponding .asc file
-	# so do partial verification
-	if use verify-sig; then
-		for f in ${A}; do
-			if [[ -f ${DISTDIR}/${f}.asc ]]; then
-				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
-			fi
-		done
-	fi
-
-	default_src_unpack
-
-	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
-}
-
-patchelf_for_bin() {
-	local filetype=$(file -b ${1})
-	if [[ ${filetype} == *ELF*interpreter* ]]; then
-		einfo "${1}'s interpreter changed"
-		patchelf ${1} --set-interpreter ${2} || die
-	elif [[ ${filetype} == *script* ]]; then
-		hprefixify ${1}
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-
-	# start native abi install
-	pushd "${S}" >/dev/null || die
-	local analysis std
-	analysis="$(grep 'analysis' ./components)"
-	std="$(grep 'std' ./components)"
-	local components="rustc,cargo,${std}"
-	use doc && components="${components},rust-docs"
-	use clippy && components="${components},clippy-preview"
-	use rustfmt && components="${components},rustfmt-preview"
-	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
-	# Rust component 'rust-src' is extracted from separate archive
-	if use rust-src; then
-		einfo "Combining rust and rust-src installers"
-		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
-		echo rust-src >> ./components || die
-		components="${components},rust-src"
-	fi
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${ED}/opt/${P}" \
-		--mandir="${ED}/opt/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	if use prefix; then
-		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
-		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
-		find "${ED}/opt/${P}/bin" -type f -print0 | \
-			while IFS=  read -r -d '' filename; do
-				patchelf_for_bin ${filename} ${interpreter} \; || die
-			done
-		eend $?
-	fi
-
-	local symlinks=(
-		cargo
-		rustc
-		rustdoc
-		rust-gdb
-		rust-gdbgui
-		rust-lldb
-	)
-
-	use clippy && symlinks+=( clippy-driver cargo-clippy )
-	use rustfmt && symlinks+=( rustfmt cargo-fmt )
-	use rust-analyzer && symlinks+=( rust-analyzer )
-
-	einfo "installing eselect-rust symlinks and paths"
-	local i
-	for i in "${symlinks[@]}"; do
-		# we need realpath on /usr/bin/* symlink return version-appended binary path.
-		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
-		local ver_i="${i}-bin-${PV}"
-		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}" || die
-		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
-	done
-
-	# symlinks to switch components to active rust in eselect
-	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
-	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
-	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
-	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
-
-	# make all capital underscored variable
-	local CARGO_TRIPLET="$(rust_abi)"
-	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
-	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
-	cat <<-_EOF_ > "${T}/50${P}"
-	LDPATH="${EPREFIX}/usr/lib/rust/lib"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
-	_EOF_
-	doenvd "${T}/50${P}"
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-_EOF_ > "${T}/provider-${P}"
-	/usr/bin/cargo
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	/usr/bin/rust-gdbgui
-	/usr/bin/rust-lldb
-	/usr/lib/rustlib
-	/usr/lib/rust/lib
-	/usr/lib/rust/man
-	/usr/share/doc/rust
-	_EOF_
-
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	if use rust-analyzer; then
-		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-	popd >/dev/null || die
-	#end native abi install
-
-	else
-		local rust_target
-		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
-		dodir "/opt/${P}/lib/rustlib"
-		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
-			"${ED}/opt/${P}/lib/rustlib" || die
-	fi
-
-	# BUG: installs x86_64 binary on other arches
-	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust-bin/rust-bin-1.67.1-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.67.1-r1.ebuild
new file mode 100644
index 000000000000..ad7fd7020f34
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.67.1-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+MY_P="rust-${PV}"
+# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-02-09/rust-src-${PV}.tar.xz"
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
+# Keep this separate to allow easy commenting out if not yet built
+#SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+
+DEPEND=""
+
+RDEPEND="
+	>=app-eselect/eselect-rust-20190311
+	|| (
+		dev-libs/openssl-compat:1.1.1
+		<dev-libs/openssl-3
+	)
+	sys-apps/lsb-release
+"
+
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_src_unpack
+
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rustfmt && components="${components},rustfmt-preview"
+	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}" || die
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# make all capital underscored variable
+	local CARGO_TRIPLET="$(rust_abi)"
+	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
+	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.67.1.ebuild b/dev-lang/rust-bin/rust-bin-1.67.1.ebuild
deleted file mode 100644
index d9998776c583..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.67.1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-
-MY_P="rust-${PV}"
-# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
-MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-02-09/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="$(rust_all_arch_uris ${MY_P})
-	rust-src? ( ${MY_SRC_URI} )
-"
-# Keep this separate to allow easy commenting out if not yet built
-#SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
-
-DEPEND=""
-
-RDEPEND="
-	>=app-eselect/eselect-rust-20190311
-	sys-apps/lsb-release
-"
-
-BDEPEND="
-	prefix? ( dev-util/patchelf )
-	verify-sig? ( sec-keys/openpgp-keys-rust )
-"
-
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
-
-QA_PREBUILT="
-	opt/${P}/bin/.*
-	opt/${P}/lib/.*.so
-	opt/${P}/libexec/.*
-	opt/${P}/lib/rustlib/.*/bin/.*
-	opt/${P}/lib/rustlib/.*/lib/.*
-"
-
-# An rmeta file is custom binary format that contains the metadata for the crate.
-# rmeta files do not support linking, since they do not contain compiled object files.
-# so we can safely silence the warning for this QA check.
-QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
-src_unpack() {
-	# sadly rust-src tarball does not have corresponding .asc file
-	# so do partial verification
-	if use verify-sig; then
-		for f in ${A}; do
-			if [[ -f ${DISTDIR}/${f}.asc ]]; then
-				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
-			fi
-		done
-	fi
-
-	default_src_unpack
-
-	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
-}
-
-patchelf_for_bin() {
-	local filetype=$(file -b ${1})
-	if [[ ${filetype} == *ELF*interpreter* ]]; then
-		einfo "${1}'s interpreter changed"
-		patchelf ${1} --set-interpreter ${2} || die
-	elif [[ ${filetype} == *script* ]]; then
-		hprefixify ${1}
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-
-	# start native abi install
-	pushd "${S}" >/dev/null || die
-	local analysis std
-	analysis="$(grep 'analysis' ./components)"
-	std="$(grep 'std' ./components)"
-	local components="rustc,cargo,${std}"
-	use doc && components="${components},rust-docs"
-	use clippy && components="${components},clippy-preview"
-	use rustfmt && components="${components},rustfmt-preview"
-	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
-	# Rust component 'rust-src' is extracted from separate archive
-	if use rust-src; then
-		einfo "Combining rust and rust-src installers"
-		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
-		echo rust-src >> ./components || die
-		components="${components},rust-src"
-	fi
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${ED}/opt/${P}" \
-		--mandir="${ED}/opt/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	if use prefix; then
-		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
-		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
-		find "${ED}/opt/${P}/bin" -type f -print0 | \
-			while IFS=  read -r -d '' filename; do
-				patchelf_for_bin ${filename} ${interpreter} \; || die
-			done
-		eend $?
-	fi
-
-	local symlinks=(
-		cargo
-		rustc
-		rustdoc
-		rust-gdb
-		rust-gdbgui
-		rust-lldb
-	)
-
-	use clippy && symlinks+=( clippy-driver cargo-clippy )
-	use rustfmt && symlinks+=( rustfmt cargo-fmt )
-	use rust-analyzer && symlinks+=( rust-analyzer )
-
-	einfo "installing eselect-rust symlinks and paths"
-	local i
-	for i in "${symlinks[@]}"; do
-		# we need realpath on /usr/bin/* symlink return version-appended binary path.
-		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
-		local ver_i="${i}-bin-${PV}"
-		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}" || die
-		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
-	done
-
-	# symlinks to switch components to active rust in eselect
-	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
-	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
-	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
-	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
-
-	# make all capital underscored variable
-	local CARGO_TRIPLET="$(rust_abi)"
-	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
-	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
-	cat <<-_EOF_ > "${T}/50${P}"
-	LDPATH="${EPREFIX}/usr/lib/rust/lib"
-	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
-	_EOF_
-	doenvd "${T}/50${P}"
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-_EOF_ > "${T}/provider-${P}"
-	/usr/bin/cargo
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	/usr/bin/rust-gdbgui
-	/usr/bin/rust-lldb
-	/usr/lib/rustlib
-	/usr/lib/rust/lib
-	/usr/lib/rust/man
-	/usr/share/doc/rust
-	_EOF_
-
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-	if use rust-analyzer; then
-		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-	popd >/dev/null || die
-	#end native abi install
-
-	else
-		local rust_target
-		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
-		dodir "/opt/${P}/lib/rustlib"
-		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
-			"${ED}/opt/${P}/lib/rustlib" || die
-	fi
-
-	# BUG: installs x86_64 binary on other arches
-	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
-}
-
-pkg_postinst() {
-	eselect rust update
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.66.1.ebuild b/dev-lang/rust/rust-1.66.1.ebuild
index 36d20978228c..85a895e94dc2 100644
--- a/dev-lang/rust/rust-1.66.1.ebuild
+++ b/dev-lang/rust/rust-1.66.1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c32109e8c685..1db532294a25 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/ayatana-ido/Manifest b/dev-libs/ayatana-ido/Manifest
index e738118b3beb..47a7e1f4a636 100644
--- a/dev-libs/ayatana-ido/Manifest
+++ b/dev-libs/ayatana-ido/Manifest
@@ -1 +1,2 @@
 DIST ayatana-ido-0.9.2.tar.gz 122286 BLAKE2B f6498591d72fa6deb5d9c8d87ddad399e41b3701719e45fe82dc8d5bd6ede30bb754561fdeaa938713692a90b8c48657ea2cb472c762acab6c3f36c73907b92e SHA512 efc5825d32d707b02397692c347f99f3bca13da2cd653b6ce87882643c85c2698bdac6168e89a01ed98d5ee58c88a820d89dad7b88a5aee235b450c40969d0a7
+DIST ayatana-ido-0.9.3.tar.gz 122912 BLAKE2B 80c07c6f90b7e2b6d68c2629990918f091abdc85616cbf472dbcc1bbea87dabb9649d8da4d676f1acbc65c34e5a5b53143449759a0d65661352898199c1ea592 SHA512 61c9fe35be9dceabba3d61add0fa51cf0447572dbedf48f710b79cf9c4fed2a049f6d2c0069ae8499aa41f008e736e257da47c6b07fd4e20778689c9ab6853d4
diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild
new file mode 100644
index 000000000000..055837810486
--- /dev/null
+++ b/dev-libs/ayatana-ido/ayatana-ido-0.9.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake vala virtualx
+
+DESCRIPTION="Ayatana Application Indicators (Shared Library)"
+HOMEPAGE="https://github.com/AyatanaIndicators/ayatana-ido"
+SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3 GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3.24:3[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	vala_setup
+}
+
+src_configure() {
+	local mycmakeargs+=(
+		-DVALA_COMPILER="${VALAC}"
+		-DVAPI_GEN="${VAPIGEN}"
+		-DENABLE_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/dev-libs/cdk/cdk-5.0.20221025.ebuild b/dev-libs/cdk/cdk-5.0.20221025.ebuild
index b8a632dbb579..92d3877e392f 100644
--- a/dev-libs/cdk/cdk-5.0.20221025.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20221025.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-libs/confuse/confuse-3.3-r1.ebuild b/dev-libs/confuse/confuse-3.3-r1.ebuild
index 3de10b11c178..5dd2ceb67ec1 100644
--- a/dev-libs/confuse/confuse-3.3-r1.ebuild
+++ b/dev-libs/confuse/confuse-3.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild b/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild
index a5fb5914d365..580736e93e7d 100644
--- a/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild
+++ b/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cutlass/Manifest b/dev-libs/cutlass/Manifest
new file mode 100644
index 000000000000..5912c749cc75
--- /dev/null
+++ b/dev-libs/cutlass/Manifest
@@ -0,0 +1 @@
+DIST cutlass-2.10.0.tar.gz 15241458 BLAKE2B 66779759ac1c7ebcb860bb9b925a236b45959f5ee3bf4e1f95ffd05a98200dcf2eb4fe2907c02e44143d3f51eca1e2a4ebd890e0edab7fd5378684819123f197 SHA512 4310f8da2931815a63a5e9a69c6c073f95148efecbea7026afcd90965dbd2e1921db52b0ac2a06cda64e20bbaa44112ae1fb7c3b557c41416d99dac33d000aa7
diff --git a/dev-libs/cutlass/cutlass-2.10.0.ebuild b/dev-libs/cutlass/cutlass-2.10.0.ebuild
new file mode 100644
index 000000000000..a7b1d9da92e3
--- /dev/null
+++ b/dev-libs/cutlass/cutlass-2.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cuda cmake
+
+DESCRIPTION="CUDA Templates for Linear Algebra Subroutines"
+HOMEPAGE="https://github.com/NVIDIA/cutlass"
+SRC_URI="https://github.com/NVIDIA/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/nvidia-cuda-toolkit"
+
+src_configure() {
+	mycmakeargs+=(
+		-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		-DCUTLASS_ENABLE_HEADERS_ONLY=yes
+		-DCUTLASS_ENABLE_TESTS=no
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -r "${D}"/usr/test || die
+}
diff --git a/dev-libs/cutlass/metadata.xml b/dev-libs/cutlass/metadata.xml
new file mode 100644
index 000000000000..851323cabae4
--- /dev/null
+++ b/dev-libs/cutlass/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytorch/pytorch</remote-id>
+		<remote-id type="github">NVIDIA/cutlass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
index 34d42c4677bb..55f108b37fa3 100644
--- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -55,3 +55,11 @@ src_configure() {
 src_test() {
 	"${BUILD_DIR}"/bin/unit-hyperscan || die
 }
+
+pkg_postinst() {
+	if has_version 'mail-filter/rspamd'; then
+		elog "There is known issue with mail-filter/rspamd when hyperscan version changes."
+		elog "Known workaround is to remove hyperscan databases ${EROOT}/var/lib/rspamd/*.hs*"
+		elog "See https://github.com/rspamd/rspamd/issues/4409 for more information."
+	fi
+}
diff --git a/dev-libs/hyperscan/hyperscan-5.4.1.ebuild b/dev-libs/hyperscan/hyperscan-5.4.1.ebuild
index 4377ae025213..2984a1ad61f2 100644
--- a/dev-libs/hyperscan/hyperscan-5.4.1.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.4.1.ebuild
@@ -55,3 +55,11 @@ src_configure() {
 src_test() {
 	"${BUILD_DIR}"/bin/unit-hyperscan || die
 }
+
+pkg_postinst() {
+	if has_version 'mail-filter/rspamd'; then
+		elog "There is known issue with mail-filter/rspamd when hyperscan version changes."
+		elog "Known workaround is to remove hyperscan databases ${EROOT}/var/lib/rspamd/*.hs*"
+		elog "See https://github.com/rspamd/rspamd/issues/4409 for more information."
+	fi
+}
diff --git a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild
index a45897531452..526250a3ec88 100644
--- a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild
+++ b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3 LGPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
index 7acb92415ab8..045dad6eb366 100644
--- a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
+++ b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
index 6ec3a448aa64..3ce0bcb4bbd5 100644
--- a/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-libs/libclc/libclc-16.0.0_rc2.ebuild b/dev-libs/libclc/libclc-16.0.0_rc2.ebuild
deleted file mode 100644
index c424e4a83842..000000000000
--- a/dev-libs/libclc/libclc-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=16
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230211.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 93cce600989e..000000000000
--- a/dev-libs/libclc/libclc-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=17
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:17
-			spirv? ( dev-util/spirv-llvm-translator:17 )
-		)
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230218.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 93cce600989e..000000000000
--- a/dev-libs/libclc/libclc-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=17
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:17
-			spirv? ( dev-util/spirv-llvm-translator:17 )
-		)
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 9331788b5a71..b26d2d18f306 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1 +1,3 @@
 DIST libgit2-1.5.1.tar.gz 5895483 BLAKE2B 4df80216523f4065e46c1ce99fd0747d2f8516571691c8c2b5638e32c805f5ce08d3add769e6d5ce29ac69b35419db82ce56c6b3019e70573c4ad63aca2e440d SHA512 04cf389e30cd9fb787704e3c8997acaaeea5c13e1e2f9eaf9f5598d35c2e85f3cf04b47312cae9e7278236ecb089c2d33addd852e38d3c7d2daa87929b077f39
+DIST libgit2-1.5.2.tar.gz 5896845 BLAKE2B b89c48c953d8804c1ea1997e0c81f45aeb66f87a7cad100069dc3a8364e0658f6d6e41e49adf123cc950b2da46f805aa05f07af234990f62aa78d38d5e8e78d5 SHA512 0de5e82953482bf57e9cd221406581a12c6acfbeeea0cebbb9b701d288804ec085b7c0902ba1f04ad7cdaaead9d472be21ffe8d730050db5c77101a93448fb3a
+DIST libgit2-1.6.2.tar.gz 6666383 BLAKE2B 7a42d8440fbe0afa24057bf53d52bcb04b4e8654f71cfa55871a7e77a150297731879d8f5be51df61ad91556656b66b102536a508cf61d9c11e8658e841fc560 SHA512 ef9feef36c5876776f3aa608101115c9e7a0970e6dd752851d930cb85b4b1789ed68f42700ebea51095ff54600e37c18a4de0c0678d9a4d7d4aba83668890c09
diff --git a/dev-libs/libgit2/libgit2-1.5.2.ebuild b/dev-libs/libgit2/libgit2-1.5.2.ebuild
new file mode 100644
index 000000000000..2769e48033fe
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.5.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' \
+		tests/libgit2/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-1.6.2.ebuild b/dev-libs/libgit2/libgit2-1.6.2.ebuild
new file mode 100644
index 000000000000..fd4006780f80
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.6.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libiconv/libiconv-1.17.ebuild b/dev-libs/libiconv/libiconv-1.17.ebuild
index db5e609fb051..f64903baf519 100644
--- a/dev-libs/libiconv/libiconv-1.17.ebuild
+++ b/dev-libs/libiconv/libiconv-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild
index bf61c562db4c..c814279a5917 100644
--- a/dev-libs/libintl/libintl-0.21.1.ebuild
+++ b/dev-libs/libintl/libintl-0.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with sys-devel/gettext.
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
index e07eb4d29c0b..afe0ceeb6565 100644
--- a/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
+++ b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc pcsc-lite readline usb"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild b/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
index bb555485c7bb..000ffa82856f 100644
--- a/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,11} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 727656884577..53b0600bb160 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/boost:=[zlib(+)]
 	sys-libs/zlib
 	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( dev-libs/libixion:0/0.17 )
+	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
 "
 DEPEND="${RDEPEND}
 	dev-util/mdds:${MDDS_SLOT}
diff --git a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
index 729736138444..d66e76e13da1 100644
--- a/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
+++ b/dev-libs/libserialport/libserialport-0.1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit autotools
 
diff --git a/dev-libs/libserialport/libserialport-9999.ebuild b/dev-libs/libserialport/libserialport-9999.ebuild
index 13181d0099a0..e1d11628901a 100644
--- a/dev-libs/libserialport/libserialport-9999.ebuild
+++ b/dev-libs/libserialport/libserialport-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest
index 34b0177a746b..b820d7489d78 100644
--- a/dev-libs/libxlsxwriter/Manifest
+++ b/dev-libs/libxlsxwriter/Manifest
@@ -1 +1,2 @@
 DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
+DIST libxlsxwriter-1.1.5.tar.gz 21541446 BLAKE2B f9e2fde83bde852b4568b8ce82a28ad75e6e8d1ca6f3683ac2308d28707e7e4874facf8eac2ce9b4b9fdcc96d8b775dd69eefb2f976f564323a278a3dad032d0 SHA512 bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.5.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.5.ebuild
new file mode 100644
index 000000000000..241cd4e4d6be
--- /dev/null
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake plocale
+
+DESCRIPTION="C library for creating Excel XLSX files"
+HOMEPAGE="https://libxlsxwriter.github.io/ https://github.com/jmcnamara/libxlsxwriter"
+SRC_URI="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-RELEASE_${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="openssl"
+
+DEPEND="
+	sys-libs/zlib[minizip]
+	openssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	DOUBLEFUNCTION=OFF
+	for x in $(plocale_get_locales); do
+		if ! [[ "${x}" =~ ^en* ]]; then
+			#non-english locale detected; apply double function fix
+			DOUBLEFUNCTION=ON
+			break
+		fi
+	done
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DUSE_OPENSSL_MD5="$(usex openssl)"
+		-DUSE_SYSTEM_MINIZIP="ON"
+		-DUSE_DTOA_LIBRARY=${DOUBLEFUNCTION}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CONTRIBUTING.md License.txt Readme.md Changes.txt
+	dodoc -r docs examples
+}
diff --git a/dev-libs/openssl/openssl-1.1.1t-r1.ebuild b/dev-libs/openssl/openssl-1.1.1t-r1.ebuild
index 7261dbf43506..a724839c80c5 100644
--- a/dev-libs/openssl/openssl-1.1.1t-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1t-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/openssl-3.0.8.ebuild b/dev-libs/openssl/openssl-3.0.8.ebuild
index 37799cd36092..a5c46e57fff2 100644
--- a/dev-libs/openssl/openssl-3.0.8.ebuild
+++ b/dev-libs/openssl/openssl-3.0.8.ebuild
@@ -103,7 +103,6 @@ src_prepare() {
 	# that gets blown away anyways by the Configure script in src_configure
 	rm -f Makefile
 
-
 	if ! use vanilla ; then
 		PATCHES+=(
 			# Add patches which are Gentoo-specific customisations here
diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
index 8e9fc23e3d86..473aa1f2fa62 100644
--- a/dev-libs/pocl/pocl-3.1.ebuild
+++ b/dev-libs/pocl/pocl-3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 # TODO: hsa tce
 IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
 # Tests not yet passing, fragile in Portage environment(?)
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest
index 6721b93b6c47..fe1303dabde0 100644
--- a/dev-libs/qxlsx/Manifest
+++ b/dev-libs/qxlsx/Manifest
@@ -1,2 +1 @@
-DIST qxlsx-1.4.4.tar.gz 4703732 BLAKE2B 0acf5e708f4dc981723a34b524c820a53a66cb13bf1ce5a1086106230e45dcac2ea6587b3c4ca039de491565ac886a2e5bd1225ee39437ee89a2ff7560da6fd7 SHA512 e6c3dd8822f2a8ab8bcd1a7434db7b202291e3d8de407e4629bdfc1afef507b57da4bc4a715d57b8d75915ce4b623189269083824c35d8e02d49d3e8909cceee
 DIST qxlsx-1.4.5.tar.gz 4705008 BLAKE2B dd853a20109c9d9dcd5757bbb436e620191eb1fb95c441b1ce3a119bd99397f6206da37b6d770c84e8717c75ce9ad1da4b82397030da02c49a092d958ebef261 SHA512 5ec63c210b12c037acd9f3cc4d351b9bd488add65872a27cca536117349ac2c2501649cb7c2f35e1ee95289e98bf9e9fea6554aef1379deafb50c5016ed21fe5
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch
deleted file mode 100644
index ffdf8483f41a..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5d1059941f85365019ed08254e79abdb4ba80ee5 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sun, 4 Sep 2022 01:22:30 +0100
-Subject: [PATCH] Install library to the correct lib dir
-
----
- QXlsx/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index a6b1944..fc32918 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,9 +181,9 @@ set_target_properties(QXlsx PROPERTIES
- 
- install(TARGETS QXlsx
-     EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    RUNTIME DESTINATION bin COMPONENT runtime
--    ARCHIVE DESTINATION lib COMPONENT devel
--    PUBLIC_HEADER DESTINATION include/QXlsx COMPONENT devel
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel
- )
- 
- install(EXPORT QXlsxTargets
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch
deleted file mode 100644
index 15795c645d47..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8e83402db866ae7a67582da28aa68c83545f13c8 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Fri, 26 Aug 2022 01:36:53 +0100
-Subject: [PATCH] Don't force Qt definitions onto users
-
-It breaks users who use "signals" keyword and convert const char* to
-QString.
----
- QXlsx/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index aa774b1..a6b1944 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -140,7 +140,7 @@ add_library(QXlsx
- 
- add_library(QXlsx::QXlsx ALIAS QXlsx)
- 
--target_compile_definitions(QXlsx PUBLIC
-+target_compile_definitions(QXlsx PRIVATE
-     -DQT_NO_KEYWORDS
-     -DQT_NO_CAST_TO_ASCII
-     -DQT_NO_CAST_FROM_ASCII
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch
deleted file mode 100644
index f94aa6e46414..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-commit e3565f2b3999ead739066b33fa0fd346eb072d87
-Author: Alexey Sokolov <sokolov@google.com>
-Date:   Sun Oct 2 22:46:03 2022 +0100
-
-    Support installing qt5 and qt6 versions in parallel
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index 5640d8a..8d34020 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,8 +15,8 @@ include(GNUInstallDirs)
- 
--find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
- find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
-+set(EXPORT_NAME QXlsxQt${QT_VERSION_MAJOR})
- 
--if (QT_MAJOR_VERSION EQUAL 6)
-+if (QT_VERSION_MAJOR EQUAL 6)
-     set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
- else()
-     set(CMAKE_CXX_STANDARD 11 CACHE STRING "")
-@@ -166,7 +167,7 @@ if (BUILD_SHARED_LIBS)
-     target_compile_definitions(QXlsx PUBLIC QXlsx_SHAREDLIB)
- endif()
- 
--target_link_libraries(${PROJECT_NAME}
-+target_link_libraries(QXlsx
-    Qt${QT_VERSION_MAJOR}::Core
-    Qt${QT_VERSION_MAJOR}::GuiPrivate
- )
-@@ -180,39 +181,38 @@ PUBLIC
- )
- 
- set_target_properties(QXlsx PROPERTIES
--    EXPORT_NAME QXlsx
-+    OUTPUT_NAME ${EXPORT_NAME}
-     VERSION ${PROJECT_VERSION}
-     SOVERSION 0.${PROJECT_VERSION}
-     PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}"
- )
- 
- install(TARGETS QXlsx
--    EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    EXPORT ${EXPORT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
-     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel
- )
- 
--install(EXPORT QXlsxTargets
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/
--    FILE QXlsxTargets.cmake
-+install(EXPORT ${EXPORT_NAME}Targets
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/
-+    FILE ${EXPORT_NAME}Targets.cmake
-     NAMESPACE QXlsx::
-     COMPONENT devel
- )
- 
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config.cmake.in
--    ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake
-+    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake
-     @ONLY
- )
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config-version.cmake.in
--    ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake
-+    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake
-     @ONLY
- )
- install(
-     FILES
--        ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake
--        ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/
-+        ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake
-+        ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/
- )
--
- include(CPackConfig)
-diff --git a/QXlsx/cmake/modules/qxlsx-config.cmake.in b/QXlsx/cmake/modules/qxlsx-config.cmake.in
-index 1aab813..d72276b 100644
---- a/cmake/modules/qxlsx-config.cmake.in
-+++ b/cmake/modules/qxlsx-config.cmake.in
-@@ -10,5 +10,5 @@
- SET(prefix "@CMAKE_INSTALL_PREFIX@")
- SET(exec_prefix "@CMAKE_INSTALL_PREFIX@")
- SET(QXlsx_FOUND "TRUE")
--    
--include("${CMAKE_CURRENT_LIST_DIR}/QXlsxTargets.cmake")
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/@EXPORT_NAME@Targets.cmake")
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch
deleted file mode 100644
index eff465497930..000000000000
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 647acc3c4d431278f3d2867a41a06d57f1978e63 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sat, 8 Oct 2022 23:47:23 +0100
-Subject: [PATCH] Set soversion to version
-
-Since there's no ABI guarantees, as mentioned in #243
----
- QXlsx/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
-index 8ddfd20..5640d8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -182,7 +182,7 @@ PUBLIC
- set_target_properties(QXlsx PROPERTIES
-     EXPORT_NAME QXlsx
-     VERSION ${PROJECT_VERSION}
--    SOVERSION 0
-+    SOVERSION 0.${PROJECT_VERSION}
-     PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}"
- )
- 
diff --git a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
deleted file mode 100644
index b68ab4c3e582..000000000000
--- a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multibuild cmake
-
-DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt"
-
-HOMEPAGE="https://github.com/QtExcel/QXlsx"
-SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-# soversion
-SLOT="0/0.${PV}"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-
-IUSE="qt5 qt6"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5=
-	)
-	qt6? (
-		dev-qt/qtbase:6=[gui]
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/QXlsx-${PV}/QXlsx"
-PATCHES=(
-	"${FILESDIR}/${P}-libdir.patch"
-	"${FILESDIR}/${P}-qtdefs.patch"
-	"${FILESDIR}/${P}-soversion.patch"
-	"${FILESDIR}/${P}-qtversion.patch"
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_configure() {
-	my_src_configure() {
-		local mycmakeargs=(
-			-DQT_VERSION_MAJOR="${MULTIBUILD_VARIANT/qt/}"
-		)
-
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/qxlsx/qxlsx-1.4.5.ebuild b/dev-libs/qxlsx/qxlsx-1.4.5.ebuild
index dd1bcb508c2a..c2013cfde008 100644
--- a/dev-libs/qxlsx/qxlsx-1.4.5.ebuild
+++ b/dev-libs/qxlsx/qxlsx-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 # soversion
 SLOT="0/0.1.4.4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/dev-libs/xxhash/xxhash-0.8.1.ebuild b/dev-libs/xxhash/xxhash-0.8.1.ebuild
index e013ac9db7fc..4d0291f43540 100644
--- a/dev-libs/xxhash/xxhash-0.8.1.ebuild
+++ b/dev-libs/xxhash/xxhash-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 12ad721a3e1e..938b1b877c05 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/cppo/cppo-1.6.7-r1.ebuild b/dev-ml/cppo/cppo-1.6.7-r1.ebuild
new file mode 100644
index 000000000000..1753b6f23aba
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.7-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild:=
+	dev-ml/findlib:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/cppo-1.6.7.ebuild b/dev-ml/cppo/cppo-1.6.7.ebuild
deleted file mode 100644
index 921cf3dc2a25..000000000000
--- a/dev-ml/cppo/cppo-1.6.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
-HOMEPAGE="https://github.com/ocaml-community/cppo/"
-SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-ml/ocamlbuild
-	dev-ml/findlib:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/cppo-1.6.8-r1.ebuild b/dev-ml/cppo/cppo-1.6.8-r1.ebuild
new file mode 100644
index 000000000000..66030d3bfc18
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.8-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild:=
+	dev-ml/findlib:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/cppo-1.6.8.ebuild b/dev-ml/cppo/cppo-1.6.8.ebuild
deleted file mode 100644
index d5be2914fca3..000000000000
--- a/dev-ml/cppo/cppo-1.6.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
-HOMEPAGE="https://github.com/ocaml-community/cppo/"
-SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-ml/ocamlbuild
-	dev-ml/findlib:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/cppo-1.6.9-r1.ebuild b/dev-ml/cppo/cppo-1.6.9-r1.ebuild
new file mode 100644
index 000000000000..66030d3bfc18
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.9-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild:=
+	dev-ml/findlib:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/cppo-1.6.9.ebuild b/dev-ml/cppo/cppo-1.6.9.ebuild
deleted file mode 100644
index d5be2914fca3..000000000000
--- a/dev-ml/cppo/cppo-1.6.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
-HOMEPAGE="https://github.com/ocaml-community/cppo/"
-SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-ml/ocamlbuild
-	dev-ml/findlib:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest
index 1edd22192bcd..747bfa07b0b5 100644
--- a/dev-ml/dune-build-info/Manifest
+++ b/dev-ml/dune-build-info/Manifest
@@ -2,3 +2,4 @@ DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/dune-build-info/dune-build-info-3.7.0.ebuild b/dev-ml/dune-build-info/dune-build-info-3.7.0.ebuild
new file mode 100644
index 000000000000..2b60d3970e73
--- /dev/null
+++ b/dev-ml/dune-build-info/dune-build-info-3.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Embed locations informations inside executable and libraries"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND=">=dev-ml/dune-3.5"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p ${PN} @install --display short -j $(makeopts_jobs) || die
+}
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 9b9b1dec2dfc..fcf3b0b2b802 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -4,3 +4,4 @@ DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7
 DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/dune-configurator/dune-configurator-3.7.0.ebuild b/dev-ml/dune-configurator/dune-configurator-3.7.0.ebuild
new file mode 100644
index 000000000000..2ef2249b6a21
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-3.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Helper library for gathering system configuration"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# This enables dune-configurator to use the vendored csexp module
+	sed -i 's/stdune.csexp/dune-configurator.csexp/' \
+		vendor/csexp/src/dune || die
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 0e12f2ba6bb6..127f73fa0223 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -5,3 +5,4 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild
new file mode 100644
index 000000000000..797e233bbac6
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Private libraries of Dune"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/stdune-${PV}:=[ocamlopt?]
+	>=dev-lang/ocaml-4.08
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest
index d8a4d3dad048..4ed3f145dc88 100644
--- a/dev-ml/dune-site/Manifest
+++ b/dev-ml/dune-site/Manifest
@@ -4,3 +4,4 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/dune-site/dune-site-3.7.0.ebuild b/dev-ml/dune-site/dune-site-3.7.0.ebuild
new file mode 100644
index 000000000000..86c18b3cac7e
--- /dev/null
+++ b/dev-ml/dune-site/dune-site-3.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Embed locations informations inside executable and libraries"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p ${PN} @install -j $(makeopts_jobs) --display short || die
+}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index bcdac14640a2..02ad5e463049 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -7,3 +7,4 @@ DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7
 DIST dune-3.5.0.tar.gz 1801260 BLAKE2B 684c6540c3f5e9356e12f1b483b1adbf9f4a44bb24fdd8b79bc5d48efab05b479cef0c9449adb84e3e30be81f07913460073928d5e91647096fc02608f8e9709 SHA512 f1a94d867e1b82502aed3f7ae16adb48bd1f773c0045c3313303f29b70ec99bed4264d420c85fe7c4be2343ac970586d77705f6083049c6bec860b543fbd3c3c
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/dune/dune-3.7.0.ebuild b/dev-ml/dune/dune-3.7.0.ebuild
new file mode 100644
index 000000000000..4055f5de2e82
--- /dev/null
+++ b/dev-ml/dune/dune-3.7.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing elisp-common
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="emacs"
+RESTRICT="strip test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/dune"
+
+BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# This allows `dune --version` to output the correct version
+	# instead of "n/a"
+	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
+}
+
+src_configure() {
+	./configure \
+		--libdir="$(ocamlc -where)" \
+		--mandir=/usr/share/man \
+		--docdir=/usr/doc \
+		--etcdir=/etc \
+		--datadir=/usr/share \
+		--sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		|| die
+}
+
+src_compile() {
+	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
+	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
+		-j $(makeopts_jobs) --display short || die
+
+	use emacs && elisp-compile editor-integration/emacs/*.el
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/doc
+	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/doc || die
+
+	if use emacs ; then
+		elisp-install ${PN} editor-integration/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
diff --git a/dev-ml/dyn/Manifest b/dev-ml/dyn/Manifest
index 505371057bf6..43fa8bd286ba 100644
--- a/dev-ml/dyn/Manifest
+++ b/dev-ml/dyn/Manifest
@@ -2,3 +2,4 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/dyn/dyn-3.7.0.ebuild b/dev-ml/dyn/dyn-3.7.0.ebuild
new file mode 100644
index 000000000000..a3d55d2d7132
--- /dev/null
+++ b/dev-ml/dyn/dyn-3.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dynamic type"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="~dev-ml/ordering-${PV}:=
+	dev-ml/pp:="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_rc2.ebuild
deleted file mode 100644
index aee649edd10c..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230211.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230211.ebuild
deleted file mode 100644
index aee649edd10c..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230218.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230218.ebuild
deleted file mode 100644
index aee649edd10c..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild
index c57de66b8d67..5f09bae5b202 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 RESTRICT="test"  # Tests fail
 
diff --git a/dev-ml/ordering/Manifest b/dev-ml/ordering/Manifest
index 505371057bf6..43fa8bd286ba 100644
--- a/dev-ml/ordering/Manifest
+++ b/dev-ml/ordering/Manifest
@@ -2,3 +2,4 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/ordering/ordering-3.7.0.ebuild b/dev-ml/ordering/ordering-3.7.0.ebuild
new file mode 100644
index 000000000000..3302c44ddac1
--- /dev/null
+++ b/dev-ml/ordering/ordering-3.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Element ordering"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND=">=dev-lang/ocaml-4.08"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-ml/stdune/Manifest b/dev-ml/stdune/Manifest
index 505371057bf6..43fa8bd286ba 100644
--- a/dev-ml/stdune/Manifest
+++ b/dev-ml/stdune/Manifest
@@ -2,3 +2,4 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
+DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
diff --git a/dev-ml/stdune/stdune-3.7.0.ebuild b/dev-ml/stdune/stdune-3.7.0.ebuild
new file mode 100644
index 000000000000..7ee771448037
--- /dev/null
+++ b/dev-ml/stdune/stdune-3.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+DESCRIPTION="Dune's unstable standard library"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.5"
+DEPEND="
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
+}
diff --git a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
index 8f1eb6757ee0..cde184dc6330 100644
--- a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
+++ b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0
 	QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng
 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild b/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
index 5df6cca4142b..d1d10f11b027 100644
--- a/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
+++ b/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="unified interface to mail representations"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
index bf9b2ad47177..f0d4bb3f3a69 100644
--- a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
+++ b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and format RFC 2822 email addresses and groups"
 
 LICENSE="|| ( Artistic GPL-1+ ) MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild b/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
index 973654587d3b..ddcfc382aeb7 100644
--- a/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
+++ b/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="RFC 2822 Address Parsing and Creation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild b/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild
index 34365ef3c72e..2a5281b4c819 100644
--- a/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild
+++ b/dev-perl/Email-Date-Format/Email-Date-Format-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Produce RFC 822 date strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
index 8ad7cf0ccdf3..ad9478d8a404 100644
--- a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
+++ b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
index 34efe1706c7d..869d07bb6e9a 100644
--- a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
+++ b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A unified interface to MIME encoding and decoding"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild b/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
index 2f73c4fa04e4..5f25f0546789 100644
--- a/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
+++ b/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easy MIME message parsing"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild b/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
index 8dbb25c76a53..363a2898e342 100644
--- a/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
+++ b/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate world unique message-ids"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild b/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
index 9cc6d09f9377..bf6dafaf9e46 100644
--- a/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
+++ b/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild b/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
index f0e5619ada58..fddf187ff463 100644
--- a/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
+++ b/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple parsing of RFC2822 message format and headers"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
index bd408ea92a21..2b9b769fe598 100644
--- a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
+++ b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl implementation of DMARC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal"
 
 PERL_RM_FILES=(
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 1a55a7249308..d96be717132e 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
index 91659de94952..2a712b0ca8aa 100644
--- a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
+++ b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for simple IMAP account handling"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
index 9b642018ba9b..f150617566ff 100644
--- a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
+++ b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="SSL/STARTTLS support for Net::SMTP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-perl/Authen-SASL-2.0.0
diff --git a/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild b/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
index 0a631e971c49..cc1c11492994 100644
--- a/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
+++ b/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for easily overriding subroutines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild b/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
index fb173af6b30d..fa7acc014beb 100644
--- a/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
+++ b/dev-perl/Test-MockObject/Test-MockObject-1.202.1.220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for emulating troublesome interfaces"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Throwable/Throwable-1.0.0.ebuild b/dev-perl/Throwable/Throwable-1.0.0.ebuild
index 312a42e7a07d..293ac0ace1b6 100644
--- a/dev-perl/Throwable/Throwable-1.0.0.ebuild
+++ b/dev-perl/Throwable/Throwable-1.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A role for classes that can be thrown"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild
index 9a65c2bc0f48..49f201c31d81 100644
--- a/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild
+++ b/dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Hack around people calling UNIVERSAL::can() as a function"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Scalar-List-Utils
diff --git a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild
index 16f0c6250df7..99a646666a01 100644
--- a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild
+++ b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Attempt to recover from people calling UNIVERSAL::isa as a function"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Scalar-List-Utils
diff --git a/dev-python/Babel/Babel-2.12.1.ebuild b/dev-python/Babel/Babel-2.12.1.ebuild
new file mode 100644
index 000000000000..818272ef77fa
--- /dev/null
+++ b/dev-python/Babel/Babel-2.12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+# see scripts/download_import_cldr.py
+CLDR_PV=42.0
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="
+	https://babel.pocoo.org/
+	https://pypi.org/project/Babel/
+	https://github.com/python-babel/babel/
+"
+SRC_URI+="
+	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
+BDEPEND="
+	app-arch/unzip
+	${RDEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm babel/locale-data/*.dat || die
+	rm babel/global.dat || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -f babel/global.dat ]]; then
+		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
+	fi
+}
+
+python_test() {
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 2e310eb445d1..a0ccc3b5c18d 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,2 +1,4 @@
 DIST Babel-2.11.0.tar.gz 9346097 BLAKE2B 99ae97e4dc16e1757ae6f054f9f346c6728d087bbfba33786d59211ac4b6c12bf861c79ac7c12a3efd89539220126ea1ea9a3578a9008daaa464aed315102b60 SHA512 526368dc5e44f2d93c52f2fcb544130eea6c6b7c78325bd56c6d9a6706890a4cd9daa1498d639aab65059801d87977da626e64585083c58c4b328001991eea0b
+DIST Babel-2.12.1.tar.gz 9906735 BLAKE2B d78838f9a2032eae998f1d751ad803fec81c03be498db934e34e0702d28e0815a7848e55af73ea4dff45e3cf063b9e45ab06c749b8d3f15b7742e209bf3d06ef SHA512 93c4bf343d99a1f47f43f8b828eb79098cb429bac1034d58b5aa49adff68116e458067f3784d997f34515828a7432fd18f7abbaeee59b47a4ee8ea744908b33b
 DIST cldr-common-41.0.zip 29364494 BLAKE2B 1960e860017c3e5f31d935d66a1ff551720975dca0af459adc72b8dc54100938fbd2d2ef00eb457f3fd04d4f1e90a4783229c350b125029dcda5c1e6903f9a54 SHA512 c64f3338e292962817b043dd11e9c47f533c9b70d432f83e80654e20f4937c72b37e66a60485df43f734b1ff94ebf0452547a063076917889303c9653b4d6ce5
+DIST cldr-common-42.0.zip 30178050 BLAKE2B 076e3eca12534feff8e0e54bdc1fa38fc0db0f78cac8b4e35b343763a8ac6787745aa36be165684f4d6dda423409c4431a8e4941c53ae7d340ead0b35edbca30 SHA512 315448fe6a9ac2d5a6a7fd1a27b38c5db30fed053654a803d50e3a8d06aa08ad153e8e57089fa094c561f41a54f37eecda0701b47a1813879902be71945aa38a
diff --git a/dev-python/Faker/Faker-17.4.0.ebuild b/dev-python/Faker/Faker-17.4.0.ebuild
new file mode 100644
index 000000000000..f1e5f5fe409a
--- /dev/null
+++ b/dev-python/Faker/Faker-17.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 5b318f5a676f..6b92fd6b6c08 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,3 +2,4 @@ DIST Faker-16.6.1.tar.gz 1626043 BLAKE2B 2fc44018b76fffa1f0e249905d20fbc78bc1ab4
 DIST Faker-16.8.1.tar.gz 1649844 BLAKE2B 3ec9b7566342e569580fa8db4df20708ef9b1b6ab0ccdb31b9a33dbe0c7ff3c77ff1b7698e1cf478254d3625d9c516b2b84bcda9bb1d1bdff2161b6d5fcb1056 SHA512 9ea00ec96af0de6a939b9ab3812c75627f2a76514ac6236614d7455b123e4909f9ffe12e9e84f161e0b0b0f2b0f0ddc4ff6661dce788653dd4b8c12098a871fa
 DIST Faker-17.0.0.tar.gz 1650338 BLAKE2B 4e3e9723d9016481e7b7d3e9a27060881833ab1e8309f93fffcade696679da64345bcc6fce12ce6bcb2a237b317ea697a5ff4344d929e66c2b6778ec39fdb282 SHA512 9fcd79a6e8a3db592edaa83c30d89d86a0018181d4c778c3c3566cb6d95181b033639eaf92a332539b4436138cc868192d5a21f1c12c9ba180da0dacd8bee493
 DIST Faker-17.3.0.tar.gz 1651539 BLAKE2B 5695edf10d246bd776f63f0a2d26d0e3b36f7c20a0553333359d91f013522256c93bfe967655003b61832132d38dcc5d1909468d391b2a017605df32c31f0d41 SHA512 685dedd1d73210d58008f8898c0a95a6616c16852c59e7993e33fbb187a63ba8db72ef2a6fc37f0cb8c0da2b4e1521f6f4b82a8674bbf843219b0ee25d88d950
+DIST Faker-17.4.0.tar.gz 1651645 BLAKE2B f4cde3f203e3d8abe0762f9b68785c495bc85080177d85610f023648b88b13c903a42e39eb0b1d86c120752aa683f6a399ea8377c492eb938742e883710d7f51 SHA512 58821d9fae04363508ffe1be58f8df9830772b6531958842633e9a6d3f88928d0927beaf978288ce96c269f66df61dc137efd3977f6746f0d374017b6f4c5b05
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 852a31c5af51..90b902468798 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild
index 4eb058365914..e3959e15dcab 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..245c0808deda
--- /dev/null
+++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517="poetry"
+
+inherit distutils-r1
+
+DESCRIPTION="Pygments lexer and style Ansible snippets"
+HOMEPAGE="https://github.com/ansible-community/ansible-pygments"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
+
+# 2.14.0+ needed in order for tests to pass
+RDEPEND=">=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-tests_pygments2_14.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild
deleted file mode 100644
index 0f4d366bc7b9..000000000000
--- a/dev-python/ansible-pygments/ansible-pygments-0.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_PEP517="poetry"
-
-inherit distutils-r1
-
-DESCRIPTION="Pygments lexer and style Ansible snippets"
-HOMEPAGE="https://github.com/ansible-community/ansible-pygments"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-# 2.11.0+ needed in order for tests to pass
-RDEPEND=">=dev-python/pygments-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch
new file mode 100644
index 000000000000..d58a13256ac5
--- /dev/null
+++ b/dev-python/ansible-pygments/files/ansible-pygments-0.1.1-tests_pygments2_14.patch
@@ -0,0 +1,75 @@
+Backported upstream commit 0ddab3516217ac2067b6e980f5b2a6b2ac1be3fa
+
+--- a/tests/lexer_test.py
++++ b/tests/lexer_test.py
+@@ -86,41 +86,41 @@ def test_ansible_output_lexer():
+ 
+ <span class="k">TASK</span> <span class="p">[</span><span class="l">paused</span><span class="p">]</span> <span class="nv">************************************************************************************************************************************</span>
+ <span class="w">Sunday 11 November 2018  20:16:48 +0100 (0:00:00.041)       0:07:59.637 *******</span>
+-<span class="gd">--- before</span><span class="w"></span>
+-<span class="gi">+++ after</span><span class="w"></span>
+-<span class="gu">@@ -1,5 +1,5 @@</span><span class="w"></span>
+-<span class="w"> </span>{<span class="w"></span>
+-<span class="gd">-  &quot;exists&quot;: false,</span><span class="w"></span>
+-<span class="gd">-  &quot;paused&quot;: false,</span><span class="w"></span>
+-<span class="gd">-  &quot;running&quot;: false</span><span class="w"></span>
+-<span class="gi">+  &quot;exists&quot;: true,</span><span class="w"></span>
+-<span class="gi">+  &quot;paused&quot;: true,</span><span class="w"></span>
+-<span class="gi">+  &quot;running&quot;: true</span><span class="w"></span>
+-<span class="w"> </span>}<span class="w"></span>
++<span class="gd">--- before</span>
++<span class="gi">+++ after</span>
++<span class="gu">@@ -1,5 +1,5 @@</span>
++<span class="w"> </span>{
++<span class="gd">-  &quot;exists&quot;: false,</span>
++<span class="gd">-  &quot;paused&quot;: false,</span>
++<span class="gd">-  &quot;running&quot;: false</span>
++<span class="gi">+  &quot;exists&quot;: true,</span>
++<span class="gi">+  &quot;paused&quot;: true,</span>
++<span class="gi">+  &quot;running&quot;: true</span>
++<span class="w"> </span>}
+ <span class="w">\ No newline at end of file</span>
+ 
+ <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span>
+ 
+ <span class="k">TASK</span> <span class="p">[</span><span class="l">volumes (more volumes)</span><span class="p">]</span> <span class="nv">********************************************************************************************************************</span>
+ <span class="w">Sunday 11 November 2018  20:19:25 +0100 (0:00:00.607)       0:10:36.974 *******</span>
+-<span class="gd">--- before</span><span class="w"></span>
+-<span class="gi">+++ after</span><span class="w"></span>
+-<span class="gu">@@ -1,11 +1,11 @@</span><span class="w"></span>
+-<span class="w"> </span>{<span class="w"></span>
+-<span class="w"> </span>  &quot;expected_binds&quot;: [<span class="w"></span>
+-<span class="gd">-    &quot;/tmp:/tmp:rw&quot;,</span><span class="w"></span>
+-<span class="gd">-    &quot;/:/whatever:rw,z&quot;</span><span class="w"></span>
+-<span class="gi">+    &quot;/tmp:/somewhereelse:ro,Z&quot;,</span><span class="w"></span>
+-<span class="gi">+    &quot;/tmp:/tmp:rw&quot;</span><span class="w"></span>
+-<span class="w"> </span>  ],<span class="w"></span>
+-<span class="w"> </span>  &quot;expected_volumes&quot;: {<span class="w"></span>
+-<span class="gd">-    &quot;/tmp&quot;: {},</span><span class="w"></span>
+-<span class="gd">-    &quot;/whatever&quot;: {}</span><span class="w"></span>
+-<span class="gi">+    &quot;/somewhereelse&quot;: {},</span><span class="w"></span>
+-<span class="gi">+    &quot;/tmp&quot;: {}</span><span class="w"></span>
+-<span class="w"> </span>  },<span class="w"></span>
+-<span class="w"> </span>  &quot;running&quot;: true<span class="w"></span>
+-<span class="w"> </span>}<span class="w"></span>
++<span class="gd">--- before</span>
++<span class="gi">+++ after</span>
++<span class="gu">@@ -1,11 +1,11 @@</span>
++<span class="w"> </span>{
++<span class="w"> </span>  &quot;expected_binds&quot;: [
++<span class="gd">-    &quot;/tmp:/tmp:rw&quot;,</span>
++<span class="gd">-    &quot;/:/whatever:rw,z&quot;</span>
++<span class="gi">+    &quot;/tmp:/somewhereelse:ro,Z&quot;,</span>
++<span class="gi">+    &quot;/tmp:/tmp:rw&quot;</span>
++<span class="w"> </span>  ],
++<span class="w"> </span>  &quot;expected_volumes&quot;: {
++<span class="gd">-    &quot;/tmp&quot;: {},</span>
++<span class="gd">-    &quot;/whatever&quot;: {}</span>
++<span class="gi">+    &quot;/somewhereelse&quot;: {},</span>
++<span class="gi">+    &quot;/tmp&quot;: {}</span>
++<span class="w"> </span>  },
++<span class="w"> </span>  &quot;running&quot;: true
++<span class="w"> </span>}
+ <span class="w">\ No newline at end of file</span>
+ 
+ <span class="k">changed</span><span class="p">:</span> <span class="p">[</span><span class="nv">localhost</span><span class="p">]</span>
diff --git a/dev-python/autopep8/autopep8-2.0.1.ebuild b/dev-python/autopep8/autopep8-2.0.1.ebuild
index e35cb4f06e3c..807955f05f3e 100644
--- a/dev-python/autopep8/autopep8-2.0.1.ebuild
+++ b/dev-python/autopep8/autopep8-2.0.1.ebuild
@@ -19,7 +19,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 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 12a352f19925..60ffd4e18c7e 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,2 +1,4 @@
 DIST aws-sam-translator-1.58.1.gh.tar.gz 1151817 BLAKE2B a3ba2cc304e25a5d527fdef793deb232c1852ceda51df1bfe75ccbe150c8b08d8dfebfa1933f1722e20cecad6f88af596bbeffd203fce7855c3faaaee2f434bf SHA512 341d6346f7daaab3713962613a89b53d0e852d274222e408d9f314a01ec55fa1bc4ac0111bab54ab802caaa956923f0504c2bf620f06073a85c70c8fa28d15ad
 DIST aws-sam-translator-1.59.0.gh.tar.gz 1688806 BLAKE2B 66e63f5d008b120d95b2258552ba7ea531b6dc2d0090360c3777bcac167f95a0167cf200a8b29d798699e87a060befee71f7e8316ed395eded073960b4f1a18b SHA512 558b5dfe586c0badb7b5b5f35a6b841ffe94f2e6fb68acf7c492529abfe3756760fc5d8cdb16550ebbc47671fa12e09620b445d086f008d05f80606710ec67a9
+DIST serverless-application-model-1.60.0.gh.tar.gz 4600046 BLAKE2B 8a73c303389930fcee728cfe2d5829a6dab7bd8491722b5416ea28db4504eff710da97f91e054fc53b631128783e54dd9071f5e0d6fdd194bf72796555850c9f SHA512 543f2f7a3bbaace552dd954c28d61633f4315e251e426dac2acdef91b4e82c102e1108b54f67cd45efe41d1827b0287bf5752e8411abeb252a2367bfb5536ae3
+DIST serverless-application-model-1.60.1.gh.tar.gz 4600439 BLAKE2B fabd84e66da433410ff7d54a9db9ae6aed5dd67de16669450146adb5f86ef3b0b90a1c6165b935eb1aef0df0c116a687da6c43e75f332a8a5f3f93c79338f2e4 SHA512 75e3aca9248ce599837f87bdc633fc48e9f5980f878884aef7e3b1b41a2cbe1d982d9eb6b5bd41a2057fc53b9edc4ce6fd9e016750d0757f58feaeb08f02fe3a
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.60.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.60.0.ebuild
new file mode 100644
index 000000000000..2fa677eb180f
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.60.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild
new file mode 100644
index 000000000000..2fa677eb180f
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index d5848a643dcc..b115a7aeee94 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1 +1 @@
-DIST bareos-21.1.5.tar.gz 11655244 BLAKE2B 18ef42669cfdd7a663910fa1ce9b46f12eab0aa3a2106e9877dc3d341e9a7b309c21bc1768d4873d626938fcbb2084884a85d6dcef0aa2834b117aef1034d28f SHA512 637c6c0500ff31bb2c87f27d87f908d49836191afb880de4b636432b9c20433ec6f32f5805aaa7fb57f2f99a0201c51802c8d213ee5573642698f74da4cb06b7
+DIST bareos-21.1.6.tar.gz 11654525 BLAKE2B 9b023a07e28098fd93aca57aead5b2bf993b85c52dc8f76870dc53ee88ec5995bcc908397173c7d3504c78214e37311442dd96bb563fa4382ae35904fef69e0a SHA512 e9ccafd379ea2a7ede2b6852fa544e7d4b63b23e9d91e8b747c1aecf5d764b06991a57f658842d48fbbe49335a92f29eea90e56b613a3123246a9cd9e8273f36
diff --git a/dev-python/bareos/bareos-21.1.5.ebuild b/dev-python/bareos/bareos-21.1.6.ebuild
similarity index 100%
rename from dev-python/bareos/bareos-21.1.5.ebuild
rename to dev-python/bareos/bareos-21.1.6.ebuild
diff --git a/dev-python/blessed/blessed-1.20.0.ebuild b/dev-python/blessed/blessed-1.20.0.ebuild
index 208bbf607353..12937dfae776 100644
--- a/dev-python/blessed/blessed-1.20.0.ebuild
+++ b/dev-python/blessed/blessed-1.20.0.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
 HOMEPAGE="
 	https://github.com/jquast/blessed/
 	https://pypi.org/project/blessed/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f52714e53694..5bfc5322a756 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,2 +1,4 @@
 DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
 DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71cede08598b6f8092af8404bc9994e345b263b144ee3a1974ea276fce63c330d7ffa6335bb889bea32e380e9003a8c7 SHA512 cfc789296b904c0c3bd3999153067f4fb174b323f0fbd22e8f4a49aed98338e20fd238876e2f55f608f5d6b60b584e15d370400e8d0a8a00b0689e0867d00f05
+DIST boto3-1.26.80.gh.tar.gz 606204 BLAKE2B ae80c1ec7e99f48844c4eec39df1f6802df1fbbf2d94f1b7ddc04c7a21cb885823ebadb11cf9e81b51af9aa5f09775c02e52e926b94c49331307873b86702446 SHA512 e4ab89f2afe506d7d1ba9e1615e3a92ba4bf5dc9a85d3a14f034c1b14733d99cebf594bb6dc80914bf444da34d09c045c8933cf3c97e6ccfa9e31901e99d76ee
+DIST boto3-1.26.81.gh.tar.gz 611431 BLAKE2B e3f607e4bbd4ae7002168a697c6c3081b3713acbf7d7c8abdb1016b63f9ac5b16ae44255f707272db6a7b4c657210af0ed1c355889b01434683889b28de9d4e7 SHA512 30faa2d60f5f661e4d56a57c5b9d258ad3de260be2a21723b921f2383e290ca0b3d417a4a970ba3defd8f8196deaade2741117393c664b5fe267deab2e210e06
diff --git a/dev-python/boto3/boto3-1.26.80.ebuild b/dev-python/boto3/boto3-1.26.80.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.80.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.26.81.ebuild b/dev-python/boto3/boto3-1.26.81.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.81.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index df786de31aec..dcae58dcc352 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,2 +1,4 @@
 DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
 DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424863d6ff407dbcfd95bc9aa26d4009f503364f3d438997fe437b4830b8ef8c7bfb7e026313364bb3e9429cd3b7c2eae261 SHA512 260cf6a533e32c6f514774e5c5ef6830feb77058e1074e730d7fa05fb7067dac093f1a612ed11e02db116671ca9f7301ed29e1625f6e47724301d25b03eb3c30
+DIST botocore-1.29.80.gh.tar.gz 11197756 BLAKE2B 62f70c71f6b5892ff4daaede65389c75a159ebc29da69b2b2f9b59fabcf1818d91b968cbb04f48acce8310f34b96dbb30189c1fdc609e124202a6743d5b3e65a SHA512 27f31ba27448c5ea3214dcd585d60901761f6cd26e384a861aa377842dd3561f293c261a6a3fd91e78cc3ea75f48b9369e77f4a8d1a4b4dd08fbdde9335ee5a8
+DIST botocore-1.29.81.gh.tar.gz 11211684 BLAKE2B c89f683ab6fd238f975af4a30eea6191d1a6c2a8cf5ec1ac640a34de801bc289545dc2a98e9a76824afdb650b9d173751b23af3a3f3e9438f8cd1cdeb0fb64e3 SHA512 91b0d34652f68a3f41e768ff35d342c50868fb9e6f9da2b97a64cf08cac03e959395ac499b9fea7cf5997273700b06499f0d870661b9104709fead4a87c0a1ee
diff --git a/dev-python/botocore/botocore-1.29.80.ebuild b/dev-python/botocore/botocore-1.29.80.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.80.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.29.81.ebuild b/dev-python/botocore/botocore-1.29.81.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.81.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 615b4c282881..f25583217989 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1 +1,2 @@
 DIST breathe-4.34.0.gh.tar.gz 206989 BLAKE2B 1c899165ae30de373f90c0fd0b3428d7f4d74e3f66720731c2d02bc2a8bd9c6e5bbd81909b8ab186304975f877d276ed0170c611105335032bee3b689cadef73 SHA512 7f3134575f1b8c4d7c96ebc735e33f656b5c6046de3fa2aee95d5e895fb33f0a83fb4b1c64dd69b9deca20b785868b42d6b1d5e39741500ff5f9d82bf3f130b4
+DIST breathe-4.35.0.gh.tar.gz 212932 BLAKE2B 9423cc99cd1dc45fa1c93f1e2adfe59be4f3398842d3c6f98ee7a17285e108de4eb88e149c4ee179fa1008e30b69c8fa4f3934506aa53892c2eb612fa7652ba3 SHA512 76e36fceb89c21e2c62471a37b856f8e7077f946ca8ebffdd068297d7d447ba4f42f8f9d91e231f7a181d7dba2cb8650479f35f8bef342184e5ccbd3dd951f91
diff --git a/dev-python/breathe/breathe-4.35.0.ebuild b/dev-python/breathe/breathe-4.35.0.ebuild
new file mode 100644
index 000000000000..ecc0d3520dc9
--- /dev/null
+++ b/dev-python/breathe/breathe-4.35.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="
+	https://breathe.readthedocs.io/en/latest/
+	https://github.com/breathe-doc/breathe/
+	https://pypi.org/project/breathe/
+"
+SRC_URI="
+	https://github.com/breathe-doc/breathe/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.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/cairocffi/cairocffi-1.4.0.ebuild b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
index d9172dc275ab..f52f91e2b46d 100644
--- a/dev-python/cairocffi/cairocffi-1.4.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
@@ -4,16 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 pypi virtualx
 
 DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
 HOMEPAGE="
 	https://github.com/Kozea/cairocffi/
 	https://pypi.org/project/cairocffi/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest
index 3db6ef8cb3f6..9906099637a5 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1,3 +1,4 @@
 DIST caldav-1.0.1.gh.tar.gz 133071 BLAKE2B d7b9eb8015782bed5d32b7c34508cfcc1334d33cdfed99003cf45893b0a894d5a3187a2c98f886f97ffe8a64140a5a3826e1b3f57b58228a61d1ad4f9bf9f72a SHA512 ac816afd74f6fe34d82345a8b3a934fbe2c37af6a75cc8ef91cd87c8b8d147962ff05e701cd91480c1963d57967898129f923655d366820b689959b00f55659f
 DIST caldav-1.1.1.gh.tar.gz 136513 BLAKE2B a825b19023cadfd2b59e747c5d1b00065530d6773435a9f363d54cea7621f56eb6207b7a2888994fe5c42b873d6b82ba285abbc2ee5d18f72aafd90271cc5e87 SHA512 a1d991d468f093e6d54262f657e6e43ea9bf9e55dbe1f2fcb7189fb1e6a742805faee2a99807838f5db3406c1a9cd72a14054a30efe13e8d5ad7f113aaa88e2a
 DIST caldav-1.1.3.gh.tar.gz 136529 BLAKE2B 275c56d74a5118697672deae9611054ef08638ebd476d0108286cb116dc1b102ed5ae36dcb85ebcc21eb36d02aeb02d47e5acdda510c568f8dd9ae85895518c8 SHA512 ec281ac41d14938a5c10a08ef8134a16987e14218e2a1b092a6c10d09b619fc8372d3be3c1fb139bdb2c1f183af0832d486f70554e4007a0dc145173fc4564fb
+DIST caldav-1.2.0.gh.tar.gz 122290 BLAKE2B 62e60695737298dae299aed6e73ed3570c51f5fd05d15f25fb34852e2ca97d6a3e700148f69b5a67f1fad0db8233426d0908f58d513602e8be171ebbb5fef1bb SHA512 56b329d1fcc9ef750e30721485825e067706280b48131816357df023b53e6631b6749e154d0db4815328588359cc98e996c35a0e93395f1cd58d4c36615f96e6
diff --git a/dev-python/caldav/caldav-1.2.0.ebuild b/dev-python/caldav/caldav-1.2.0.ebuild
new file mode 100644
index 000000000000..1a6a3ab32f5f
--- /dev/null
+++ b/dev-python/caldav/caldav-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CalDAV (RFC4791) client library for Python"
+HOMEPAGE="
+	https://github.com/python-caldav/caldav/
+	https://pypi.org/project/caldav/
+"
+SRC_URI="
+	https://github.com/python-caldav/caldav/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( GPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/icalendar[${PYTHON_USEDEP}]
+		dev-python/recurring-ical-events[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		www-apps/radicale[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cangjie/cangjie-1.3-r1.ebuild b/dev-python/cangjie/cangjie-1.3-r1.ebuild
index 46a884d11511..26af275effb7 100644
--- a/dev-python/cangjie/cangjie-1.3-r1.ebuild
+++ b/dev-python/cangjie/cangjie-1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools python-r1
 
 DESCRIPTION="Python wrapper for libcangjie"
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 35fa0f6f5eaf..709d786d40cc 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.72.10.gh.tar.gz 3252485 BLAKE2B 34290170b4620f2f094d96ebb41cb9e5
 DIST cfn-lint-0.72.9.gh.tar.gz 3239001 BLAKE2B 935d07e58d12a7b95bb589523a9ef49c9f508386d58384e7b391442ef02e304e583d687fce0f8faf892049525d6e621670061ab96a124229de7fc94df3e3533e SHA512 bf83e4146d4f2951e670c07a3a0bb3ab212881af9687c16244cade18bac101468c35532516731f66a80708312a9ee33bc531be9a6b7fab671bf54d596886a523
 DIST cfn-lint-0.73.1.gh.tar.gz 3337094 BLAKE2B 0fd3ac1116f8d38ebc4eef04bca5a6f6970c270682941a820240180d5eaa5908a8320e4e2adb0f29fe132dd56215fb42377435099a3ccb95697cc2caaa391794 SHA512 efdc54f983f9b7200ee725a844a9d83674309c080fb62c63e02430eb81c2992c4232a42bbe34d7b7f4ecc5097403bd9d8bf55806876f83e4ba3993e62597b675
 DIST cfn-lint-0.73.2.gh.tar.gz 3343513 BLAKE2B 48ec085ec1d4c6fcee57d44915b65760481cd753805de3817c63aa093480aef15c81583cfa5f61f62407002c0d82cb9f36f146afffcc6f30dc0043f4f6fa991b SHA512 f85909cefb0882d4b36c26542c9ec65af520797e25b849bdbeb2e7e18b4f1675f0ede1b7cb19c529d8d393345ed48d98cc67e7e5d752790c3d9829bd6d69c052
+DIST cfn-lint-0.74.0.gh.tar.gz 3633749 BLAKE2B 68ba32c66a6cc4ddf1260523679565e7074e159c1d63b8e408a40426e0c3e7ec60159075b8dc91bb40d2fbdb8fb5a5fd55c0f70d02c165900a64a0d032285492 SHA512 635621995b74068ec2be9fcda0b710ab975e8aea428317d254fd6e93b2602071b985a6d80c12321b8245c2569b84b6c7c46e4cacfd59f0d0e21926ad6782e2f0
diff --git a/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild
new file mode 100644
index 000000000000..5d67809f6acd
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.74.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.59.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-python/clang-python/clang-python-16.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-16.0.0_rc2.ebuild
deleted file mode 100644
index 5ec556a2ca20..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230211.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 5ec556a2ca20..000000000000
--- a/dev-python/clang-python/clang-python-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230218.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 5ec556a2ca20..000000000000
--- a/dev-python/clang-python/clang-python-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/cloudscraper/Manifest b/dev-python/cloudscraper/Manifest
index 6dc989dc36df..541b7757d944 100644
--- a/dev-python/cloudscraper/Manifest
+++ b/dev-python/cloudscraper/Manifest
@@ -1 +1,2 @@
 DIST cloudscraper-1.2.68.gh.tar.gz 111952 BLAKE2B 69e896ad704ce776594fb89714bb75316ebff1b03387cba8575be6d60b496d18556690cfad109c2fa55c72ce3d91dcd21a21467a2d9820c579fea7482b688800 SHA512 42fa90127c6348c52a8327728683719966ae69c7b945cb9b485907e89e3b29b8053d31cd9cd4326e71ffd4c33e0fce20dd3d0e046fab62d89110eb4510535ad9
+DIST cloudscraper-1.2.69.gh.tar.gz 112198 BLAKE2B ea7325353aa9c4bfaca1834a1f9fdb2201cee1946a990d059540500e58322899469a48d847b6d7688b8f671bf4bbe762d1f61ed080587f3a553771ba8e9c2a93 SHA512 9da8d3d42117768a0a38843448248e3a124c864aaa76d62125d3a1dad8ea4f1921954e6efaa2eb9b40c283d6889c15c0c33378db7008155e46ccb5ae219c11d6
diff --git a/dev-python/cloudscraper/cloudscraper-1.2.69.ebuild b/dev-python/cloudscraper/cloudscraper-1.2.69.ebuild
new file mode 100644
index 000000000000..de0d08b51d59
--- /dev/null
+++ b/dev-python/cloudscraper/cloudscraper-1.2.69.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A Python module to bypass Cloudflare's anti-bot page"
+HOMEPAGE="
+	https://github.com/VeNoMouS/cloudscraper/
+	https://pypi.org/project/cloudscraper/
+"
+SRC_URI="
+	https://github.com/VeNoMouS/cloudscraper/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/js2py[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		net-libs/nodejs
+	)
+"
+
+# These tests fail for no understanadble reason
+EPYTEST_DESELECT=(
+	"tests/test_cloudscraper.py::TestCloudScraper::test_bad_interpreter_js_challenge1_16_05_2020"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_bad_solve_js_challenge1_16_05_2020"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_Captcha_challenge_12_12_2019"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_reCaptcha_providers"
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "brotli decompresssion support" "dev-python/brotlipy"
+
+	optfeature "js2py interpreter support" "dev-python/js2py"
+	optfeature "node.js interpreter support" "net-libs/nodejs"
+}
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index f4e1849763ac..a0e58a29a467 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index 13fc21a18c1e..be1b38506a9b 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1 +1,4 @@
+DIST configshell-fb-1.1.29-replace-getargspec-1.patch 1398 BLAKE2B 650efe1dad551ad040001cb2f576311806d329bd430874e1dac38a5cb94c4801140f32b628e0089809214466613e8f207ba3aff1a87dd8ca29c05593b551e5d7 SHA512 59c320939d4590dc2933de7d0ad613efd7236868fd898ce1edadbc55d1ecd8667e28a5c03caa80ea12420db3dd0e4de8c36ef5528352920d98acfd881648154a
+DIST configshell-fb-1.1.29-replace-getargspec-2.patch 2981 BLAKE2B 88400de96d329c0efd2a9e9cb41f1c53e62c28507439c405874726fccc6093d5fe37e52b6e4b811bf0ccc7616c9a26b83b17e39a257aeab3c4114e1486a32575 SHA512 621b125cde9fcc68f46a3a32fd78190a46f900ec808233a60c4beb22c6109165f0743a341991e6c556dc5a76b7c6a42b703f2a6be91915110f196845a3fa111c
+DIST configshell-fb-1.1.29.gh.tar.gz 33192 BLAKE2B 6c9c2146a597572675611afe259122b0ec9614295c4b9b4056d7a16f35004700b1e6fc29e1bf868d9ba6291b781ca35eab77e8adf23c6d23e09de2fb94626f26 SHA512 1b5f573506317119d2420e415abbb856692caa65a7f407f741300eec302d1b442e29d2691f6a192b202b2a5731a7a179d1b03f6cd27780876194d97e4df5f7d0
 DIST configshell-fb-1.1.29.tar.gz 55036 BLAKE2B 4a9a8f2573b43a9c8ddbda837e831c96b221f4499acb1aeeb990a7b1050c5572e9b745857ac9d1de4089d1758dd1284d0555da524def80e0a1caac18bb43a921 SHA512 0d7663cf58431c8b0be5618e5ef454838489e11a3074e5bd63145c3ea965065e37f1a41b5775363a35498a4d5dd86ad5453feb58dd74853cd77ae196b44c658e
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
new file mode 100644
index 000000000000..633970b1409b
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="
+	https://github.com/open-iscsi/configshell-fb/
+	https://pypi.org/project/configshell-fb/
+"
+SRC_URI="
+	https://github.com/open-iscsi/configshell-fb/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/open-iscsi/configshell-fb/commit/f3ac914861bd605e3d634aeeb5e706abdbd39259.patch
+		-> ${P}-replace-getargspec-1.patch
+	https://github.com/open-iscsi/configshell-fb/commit/50d5ffe9f213a53588cec88c9919c816b3fa7736.patch
+		-> ${P}-replace-getargspec-2.patch
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# Python3.11 fixes of deprecated getargspec function taken from upstream:
+	# - https://github.com/open-iscsi/configshell-fb/pull/64
+	"${DISTDIR}/${P}-replace-getargspec-1.patch"
+	# - https://github.com/open-iscsi/configshell-fb/pull/65
+	"${DISTDIR}/${P}-replace-getargspec-2.patch"
+)
+
+python_test() {
+	"${EPYTHON}" examples/myshell || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/configshell-fb/metadata.xml b/dev-python/configshell-fb/metadata.xml
index 43d40de7baa2..847c135cf482 100644
--- a/dev-python/configshell-fb/metadata.xml
+++ b/dev-python/configshell-fb/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<stabilize-allarches/>
-<longdescription lang="en">
-	configshell-fb is a Python library that provides a framework
-	for building simple but nice CLI-based applications.
-</longdescription>
-<upstream>
-	<maintainer status="active">
-		<email>mlombard@redhat.com</email>
-		<name>Maurizio Lombardi</name>
-	</maintainer>
-	<maintainer>
-		<email>agrover@redhat.com</email>
-		<name>Andy Grover</name>
-	</maintainer>
-	<remote-id type="github">open-iscsi/configshell-fb</remote-id>
-	<remote-id type="pypi">configshell-fb</remote-id>
-	<bugs-to>https://github.com/open-iscsi/configshell-fb/issues</bugs-to>
-</upstream>
+	<!-- maintainer-needed -->
+	<stabilize-allarches/>
+	<longdescription lang="en">
+		configshell-fb is a Python library that provides a framework
+		for building simple but nice CLI-based applications.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>mlombard@redhat.com</email>
+			<name>Maurizio Lombardi</name>
+		</maintainer>
+		<maintainer>
+			<email>agrover@redhat.com</email>
+			<name>Andy Grover</name>
+		</maintainer>
+		<remote-id type="github">open-iscsi/configshell-fb</remote-id>
+		<remote-id type="pypi">configshell-fb</remote-id>
+		<bugs-to>https://github.com/open-iscsi/configshell-fb/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index f1ed3d0513de..51319692f837 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,4 @@
 DIST coverage-7.0.5.tar.gz 796171 BLAKE2B 87ecffd87c2465607bf1fd330296e84e174953d7696ee0ef3046f6555f54634cfc643ada2a03971685021a5cf59191d75a0bddbc83f736e11a2516c684b0f0d9 SHA512 d199d710cdfac5c6cde79224b4a27d6b88a0e0c504eff7ad5700e9fb1f5cc8e1e9359dcc12f6c447a7ee6cd680feeb89f70ad68574a739c55a6d09b22017df06
 DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
 DIST coverage-7.2.0.tar.gz 812120 BLAKE2B 17851996635a1621643e64025ba43f11d7e844fb8757c5bfd6794dbff85cf2c218dc61119c8604f19f951c83264eb13f9c8f0cf7f070f6b213603b25b756a59c SHA512 a913c257702a77b115b6519c0feaf9336973330c9264cb376453555c30f305db2b924d5dd8ff7b58bb89d9f1765b069512929d1ccc9c1c234bdd08d6fc82213b
+DIST coverage-7.2.1.tar.gz 812219 BLAKE2B bb6b482990b0620d7e264244a9e31ee44b37fe83436c1d7d016d20e36d9ecbea85a614a4142683757bb1284bfbe2a157fc4748b01c76b5495c5eca5834e9a848 SHA512 40a7f1d25c7100b8f2f4ba1f877c241f65e1f560cdad861dab05254a4e177de37615888441d47a6c2ebc525ad2b52b476da7111efe5583708f094dd3a1b39984
diff --git a/dev-python/coverage/coverage-7.1.0.ebuild b/dev-python/coverage/coverage-7.1.0.ebuild
index 0b8e283213d3..a0a35a6df9e0 100644
--- a/dev-python/coverage/coverage-7.1.0.ebuild
+++ b/dev-python/coverage/coverage-7.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/coverage/coverage-7.2.1.ebuild b/dev-python/coverage/coverage-7.2.1.ebuild
new file mode 100644
index 000000000000..b83e4bdd6609
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 5a9dc4704f75..94e9acdf9a27 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,2 +1,2 @@
 DIST cx_Freeze-6.13.1.gh.tar.gz 1486207 BLAKE2B aa0151fed482714e41a859059f9672950249ad7fe50fa2accaa9d6af7ddc183a8f74d87337f274849a34a404dda0c732300343b58cd872f3bd03bf275c2f4d97 SHA512 48d569fdce5c6cb100232ce3577f0a55a40f3d1dcafa884a4d62af7f27200a21eb892504b47fb7cd106f410354b70d98a8e5245382431bc1f6d990510c77cb36
-DIST cx_Freeze-6.14.2.gh.tar.gz 1647508 BLAKE2B 7b14a75a21dbeb360c61609e9ac018c6e8bba6ffb357781cc2d8d27cd3cc27e054587845d117ce25912cd57b3fe83c037e5b76f55cd593890f66056ff18039df SHA512 40158afb0e2291c4a2f161eb2ef733fc8a2107c620dcf87f812bb0f6b81bfd06e3ec1b4108333c7d43a4855605621745395e765a825a68f3dd62b3edc21fc3c3
+DIST cx_Freeze-6.14.5.gh.tar.gz 1648095 BLAKE2B 81707d17c2118a8db4d768b2fbe83278c6b01509a5a1d3e7f3a41efaa29607fc4b254e9d545a4697b77d4932100f344a8013ac59084bb74d97d1b12cb927ec6e SHA512 52233a138da3250e97668a5c225e78b864bebaa43ea2b30de01af2de7739f48a25030e10d36ccec609240822de308ad030eaa26c2ede8b29318d2b30647cf1c8
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.2.ebuild
deleted file mode 100644
index 93c422b0d59a..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="
-	https://cx-freeze.readthedocs.io/
-	https://github.com/marcelotduarte/cx_Freeze/
-	https://pypi.org/project/cx-Freeze/
-"
-SRC_URI="
-	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	dev-util/patchelf
-	virtual/libcrypt:=
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	test? (
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# bug #491602
-	"${FILESDIR}/${PN}-6.8.2-buildsystem.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# new setuptools?
-	tests/test_command_bdist_rpm.py::test_bdist_rpm
-)
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
new file mode 100644
index 000000000000..cb720dc27e68
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="
+	https://cx-freeze.readthedocs.io/
+	https://github.com/marcelotduarte/cx_Freeze/
+	https://pypi.org/project/cx-Freeze/
+"
+SRC_URI="
+	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	virtual/libcrypt:=
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# bug #491602
+	"${FILESDIR}/${PN}-6.8.2-buildsystem.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# new setuptools?
+	tests/test_command_bdist_rpm.py::test_bdist_rpm
+)
+EPYTEST_IGNORE=(
+	# windows-specific test
+	tests/test_winversioninfo.py
+)
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 5590141cc0f9..9d548ddb867b 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,2 +1,3 @@
 DIST cython-0.29.32.gh.tar.gz 2110417 BLAKE2B 008ffe325c87d165bf45afb2ff92db5286f611bbe425d0e9f18b530202135ca21f5f5ab564a4d0c6251ec2479ea0fd19207274a255fb1faf8863d3b067d17ae9 SHA512 55462792fa70d8edf60aa470627ab494918d7297fd7d282a7a54da76ee5a180233108404a1c8f3d79f6408f19b6e4f46b36e59fd47c38ede24f061f374437b6f
 DIST cython-0.29.33.gh.tar.gz 2113910 BLAKE2B 9212edfa36680a3243632d28c4f5616a7336e82ee1f96df7d5e29711056619639c9a8fe9bbf9aea0a86aed39e836dc6eaa112ad35080f530add6309ccd09c53c SHA512 85f5ba7159d8793dbda980140b26086727f356a71d78f8522419657841d07b865d09c2f0a0f77d398669d071c1d261060235321a19eb7808e35d24f8ac71560d
+DIST cython-3.0.0b1.gh.tar.gz 2659132 BLAKE2B 7ed252d90f71521f24817e064f1b55f671185053cdd46214fb14f2b6e16dbfbc46e87659681ead40a32bb0506150ae6b8cdbaceae7667811aa81f97a39b5efcc SHA512 a7b2e9c22d19eab9e4ad551895e5c8882a7098a52865e341fd84d902124b4599d193d202333d9f1ffd5354fff62637c65d124820e6721905edaed46b5881b14c
diff --git a/dev-python/cython/cython-3.0.0_beta1.ebuild b/dev-python/cython/cython-3.0.0_beta1.ebuild
new file mode 100644
index 000000000000..54bc5b850f4d
--- /dev/null
+++ b/dev-python/cython/cython-3.0.0_beta1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+MY_P=${P/_beta/b}
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="
+	https://cython.org/
+	https://github.com/cython/cython/
+	https://pypi.org/project/Cython/
+"
+SRC_URI="
+	https://github.com/cython/cython/archive/${PV/_beta/b}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs \
+	dev-python/jinja \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	if has "${EPYTHON}" pypy3 python3.11; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
index 402c8b75c303..9dc5687e48b1 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 462d563be57c..3f363d9fae7e 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1 +1,2 @@
 DIST django-cors-headers-3.13.0.gh.tar.gz 27361 BLAKE2B 2d0729ae6f0e0ff7c572c5f25482fd88dfa03e8f03a7f640ba32f56208fccb91712cd3067bc3376428469cc7f03dd8003069b79e98dd438fad9e5f4b15cd9c71 SHA512 153ae0d2e0b1e390c72993ca629f7ed521fd907481bb2944ee2f805c0081a1db334fd72f0b3fdb77cbb57b3392691f32564bb646bfb8e388a942a8a3da138a8e
+DIST django-cors-headers-3.14.0.gh.tar.gz 29634 BLAKE2B 08ec6811b8608feecbdaadcc6ce220b1574a4bf16823f939f93eda4ece9df0430b015edc1d0909b980996ff143e036858ca81f524e8d270846881a9c0af25fac SHA512 5ff390bd2fba1b3dff3cea08b10021d0fd100497000b2eaef788fe32c1b8584f1954e470f4aa15cbcf9e4342265633a658b8736de08962bfe0ea9e2068521379
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.14.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.14.0.ebuild
new file mode 100644
index 000000000000..2f86005be6e8
--- /dev/null
+++ b/dev-python/django-cors-headers/django-cors-headers-3.14.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
+HOMEPAGE="
+	https://github.com/adamchainz/django-cors-headers/
+	https://pypi.org/project/django-cors-headers/
+"
+SRC_URI="
+	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-crispy-forms/Manifest b/dev-python/django-crispy-forms/Manifest
index 8ccfa76bebff..52d7cbd7417f 100644
--- a/dev-python/django-crispy-forms/Manifest
+++ b/dev-python/django-crispy-forms/Manifest
@@ -1 +1,2 @@
 DIST django-crispy-forms-1.14.0.gh.tar.gz 295826 BLAKE2B 4be78ba2eb8b7dfd6d9813d2a94b26ca571f3c8767f22e37e64deca517b0044d1684343f82790860f024b6eaf6759acfdb6975e4497e40bb75cc64ace3ce9745 SHA512 964ebcd74dd284d11cd0a820238468cce415a61b9ac83afe401b1414da0e27b3e9e0a9aa4fec411a8ff9fa08aa6fb56550c6262e0a9d821b17e12590fc06970c
+DIST django-crispy-forms-2.0.gh.tar.gz 273743 BLAKE2B 4169c4f77ddd0dd9f8786abd71ad762f645283555f250861f32b874fb9e189d4ca174285ee39b51bc5f0c0e8c2e83c2e00c34398c51ede65438a1c6b8a17c3ee SHA512 8b6f5b35cb90837b7cd6a64ed74afe6a19a80f287f66d0a139811990524e1a48d4d7c01e61fb7d303958522c47458d0aa0008a3d6c147f7d03dc790e53a80592
diff --git a/dev-python/django-crispy-forms/django-crispy-forms-1.14.0.ebuild b/dev-python/django-crispy-forms/django-crispy-forms-1.14.0.ebuild
index 790ba770fa73..0463cb56afea 100644
--- a/dev-python/django-crispy-forms/django-crispy-forms-1.14.0.ebuild
+++ b/dev-python/django-crispy-forms/django-crispy-forms-1.14.0.ebuild
@@ -16,6 +16,12 @@ SRC_URI="https://github.com/django-crispy-forms/${PN}/archive/${PV}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="test" #Not working
+IUSE="test"
+RESTRICT="test" #Some tests are failing
 
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+	dev-python/pytest-django[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-crispy-forms/django-crispy-forms-2.0.ebuild b/dev-python/django-crispy-forms/django-crispy-forms-2.0.ebuild
new file mode 100644
index 000000000000..914ce0712232
--- /dev/null
+++ b/dev-python/django-crispy-forms/django-crispy-forms-2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="DRY Django forms"
+HOMEPAGE="https://github.com/django-crispy-forms/django-crispy-forms"
+SRC_URI="https://github.com/django-crispy-forms/${PN}/archive/${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" #Missing crispy_bootstrap3
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+	dev-python/pytest-django[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-3.1.1.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-3.1.1.ebuild
index e9dab2db6f8d..7228f7b501ec 100644
--- a/dev-python/django-sortedm2m/django-sortedm2m-3.1.1.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-3.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 53691a5a99af..0f47d5f40e67 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1 +1,2 @@
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
+DIST dkimpy-1.1.0.tar.gz 66326 BLAKE2B 3af2ab63351c117b7fa0fd2c7a2f2a98b2177511af61734d171fb69e25c5a3d629d95f8ba2832b66f57607ff447a4093ab8ebd58c931975e9ca0c1bab9469590 SHA512 d8c656d1adabbf8ef2121a36a848818ee9ce5ac9fe42c4b16ef50588870478989159f4ff3aa422ba0556a82763a9e78fde5e19195fe0b95176f2f4ff1d60c70e
diff --git a/dev-python/dkimpy/dkimpy-1.1.0.ebuild b/dev-python/dkimpy/dkimpy-1.1.0.ebuild
new file mode 100644
index 000000000000..7a71236ad9dd
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="
+	https://launchpad.net/dkimpy/
+	https://pypi.org/project/dkimpy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/docstring-to-markdown/docstring-to-markdown-0.11.ebuild b/dev-python/docstring-to-markdown/docstring-to-markdown-0.11.ebuild
index 10fbea97acbd..f1f8398d1ef3 100644
--- a/dev-python/docstring-to-markdown/docstring-to-markdown-0.11.ebuild
+++ b/dev-python/docstring-to-markdown/docstring-to-markdown-0.11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index a7cb600be8df..a0966693812b 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1 +1,2 @@
+DIST doit-py-0.5.0.gh.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
 DIST doit-py-0.5.0.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
diff --git a/dev-python/doit-py/doit-py-0.5.0-r1.ebuild b/dev-python/doit-py/doit-py-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..f4b939016f26
--- /dev/null
+++ b/dev-python/doit-py/doit-py-0.5.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="doit tasks for python stuff"
+HOMEPAGE="
+	https://pythonhosted.org/doit-py/
+	https://github.com/pydoit/doit-py/
+	https://pypi.org/project/doit-py/
+"
+SRC_URI="
+	https://github.com/pydoit/doit-py/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/configclass[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-text/hunspell[l10n_en]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/doit/doit-0.36.0-r1.ebuild b/dev-python/doit/doit-0.36.0-r1.ebuild
new file mode 100644
index 000000000000..21d211e22506
--- /dev/null
+++ b/dev-python/doit/doit-0.36.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 distutils-r1 pypi
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="
+	https://pydoit.org/
+	https://github.com/pydoit/doit/
+	https://pypi.org/project/doit/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	|| (
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+
+EPYTEST_DESELECT=(
+	# test failing due to impact on PATH run in a sandbox
+	tests/test_cmd_strace.py::TestCmdStrace::test_dep # #836164
+	tests/test_cmd_strace.py::TestCmdStrace::test_target
+)
+
+src_prepare() {
+	# Replace custom theme with builtin for documentation
+	sed -e '/html_theme/s/press/sphinx_rtd_theme/' -i doc/conf.py || die
+	# Remove non-exist modules for doc generation (#832754)
+	sed \
+		-e '/sphinx_sitemap/d' \
+		-e '/sphinx_reredirects/d' \
+		-i doc/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp bash_completion_doit ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins zsh_completion_doit _${PN}
+}
diff --git a/dev-python/ewmh/ewmh-0.1.6.ebuild b/dev-python/ewmh/ewmh-0.1.6.ebuild
index eaee900fa347..abb9eb9c8520 100644
--- a/dev-python/ewmh/ewmh-0.1.6.ebuild
+++ b/dev-python/ewmh/ewmh-0.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 4511d43f6afb..1819519283b3 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1 +1,2 @@
 DIST python-fastjsonschema-2.16.2.gh.tar.gz 391619 BLAKE2B ea8da31d16ec7c9a897de0b2a91832ce26798d2dc048e70e862ce7a4e75787cd25ee4b9e14fac9f85599e050338b6306a2549a0a8bab9abcbfbd12c246d10697 SHA512 17fce033e6d334e82813af7366006ade29433efe291a1567ae494c2273b9ab87b8fa4ccf1bae0b7062f9f70fe492449c87a5d07075d79037ac2c755ed9278a23
+DIST python-fastjsonschema-2.16.3.gh.tar.gz 392011 BLAKE2B 04990592a2bf6e1309bf725361ef7c2e253c4765c5b9d60805c5e6189f14885a3b0bae98945c2fe228adc335ca8c8c0a243b283b24fa447238d6415d439288e2 SHA512 2e26f31f9c6966e77f70b8ca584e672d554219b6bbb4811e3ac8dff1c693b2638ef08b8b9011e0db6f739be02e2f41a35d15bcfc42a9cb06ddb4521e51f37d8a
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
new file mode 100644
index 000000000000..453a2cbc2332
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="
+	https://github.com/horejsek/python-fastjsonschema/
+	https://pypi.org/project/fastjsonschema/
+"
+SRC_URI="
+	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -r tests/benchmarks || die
+}
diff --git a/dev-python/fastjsonschema/metadata.xml b/dev-python/fastjsonschema/metadata.xml
index 7e60f3e6248a..1a957a0ba04f 100644
--- a/dev-python/fastjsonschema/metadata.xml
+++ b/dev-python/fastjsonschema/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">horejsek/python-fastjsonschema</remote-id>
 		<remote-id type="pypi">fastjsonschema</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fido2/fido2-0.9.3-r1.ebuild b/dev-python/fido2/fido2-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..4d71ade46cd3
--- /dev/null
+++ b/dev-python/fido2/fido2-0.9.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0/0.9" # Bumped every time a backwards-incompatible version is released
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyfakefs-3.4[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch b/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
new file mode 100644
index 000000000000..4a85cde3891e
--- /dev/null
+++ b/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
@@ -0,0 +1,34 @@
+url: https://github.com/fonttools/fonttools/issues/2996
+
+commit ca9d98d94c3ba98db934f0d1e3a77134171f2262
+Author: Jérôme Carretero <cJ-gentoo@zougloub.eu>
+Date:   Fri Feb 17 19:24:46 2023 -0500
+
+    Fixup pypy3 compatibility
+
+diff --git a/Lib/fontTools/misc/macCreatorType.py b/Lib/fontTools/misc/macCreatorType.py
+index 6b191054b..f680f238d 100644
+--- a/Lib/fontTools/misc/macCreatorType.py
++++ b/Lib/fontTools/misc/macCreatorType.py
+@@ -24,7 +24,7 @@ def getMacCreatorAndType(path):
+ 	"""
+ 	if xattr is not None:
+ 		try:
+-			finderInfo = xattr.getxattr(path, 'com.apple.FinderInfo')
++			finderInfo = xattr.getxattr(str(path), 'com.apple.FinderInfo')
+ 		except (KeyError, IOError):
+ 			pass
+ 		else:
+diff --git a/Lib/fontTools/subset/svg.py b/Lib/fontTools/subset/svg.py
+index 4ed2cbd20..4a8823928 100644
+--- a/Lib/fontTools/subset/svg.py
++++ b/Lib/fontTools/subset/svg.py
+@@ -77,7 +77,7 @@ def iter_referenced_ids(tree: etree.Element) -> Iterator[str]:
+ 
+         attrs = el.attrib
+         if "style" in attrs:
+-            attrs = {**attrs, **parse_css_declarations(el.attrib["style"])}
++            attrs = {**dict(attrs), **dict(parse_css_declarations(el.attrib["style"]))}
+         for attr in ("fill", "clip-path"):
+             if attr in attrs:
+                 value = attrs[attr]
diff --git a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild b/dev-python/fonttools/fonttools-4.38.0-r1.ebuild
new file mode 100644
index 000000000000..d401fb8fb46d
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.38.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/fonttools-4.38.0-pypy3.patch"
+)
+
+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
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index f2ddf8c3358b..434d34412e0a 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,2 +1 @@
-DIST funcy-1.17.tar.gz 112383 BLAKE2B 150133f72ed165bdc9adc3a9f4954dfd5b846dea7b1ee2cae0d6621ebaec3e2ba986cd6596fd86482036aad6476913caec0868db9cf55c067fdbf62ac10953e2 SHA512 d48ce3b7a7b8ee7512df109d651f40ca4dadf681acca6ab0a4857a2ea408f20f6345b9b416ca8b1e924050a842648192b8fe79381c202361bc4d2e25bd55ad05
 DIST funcy-1.18.tar.gz 277530 BLAKE2B 78e86e23b3908924de1de62dd567ff8ff52079a9a7529923c84f67a3c5f768d232164d758763db1ce941986c28012dbcb3c146412998b1d1d6064efcc0ff4bf9 SHA512 274fec59c1fddc58248b5f8c81686955706333bbd33a1d567f62694c70449ef2488fae6bf76418b8ff3c6655fad12ed344cc6c90a84c5b10412e32fbdda016fe
diff --git a/dev-python/funcy/funcy-1.17.ebuild b/dev-python/funcy/funcy-1.17.ebuild
deleted file mode 100644
index b18c07ac76ce..000000000000
--- a/dev-python/funcy/funcy-1.17.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of fancy functional tools focused on practicality"
-HOMEPAGE="https://github.com/Suor/funcy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? ( dev-python/whatever[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/funcy/funcy-1.18.ebuild b/dev-python/funcy/funcy-1.18.ebuild
index 0d8188000de2..b9e11f377890 100644
--- a/dev-python/funcy/funcy-1.18.ebuild
+++ b/dev-python/funcy/funcy-1.18.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A collection of fancy functional tools focused on practicality"
 HOMEPAGE="
 	https://github.com/Suor/funcy/
 	https://pypi.org/project/funcy/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
index 73540c460595..e0dff8065973 100644
--- a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
+++ b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
index 46d75ba89f8d..a5c9ed228426 100644
--- a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/h11[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index f202d205d878..f7e12bde34b4 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,4 +1,5 @@
 DIST imageio-2.25.0.gh.tar.gz 401690 BLAKE2B 3c7faa7aae06b098a171ad168cd28d14abbc32d519a373ab77c4bec30913faa7baafc2f0b4721a80ee72a6e7b479c12fe27e707c4a90bcaaf2ebceb2b4b39577 SHA512 e887d8572f4698b6cd6fad832054cbce2550a4165e65704c2f990b500234cc938c68b9840bc8961a7258cf4cfa91c3ac909c7965de689b00b04195ab1120850c
 DIST imageio-2.25.1.gh.tar.gz 402105 BLAKE2B 8d7f5881fecf2b5bd5fa0534f4f979db252a1541fce518a4c5acdf7592c8e752dc49e0025d7319fc27588cb457c4f5b05e9a91f510039b95371ac31bee9fd241 SHA512 0473eb10c00e4ceff858394d3bde3b7c42fc7f2c6692ab3f7a1e20c67ab84fed3129948eff5aef0c43bf750906c3b3b8acca75fcbba855b6b9f725258df4241f
+DIST imageio-2.26.0.gh.tar.gz 403652 BLAKE2B 2f1948b1cee03ef4fdd71489923a1ea5b0c364fb5f000d79e1d309042184a6bb267a323bd19fce85bf47857245eb4be5283f0b3df65857d7cac57c24930ea409 SHA512 6ad8ce0395033571c0d918dbe03ffeab0e43b29d402bc91a229d3ffd689eae3d01aa09dec386d03fe028f6138887883cfda4e0a769f523ba9f6c3e3041a0cb7f
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
diff --git a/dev-python/imageio/imageio-2.26.0.ebuild b/dev-python/imageio/imageio-2.26.0.ebuild
new file mode 100644
index 000000000000..30875e33909b
--- /dev/null
+++ b/dev-python/imageio/imageio-2.26.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+)
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index da249035a935..e9388779660d 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,3 +1,3 @@
 DIST ipython-8.10.0.tar.gz 5456256 BLAKE2B 8ca8781326396ffa1e8012bab3b539b857a68e212afd5b2b97bc2f0eac6ec1aee45c0743d745554ef24fabd24667c2d6cdb3927350ca61b747e02afa215c1519 SHA512 5cfcdd49120d9ffc11d2f18501826b2f7094a51c439ac23e507f1027989ece4104d739a1905feba41f899d22a66e1345333f46e0f55d18925f166906f4992cfe
-DIST ipython-8.8.0.tar.gz 5341086 BLAKE2B 6cab547c693494aed85c750ae566947c8035018213839c36ec906cf11c80e93269c4b861a5a4d72994bc4e5fc8f2787fd7674fdb836dad22c8c04c33d8f37de3 SHA512 18e8eaa285fe6278a27ffd2edcf4eccf629e05a8718faa721013d0433822ff8b850a2060135f26b5254a96b7ae0139e2ff4338676c08d3271a12c1b91532d7d1
+DIST ipython-8.11.0.tar.gz 5462176 BLAKE2B 6024c191f327d04f7a26f2f371b200e2e3f26029d84a3a53fc7421cb4751f0e29fb8741a2aa0447026b43cc1d9a7674a07e06c30578812cc33220c55df72c497 SHA512 9b07da3fed304f6739396883d0219386bb08d4860853b30f308c2e9b9017f48d1228dedb511c872b706881ee80dc7bf03f541720ffb816c35b66f6f53ac289a3
 DIST ipython-8.9.0.tar.gz 5454595 BLAKE2B bb091bf9c2d9571ded5e1007d9fe60d34b9b0010747759ccceee3368822e3e190766439e3dd9b26df2dbb136ed2b81bc0d89d9b8857baae6e4d86a3524c07972 SHA512 2a9df79ff26bb34866dc523e75ba8e8d8de25d510fc273cbbf762b3011e53ff5331869f1d6fc8c44df6c9a8b5745a0545fe301a556b7f20e3a3dfca994316735
diff --git a/dev-python/ipython/ipython-8.11.0.ebuild b/dev-python/ipython/ipython-8.11.0.ebuild
new file mode 100644
index 000000000000..a85928b28699
--- /dev/null
+++ b/dev-python/ipython/ipython-8.11.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature pypi virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="
+	https://ipython.org/
+	https://github.com/ipython/ipython/
+	https://pypi.org/project/ipython/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
+	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
+	)
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "code formatting" dev-python/black
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/ipython-8.8.0.ebuild b/dev-python/ipython/ipython-8.8.0.ebuild
deleted file mode 100644
index e7b2fb3e54cf..000000000000
--- a/dev-python/ipython/ipython-8.8.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.9.0.ebuild b/dev-python/ipython/ipython-8.9.0.ebuild
index 08e49d70543f..bf9a56efb0a9 100644
--- a/dev-python/ipython/ipython-8.9.0.ebuild
+++ b/dev-python/ipython/ipython-8.9.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 44ecc8158bca..895cf8916aa5 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1 +1,2 @@
 DIST jc-1.22.5.gh.tar.gz 12820323 BLAKE2B 2248ce17322b79f6902d595d1afa9a9afff64c153f08396de7b4441f5be0bda000188740a39435f7049e2a0d940e3fb5e6a53b4cca20c518b4522145b7447264 SHA512 72f4d0389ccc716ff61cb182ce26597a65ae1b1a449ad24078f5369b3b4c824ff27366d06456075ee55b24c5c91beb59f2dc8ec86f9b7db47728808e0647724b
+DIST jc-1.23.0.gh.tar.gz 12850876 BLAKE2B d0eb0bdca90115583409238eb8b4081bec92fa46b9c2054fc9d3637126bc3e21fa295c90d2f3910645b21d5f60b432461ebb6482bf8930a8b1c06deb3b2e027a SHA512 24d5675573e3050a3d6c9ba7bbe6be786a1f318eb7d8800ef160848163065b1fc961939ab1cae37a89407ecfd426c1aace3fef6f7985cc18e80e0d44b0fcb4be
diff --git a/dev-python/jc/jc-1.23.0.ebuild b/dev-python/jc/jc-1.23.0.ebuild
new file mode 100644
index 000000000000..90c6c8f3f7cb
--- /dev/null
+++ b/dev-python/jc/jc-1.23.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index e8897321bced..e6f58bca072d 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_console-6.4.4.tar.gz 35145 BLAKE2B d37190c30eceba79c0d37ad60d88c9e691759aaccb29a64a9482b7c3cf3315efa3c902ac2244c2139ef2f94a77450115124227768f8291f73512796aaff1214a SHA512 1f06591ed2a0fcf56e783d4e9f2a7c3f58a4f566cfb63b3367edac23c7709aa1af7bf6639c7358227a987049804da90658144fa5ad38db120c0816e78ed465ef
-DIST jupyter_console-6.5.0.tar.gz 35609 BLAKE2B 056386eaa1c214b27ff10993d08fc5351ab9f6775fa8f2882bbe8ed6ca4170edb8a8024740f3a9f0f9667c253a1945700da0e9a3bc925d970597b43c830c9e6b SHA512 9c3b44a43d0a18bbcade97fee514859b6c370941e80525630195fb6bf8fb32c3cf048dfabd2c41f7f98365d2fbd87c9e190f9fb8e899c5a29266585766df66af
 DIST jupyter_console-6.5.1.tar.gz 35754 BLAKE2B 1b3e189e8a057b0f57e6a1c1409797aff9b6584edd96975c5b91a7c5d55d8601e44a3f9e0218413351d67d7175a7f6c86c3734e14ba881f6ab25ea9f1748576d SHA512 3fbd97b1ab05596ac56ba8f6038af787698197b5148f7e33a79ad5cdcc9a78c80c2534e3e2c298aeb92ce880686731b9ba206d7d0094ad67d7cd4996c02e2327
-DIST jupyter_console-6.6.0.tar.gz 19523 BLAKE2B 5fd393b2d6abaab68ce9b96632a757f6c1bd43ac192744a9ce58be1e8bcc7accc1bfdf5428c908b270a66c14014177ce559fa97a6d0da93d3bfa34af101c5c98 SHA512 e1c4d0953ffba22660d680250b3b64887ec908e0bc420caedaf9afbe0ceb4b3e8eb5ac9b5b477aadcb773867ea7fce7b7da16bb8b4e403d9cf98484271577c0b
 DIST jupyter_console-6.6.1.tar.gz 34188 BLAKE2B c502fb86152010906d552a8d7141f52d8aab56e5df0389d93c3e4881acf3cc9b73d80c5d0a8193e7b179079a7310c68ae54ce2205b68a5f7538b9de33d54eb66 SHA512 dc30b9f0fd8c121e17fe9f9352c2ff4945795b11db74a13fe943bf4424bc0ddaa7745ad12477c7a37c51bedc6c1ce29b72803cf2e1bf82b5d8d124fed0a2e4c8
+DIST jupyter_console-6.6.2.tar.gz 34270 BLAKE2B 860d3b8d5f6292c4198aaaeec4e41d4e0764e48b374c9754c06aa45d0da56a60dc74a71a8db2243e5704647fa080dbfc86112bbb5467b414b82fd9168b056ab4 SHA512 4a7508ff9ae4d1c31644588f0a594f86c2183a0799b737d6b892eeebc4892193681e3e2eb54e8a8a5ba496120722602fce87802df78015a49adc76485edb9947
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
deleted file mode 100644
index 0b1510615ab7..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.5.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.5.0.ebuild
deleted file mode 100644
index ecde6a0289e2..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
-"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild b/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild
index ecde6a0289e2..f169e01dea2c 100644
--- a/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://jupyter.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.2.ebuild
similarity index 100%
rename from dev-python/jupyter_console/jupyter_console-6.6.0.ebuild
rename to dev-python/jupyter_console/jupyter_console-6.6.2.ebuild
diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
index 9fdc752b34f0..b5f44afbfdd1 100644
--- a/dev-python/leechcorepyc/Manifest
+++ b/dev-python/leechcorepyc/Manifest
@@ -1 +1,2 @@
 DIST leechcorepyc-2.13.0.tar.gz 123152 BLAKE2B 8a3ae5b0f0d52296ef71bbbea5140f9dec6abd379ae2a1b0e3a418090a11e5196731b1c4cba5320d4058c562911366cc9dd84f3a30f58ddc7c66362a9b39af8f SHA512 1420f635bebafe1e07cb5f0ade3e6b141433d4a72ec165713f959dc19e05f42a86440c5c99dd5d759aee221ee478e91e7161541cebe11be6dfa286fad79843ae
+DIST leechcorepyc-2.14.0.tar.gz 124463 BLAKE2B 26b7581da76ab3f8981e956ab2f64de2094cc906788455e38784fb50dbad31b8b14de2f510cb49b9c1e842e2a66effd44a2db94cb6ef9e7ec9f11c3af0d9434c SHA512 c7d1d50727023f6b34bbc9682dba9bc70ae69962dcd5c326612a0dcd48a2a90ecfe674391559271d65d7720d755edde02342fb999e53ad54f8095c589060b901
diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch
new file mode 100644
index 000000000000..945f4e41e1c1
--- /dev/null
+++ b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/893824
+--- a/leechcore/Makefile
++++ b/leechcore/Makefile
+@@ -6,7 +6,8 @@
+ # CFLAGS  += -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=bounds-strict -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow
+ # CFLAGS  += -fsanitize=pointer-compare -fsanitize=pointer-subtract -fanalyzer
+ # DEBUG FLAGS ABOVE
+-CFLAGS  += -fPIE -fPIC -pie -fstack-protector -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,noexecstack
++CFLAGS  := -D_FORTIFY_SOURCE=2 ${CFLAGS}
++CFLAGS  += -fPIE -fPIC -pie -Wl,-z,noexecstack
+ CFLAGS  += -Wall -Wno-unused-result -Wno-unused-variable -Wno-unused-value -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+ LDFLAGS += -g -ldl -shared
+ DEPS = leechcore.h
diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-respect-CC.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-respect-CC.patch
new file mode 100644
index 000000000000..4fdebf98d445
--- /dev/null
+++ b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-respect-CC.patch
@@ -0,0 +1,38 @@
+--- a/leechcore/Makefile
++++ b/leechcore/Makefile
+@@ -1,5 +1,6 @@
+-CC=gcc
+-CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `pkg-config libusb-1.0 --libs --cflags`
++CC?=gcc
++PKG_CONFIG ?= pkg-config
++CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `$(PKG_CONFIG) libusb-1.0 --libs --cflags`
+ # DEBUG FLAGS BELOW
+ # export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_invalid_pointer_pairs=2
+ # CFLAGS  += -g -O0 -Wextra -Wno-unused-parameter -Wno-cast-function-type
+--- a/leechcore_device_rawtcp/Makefile
++++ b/leechcore_device_rawtcp/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
+ LDFLAGS += -g -shared
+ DEPS = 
+--- a/leechcore_device_sp605tcp/Makefile
++++ b/leechcore_device_sp605tcp/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
+ LDFLAGS += -g -shared
+ DEPS = 
+--- a/leechcore_ft601_driver_linux/Makefile
++++ b/leechcore_ft601_driver_linux/Makefile
+@@ -1,5 +1,6 @@
+-CC=gcc
+-CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `pkg-config libusb-1.0 --libs --cflags`
++CC?=gcc
++PKG_CONFIG ?= pkg-config
++CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `$(PKG_CONFIG) libusb-1.0 --libs --cflags`
+ LDFLAGS += -g -shared
+ DEPS = leechcore_ft601_driver_linux.h
+ OBJ = fpga_libusb.o leechcore_ft601_driver_linux.o
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild
new file mode 100644
index 000000000000..bf736abb4c7b
--- /dev/null
+++ b/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python binding for LeechCore Physical Memory Acquisition Library"
+HOMEPAGE="https://github.com/ufrisk/LeechCore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# leechcorepyc ships with a bundled version of the LeechCore library. So we
+# don't depend on the library here. But we must be aware this module doesn't
+# use the system library.
+DEPEND="virtual/libusb:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.14.0-respect-CC.patch"
+	"${FILESDIR}/${PN}-2.14.0-cflags.patch"
+)
+
+src_configure() {
+	tc-export CC
+
+	distutils-r1_src_configure
+}
diff --git a/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
index 81533db305a7..c572c89ef9af 100644
--- a/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
 		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-python/lit/lit-16.0.0_rc2.ebuild b/dev-python/lit/lit-16.0.0_rc2.ebuild
deleted file mode 100644
index e4fccac18491..000000000000
--- a/dev-python/lit/lit-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~loong"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-17.0.0_pre20230211.ebuild b/dev-python/lit/lit-17.0.0_pre20230211.ebuild
deleted file mode 100644
index f4b401a77373..000000000000
--- a/dev-python/lit/lit-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-17.0.0_pre20230218.ebuild b/dev-python/lit/lit-17.0.0_pre20230218.ebuild
deleted file mode 100644
index f4b401a77373..000000000000
--- a/dev-python/lit/lit-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/markups/markups-4.0.0.ebuild b/dev-python/markups/markups-4.0.0.ebuild
index fa3768fdc524..50dbf8a96e43 100644
--- a/dev-python/markups/markups-4.0.0.ebuild
+++ b/dev-python/markups/markups-4.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2f3294adfa68..6fc1a46de4ea 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,3 +2,4 @@ DIST mkdocs-material-9.0.10.gh.tar.gz 10933071 BLAKE2B 702db94a8c91a856ffcf30402
 DIST mkdocs-material-9.0.12.gh.tar.gz 10929135 BLAKE2B 2b8468790c38e40a35b7fd4ff324cde485c1a7f7bc5c748b52b21b34deaca62f397ec056717107dc50024315b9740dc0b9dcce9921fd84c0cda5f9de55068553 SHA512 fd52632e2eb2225d32ac13a48eb0bab8f694644e8369a90ee85902549405b13b2308102ffe6bcb631d4847c7f1b345637d5b86470454eea52487a7b92dd14ab1
 DIST mkdocs-material-9.0.13.gh.tar.gz 10930459 BLAKE2B d3d4b25e2e2b524caa70a47c2cd51cd2c06921beccecb8f76c67f177a72568698056151fb20ee5141df0d6cdeee75192d7a7fc4dc85511501f4d2c8dfe5a3e1c SHA512 cc2abaab0727376ff3b3f3d3099c57f601243520c644dcc48b0c6d671ae543a8b65e8161fa8e4d1199671652a54e14969a7c2470985b0570e63763cf88d63704
 DIST mkdocs-material-9.0.14.gh.tar.gz 10932657 BLAKE2B a43fe024bd4c285801c10a3a45b0e601bc5c338fde51408db8c23cdf84455b606461fffda86d8bcb53374102a32a5efe315467305842a5e9fc5859db26b06b0e SHA512 9821fc1ce6e1b74b920b7c928c9ceb00d8f7489939c58d12c9a7c238ca75b619a23bffe0eccb7653d5303eaf6281e2fbd81392b19ff8f4c1431754544a432297
+DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
new file mode 100644
index 000000000000..eedc60f73616
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 06dca92e0dff..60e327affb80 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1 +1,2 @@
 DIST more-itertools-9.0.0.tar.gz 104237 BLAKE2B 523fe14889862edc2f05da79156914e12984d62168df46630fbe3169ebbe48ba66e018a65bd17dfad54676e5334335dbcda5c442556970442ccc2a792940bcc4 SHA512 a1e73a7a3e4530d070d639baa01c08d91ca11cdab6fec36131764001c2b78f1649e19ddf78ee3c1295f2f9d9951ea7483a4fd1f7c12d5655c3b696db7de35c1e
+DIST more-itertools-9.1.0.tar.gz 107389 BLAKE2B e2f5ba6daf5ee2dbb01a9f2c07f8595418285e8472960054681a551a42e39200e40a2799c644d37a0d8654307c9119b05364e47d590c933e6082fa5be390579c SHA512 635a97caa457ede1b7ea12fd1ee75bd8722e97a089a2d35f143dc77bcbaa2e3793338513af87408476a8a1443367b270ec0d239d652fc8f96f102308e1f3e937
diff --git a/dev-python/more-itertools/more-itertools-9.1.0.ebuild b/dev-python/more-itertools/more-itertools-9.1.0.ebuild
new file mode 100644
index 000000000000..459bd64ffe97
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-9.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="
+	https://github.com/more-itertools/more-itertools/
+	https://pypi.org/project/more-itertools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests unittest
diff --git a/dev-python/mypy/mypy-1.0.1.ebuild b/dev-python/mypy/mypy-1.0.1.ebuild
index af0edc51916c..ea354636609f 100644
--- a/dev-python/mypy/mypy-1.0.1.ebuild
+++ b/dev-python/mypy/mypy-1.0.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
+	' pypy3 python3_{8..10})
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index f61cae68c042..d8602650e030 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1 +1,2 @@
 DIST natsort-8.2.0.tar.gz 145643 BLAKE2B d101ae2fa1cb009892e9712ece87d3825f3fca7970475e46176e5acbc29481ac79d491f1bae0721d85d3e67ecf39e5f54e2a984f0398356f32a5f0ec18a3e98d SHA512 d7e35c48ee36e69812c26b2cd333c57f1ec70c54017c4f51ed06dbb7619afc11cd1d589035faee700e1adf1e6b759b43ee497685fc88518be62c41957e15884e
+DIST natsort-8.3.0.tar.gz 123448 BLAKE2B 7fd480c8bfaceaca7431716e7721acac89d4a5c87a951ecf2754d80062437776eee823d7b94c58e2b9bc6864d9c0f595ee8667c538609c296694a548c126ab58 SHA512 63a65a99c9475e8ae96d722ae4c093cc73034c0dfdd254b24ae02904dd81cc8be36038c8a3fc514080f436d4124847f0f331d06a87c435f0b7b7d1d72313ae0d
diff --git a/dev-python/natsort/natsort-8.3.0.ebuild b/dev-python/natsort/natsort-8.3.0.ebuild
new file mode 100644
index 000000000000..5b947e1cf1a3
--- /dev/null
+++ b/dev-python/natsort/natsort-8.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="
+	https://github.com/SethMMorton/natsort/
+	https://pypi.org/project/natsort/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "sorting results that match most file browsers" "dev-python/pyicu"
+}
diff --git a/dev-python/pdoc3/pdoc3-0.10.0.ebuild b/dev-python/pdoc3/pdoc3-0.10.0.ebuild
index f7c8f5f90348..f8a76f0a2dea 100644
--- a/dev-python/pdoc3/pdoc3-0.10.0.ebuild
+++ b/dev-python/pdoc3/pdoc3-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 981481bfb314..d9cecd3dc380 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1 +1,2 @@
 DIST peewee-3.15.4.gh.tar.gz 908759 BLAKE2B 5bb53598f44c75f4b819d7aa032a2bc812f1e6de415b4cc01e22e521e4881dd409ceaf26435ddfcf08167c5193594917f23b15ae91f037fa4216d78752e77247 SHA512 9042e1c4fffac0c395500597981ab4732383c273e2b7f2b129b2b7702d9762772a219bb848a1f0aff802c468f38327f629df1c49028858451578115cf0811a13
+DIST peewee-3.16.0.gh.tar.gz 1085430 BLAKE2B 3acfbbc9d8cce7e4bd1c0027905f4ca44431f376a243adffbfadd4d3f15b4e729c4736076e8ec72c40261ca269c66d811afb6c25b9d075d5913a13869da4f4dd SHA512 f77a040831bd3189135196ede9748c92af9db21127839dfacd7712586273bdd22c688ca22bfa373805fa1b64f770b7cea850cba53e73f324f25ced1305830409
diff --git a/dev-python/peewee/peewee-3.15.4-r1.ebuild b/dev-python/peewee/peewee-3.15.4-r1.ebuild
new file mode 100644
index 000000000000..3fb7641cfcd8
--- /dev/null
+++ b/dev-python/peewee/peewee-3.15.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-db/sqlite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/peewee/peewee-3.15.4.ebuild b/dev-python/peewee/peewee-3.15.4.ebuild
deleted file mode 100644
index 46e8473aeca8..000000000000
--- a/dev-python/peewee/peewee-3.15.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="
-	https://github.com/coleifer/peewee/
-	https://pypi.org/project/peewee/
-"
-SRC_URI="
-	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.16.0-r1.ebuild b/dev-python/peewee/peewee-3.16.0-r1.ebuild
new file mode 100644
index 000000000000..b2e1e7d16ff7
--- /dev/null
+++ b/dev-python/peewee/peewee-3.16.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-db/sqlite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild b/dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild
index 8bad83e0ff36..a42c3a32392e 100644
--- a/dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild
+++ b/dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYPI_NO_NORMALIZE=1
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="An HTML minification plugin for Pelican, the static site generator"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index f14f35712bfe..868128f27cc4 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -4,4 +4,4 @@ DIST pikepdf-6.2.8.gh.tar.gz 2906054 BLAKE2B 7b639741112857dbf784da7245f905e7666
 DIST pikepdf-6.2.9.gh.tar.gz 2906102 BLAKE2B bd876f506714b237a6010b72c4557bc600e2ee4d6621131c21902ae9f41eb39a9a54a6c08d08dfa84fb3eeec8f2ae7e256d1f1fde533dbc2660a2b415077c8a7 SHA512 2b16e51c999fe1d1f593a9079ae0f13fdaa1955b5d55023169e3a805cbdda07b7ca4108ecea66463a1a253712b851b6dc824aed2c80e5f0caa3ba398d413bd64
 DIST pikepdf-7.0.0.gh.tar.gz 2899924 BLAKE2B 0aeb5b9a26b8f5363ed62ac59e4ffd6dc11aba44c2d3248f8e47c31811cfb810ec7e11150e1bf64ea28242bb7749e3fa2f2fc2bded3af64123e39aa1e4595b8d SHA512 5a11b0a3f35f7d7071ad0553be598f9d2e2d95ce325c080c69e9551e07ebde0102f02990d5ef32be860b468fefc1c29d5f9ff581d1f75321314c52fb2de2f389
 DIST pikepdf-7.1.0.gh.tar.gz 2900167 BLAKE2B 1293e580257a0f077146e1dff37ce825ef504a62aaadbfc466ce77a491bdfc101e01c7f314dbc039f69df08924ad1dab8de74ffedd0675cfc8139895289f6405 SHA512 e8fee8a69c0d6a5d148b3d001bd72be341ae7294401777f06b698d261329850832fdc3ea2b6ab9d8abb9fb99b041fe7a1a5750a22846528c76a03019b3ac4ca5
-DIST pikepdf-7.1.1.gh.tar.gz 2901140 BLAKE2B 50b61eb49ecf6ded00a5e1af1a23d6755622cfcab533b132c8e75419a17aaa3f2d1806070611ec822475fddb9176da06cff1bef178bbc98002bf50198d3d1d2a SHA512 50a6fddc8291cc54fbb3249bc05e84b7e78b2f50055314aabc7beed78116a02174afee29332ea94793f961d8e586826f178c7fea4060db07799cfeaa6fffbe03
+DIST pikepdf-7.1.1.tar.gz 2911088 BLAKE2B 0c65830ce4ec8f36814dd2a523dcc753380df7b6e4ce176b0e61e1e7f5f8bbfa01c9ef1ab093cbfeaf7dd1c67ada4e7dca53cf6da8b04cbceca825276179627b SHA512 e59bf20008df058aa2bbccedf71294ffc39a7aa774eeebcc33214ec7864be461959317bbd92f3df415690bb4ef3bbb63f9c05c613bcb9023b680637c07f3bd75
diff --git a/dev-python/pikepdf/pikepdf-7.1.1.ebuild b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
index 9cf479f7a649..6f3828a75649 100644
--- a/dev-python/pikepdf/pikepdf-7.1.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
@@ -4,21 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-MY_P=${P/_p/.post}
 DESCRIPTION="Python library to work with pdf files based on qpdf"
 HOMEPAGE="
 	https://github.com/pikepdf/pikepdf/
 	https://pypi.org/project/pikepdf/
 "
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
diff --git a/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
index be43bfffaec1..7b1de554a840 100644
--- a/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
@@ -18,14 +18,15 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python"
 	inherit git-r3
 
-	PKGCRAFT_VERSION_MIN="9999"
 	PKGCRAFT_VERSION_MAX="9999"
+	PKGCRAFT_VERSION_MIN="9999"
 else
 	SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz"
 	S="${WORKDIR}"/${P/-python}
 
 	KEYWORDS="~amd64"
 
+	PKGCRAFT_VERSION_MAX="9999"
 	PKGCRAFT_VERSION_MIN="0.0.6"
 fi
 
@@ -34,6 +35,7 @@ SLOT="0"
 IUSE="+examples"
 
 RDEPEND="
+	<sys-libs/pkgcraft-${PKGCRAFT_VERSION_MAX}
 	>=sys-libs/pkgcraft-${PKGCRAFT_VERSION_MIN}:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pkgcraft/pkgcraft-9999.ebuild b/dev-python/pkgcraft/pkgcraft-9999.ebuild
index be43bfffaec1..3016e20be3d3 100644
--- a/dev-python/pkgcraft/pkgcraft-9999.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-9999.ebuild
@@ -18,14 +18,15 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python"
 	inherit git-r3
 
-	PKGCRAFT_VERSION_MIN="9999"
 	PKGCRAFT_VERSION_MAX="9999"
+	PKGCRAFT_VERSION_MIN="9999"
 else
 	SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz"
 	S="${WORKDIR}"/${P/-python}
 
 	KEYWORDS="~amd64"
 
+	PKGCRAFT_VERSION_MAX="9999"
 	PKGCRAFT_VERSION_MIN="0.0.6"
 fi
 
@@ -34,11 +35,12 @@ SLOT="0"
 IUSE="+examples"
 
 RDEPEND="
+	<sys-libs/pkgcraft-${PKGCRAFT_VERSION_MAX}
 	>=sys-libs/pkgcraft-${PKGCRAFT_VERSION_MIN}:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-python/cython
+	>=dev-python/cython-3.0.0_beta1
 	dev-python/setuptools_scm
 	virtual/pkgconfig
 "
diff --git a/dev-python/pluginbase/pluginbase-1.0.1-r1.ebuild b/dev-python/pluginbase/pluginbase-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..7b3d8dd18f94
--- /dev/null
+++ b/dev-python/pluginbase/pluginbase-1.0.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Support library for building plugins sytems in Python"
+HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_test() {
+	cd tests || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pluginbase/pluginbase-1.0.1.ebuild b/dev-python/pluginbase/pluginbase-1.0.1.ebuild
index c29ca3b56bd5..09171d3d95c2 100644
--- a/dev-python/pluginbase/pluginbase-1.0.1.ebuild
+++ b/dev-python/pluginbase/pluginbase-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index ee30b77b2b53..8f1544872239 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1 +1,2 @@
 DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
+DIST pooch-1.7.0.tar.gz 57457 BLAKE2B d85fc3cc707bfa639f46bf75b89dd31714f7a4f64a90ff7a6c92b792a8209e66a5fffb62912a336cd481330c37c0037df116d27ea06808bf02f1039e2aac930b SHA512 60126b893a9a1422aad12349143fbe72e485004f79b06da752f51ae374f375efae693304210c8d62b211433d7ce75fab53a50a6f267b1952df83fdccc2de13a7
diff --git a/dev-python/pooch/pooch-1.7.0.ebuild b/dev-python/pooch/pooch-1.7.0.ebuild
new file mode 100644
index 000000000000..2cc8a7f0a32f
--- /dev/null
+++ b/dev-python/pooch/pooch-1.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Manage your Python library's sample data files"
+HOMEPAGE="
+	https://github.com/fatiando/pooch/
+	https://pypi.org/project/pooch/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.5.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Needs network
+	pooch/tests/test_core.py::test_check_availability_invalid_downloader
+	pooch/tests/test_core.py::test_load_registry_from_doi
+	pooch/tests/test_core.py::test_load_registry_from_doi_zenodo_with_slash
+	pooch/tests/test_downloaders.py::test_invalid_doi_repository
+	pooch/tests/test_downloaders.py::test_doi_url_not_found
+	pooch/tests/test_downloaders.py::test_figshare_url_file_not_found
+	pooch/tests/test_downloaders.py::test_doi_downloader
+)
+
+### docs no included in pypi tarball
+# distutils_enable_sphinx doc \
+#	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -k "not network"
+}
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index dc82e5ed2afc..cd3ae71a5d89 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1,2 +1,3 @@
 DIST prompt_toolkit-3.0.36.tar.gz 423863 BLAKE2B 1917ba618e4111f3d2d85f1063e3e34bc47cc1f60e1703be54cf92b98f72eb3cb3062381e16fd324953435ed67ce0711274f6d8faf735bf966283cc2201f1b65 SHA512 db77a3acb8a985b1df3d82eca7ac30fbd5e85bf3bc77f0f6da13af8064a7d4dc9d7fd57be3eabe5eecce610c8220ad493d296f2e425a8f69d62fddd1e419af1e
 DIST prompt_toolkit-3.0.37.tar.gz 421637 BLAKE2B d8b0b8be846ff0ee9e35992d25e6153429a6d6316ea601f386c0cfeeec96119f9ddf109ca5a32e14a9ecae7badef808220722b5846cc984f2fd1dc7a18e3c763 SHA512 00e8b0d768c1449afd1c771a1b71611f291052ebed08c329cb9b34156588315b1d1202ac748293e6635c9ee78415068155565e69c2e632ae5513b61b670bd3fb
+DIST prompt_toolkit-3.0.38.tar.gz 422834 BLAKE2B 484ff9414d47f6f2188b8d50c6fcbe16ed850a8be880dfc60e9a3b750a26490f273b118d7bf0f1219530a59998273270b3b210750c35d00d7551ba15bb3f7e64 SHA512 eed2a73501d7ac413986f069564295db9eced3be4853a73c687e511ce1cf8c32c7c9bff4f851787e7910ed05818d4eb39556718c01f30e3ba8bfafe67d631a38
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.38.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.38.ebuild
new file mode 100644
index 000000000000..ca385c35243a
--- /dev/null
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.38.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pulsectl/pulsectl-22.3.2.ebuild b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
index 248a823fd025..6607acd14b45 100644
--- a/dev-python/pulsectl/pulsectl-22.3.2.ebuild
+++ b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..10} )
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
 inherit distutils-r1 pypi
 
@@ -18,6 +18,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="media-sound/pulseaudio"
+RDEPEND="
+	media-sound/pulseaudio
+"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch b/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch
new file mode 100644
index 000000000000..d24999e7273a
--- /dev/null
+++ b/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch
@@ -0,0 +1,66 @@
+From 35a279ecb9af41a6f95ddbc6a0f1beaa2472d165 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 26 Feb 2023 01:04:34 +0100
+Subject: [PATCH] _build_tables: Invalidate cache before importing generated
+ modules (#494)
+
+Make sure to invalidate finder caches before trying to import generated
+modules.  This is necessary according to the Python documentation:
+https://docs.python.org/3/library/importlib.html#importlib.invalidate_caches
+
+This fixes a hard-to-reproduce bug that Python would be unable to find
+just-generated `lextab.py` if mtime of the current directory did not
+change from the moment the script was started.  This could
+e.g. be the case if one has second-precision timestamps and removes
+the generated file just before starting the build, e.g.:
+
+    $ rm pycparser/lextab.py; python -m build -nw
+
+It could also be reproduced easier by doing something like:
+
+    $ cd pycparser
+    $ touch .; python -B _build_tables.py
+    Traceback (most recent call last):
+      File "/var/tmp/pycparser/pycparser/_build_tables.py", line 38, in <module>
+        import lextab
+    ModuleNotFoundError: No module named 'lextab'
+
+This is because the first command (`rm` or `touch`) updates the mtime
+of the directory to the current time.  If the script is run fast enough,
+it manages to scan the directory and then write the new `lextab.py`
+within the same second.  As a result, mtime of the directory after
+writing the new file is the same as when the script was started, finder
+does not invalidate the cache and assumes that `lextab.py` does not
+exist since it did not exist when the directory was scanned earlier.
+
+This potentially fixes #493.
+
+It was originally reported on https://bugs.gentoo.org/701878.
+Thanks to Gary E. Miller for patience in reproducing the problem
+and proxy-debugging it for me, as well as testing the final patch before
+submission.
+---
+ pycparser/_build_tables.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pycparser/_build_tables.py b/pycparser/_build_tables.py
+index 958381ad..4f371079 100644
+--- a/pycparser/_build_tables.py
++++ b/pycparser/_build_tables.py
+@@ -13,6 +13,7 @@
+ # Insert '.' and '..' as first entries to the search path for modules.
+ # Restricted environments like embeddable python do not include the
+ # current working directory on startup.
++import importlib
+ import sys
+ sys.path[0:0] = ['.', '..']
+ 
+@@ -32,6 +33,8 @@
+ 
+ # Load to compile into .pyc
+ #
++importlib.invalidate_caches()
++
+ import lextab
+ import yacctab
+ import c_ast
diff --git a/dev-python/pycparser/pycparser-2.21-r1.ebuild b/dev-python/pycparser/pycparser-2.21-r1.ebuild
index 1b0d8e6f6901..3848eaeedd3a 100644
--- a/dev-python/pycparser/pycparser-2.21-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.21-r1.ebuild
@@ -30,6 +30,11 @@ BDEPEND="
 distutils_enable_tests unittest
 
 python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/eliben/pycparser/pull/494
+		"${FILESDIR}"/${P}-lextab-cache.patch
+	)
+
 	# remove the original files to guarantee their regen
 	rm pycparser/{c_ast,lextab,yacctab}.py || die
 
diff --git a/dev-python/pycparser/pycparser-2.21-r2.ebuild b/dev-python/pycparser/pycparser-2.21-r2.ebuild
index edebc42725b5..08416104b7d4 100644
--- a/dev-python/pycparser/pycparser-2.21-r2.ebuild
+++ b/dev-python/pycparser/pycparser-2.21-r2.ebuild
@@ -29,6 +29,11 @@ BDEPEND="
 distutils_enable_tests unittest
 
 python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/eliben/pycparser/pull/494
+		"${FILESDIR}"/${P}-lextab-cache.patch
+	)
+
 	# remove the original files to guarantee their regen
 	rm pycparser/{c_ast,lextab,yacctab}.py || die
 
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 6920e5e656b4..bc632c79f752 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.16.0.gh.tar.gz 16548063 BLAKE2B 4adf1c3027fe593e9a01eb0ea3da1f81ddcedd731a284a3f98dd02f07ba9eaa80e906bbcea1432fe64f08f0857033cfdbe43acd415fb3081718a301fbbb5ca16 SHA512 945c5bda213a08ba12a0ace8e4bf76730461f8dfce94fa426a97dfab846234ea06e121b176ae823d0f7da9316de50aafde6507a2f17efec4d4a0629d4d68d870
 DIST pycryptodome-3.17.0.gh.tar.gz 16714317 BLAKE2B a7a96ba4d10078ba4d9bc02b384c982ad7307065fd6c9118def43bebc073eccdfc11a766742e5d0207e9cce32aca2fe3da51f8a59964de8c15db6808cc2aae03 SHA512 c0a0754c0dd1d8138e8dd27c034e3f3469237eb5f205d86d0c5e2377fd7672c6ed0df9717292a73d380daaabe88c3be80b575ca1149f4c70f08d82aed0d4b39c
diff --git a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
deleted file mode 100644
index 84307c43e468..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="
-	https://www.pycryptodome.org/
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/
-"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2 Unlicense"
-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"
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=dev-libs/libtomcrypt-1.18.2-r1:=
-"
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto
-"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-)
-
-python_prepare_all() {
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
-	"${EPYTHON}" - <<-EOF || die
-		import sys
-		from Crypto import SelfTest
-		SelfTest.run(verbosity=2, stream=sys.stdout)
-	EOF
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.17.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.17.0.ebuild
index 0991832e809c..84307c43e468 100644
--- a/dev-python/pycryptodome/pycryptodome-3.17.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.17.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 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"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 876ac8788f96..12303b7d4f75 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1 @@
-DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
 DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
diff --git a/dev-python/pycurl/files/7.44-fix-tests.patch b/dev-python/pycurl/files/7.44-fix-tests.patch
deleted file mode 100644
index d5d900100086..000000000000
--- a/dev-python/pycurl/files/7.44-fix-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1
-From: Samuel Henrique <samueloph@debian.org>
-Date: Sat, 30 Apr 2022 23:02:34 +0100
-Subject: [PATCH] tests: fix error message on error_test (for curl >= 7.83)
-
-curl 7.83.0 removed exclamation marks from a few error messages, curl commit:
-https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7
-
-This commit adds support for the new curl release while also supporting the previous ones.
---- a/tests/error_test.py
-+++ b/tests/error_test.py
-@@ -29,7 +29,8 @@ def test_pycurl_error_libcurl(self):
-             err, msg = exc.args
-             self.assertEqual(pycurl.E_URL_MALFORMAT, err)
-             # possibly fragile
--            self.assertEqual('No URL set!', msg)
-+            # curl < 7.83.0 has an exclamation mark in this error message
-+            self.assertIn(msg, ['No URL set!', 'No URL set'])
-         else:
-             self.fail('Expected pycurl.error to be raised')
-     
-@@ -43,9 +44,10 @@ def test_pycurl_errstr_type(self):
-             self.curl.perform()
-         except pycurl.error:
-             # might be fragile
--            self.assertEqual('No URL set!', self.curl.errstr())
-+            # curl < 7.83.0 has an exclamation mark in this error message
-+            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
-             # repeated checks do not clear value
--            self.assertEqual('No URL set!', self.curl.errstr())
-+            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
-             # check the type - on all python versions
-             self.assertEqual(str, type(self.curl.errstr()))
-         else:
diff --git a/dev-python/pycurl/pycurl-7.45.1.ebuild b/dev-python/pycurl/pycurl-7.45.1.ebuild
deleted file mode 100644
index d8fd41fb47b5..000000000000
--- a/dev-python/pycurl/pycurl-7.45.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings for curl/libcurl"
-HOMEPAGE="
-	http://pycurl.io/
-	https://github.com/pycurl/pycurl/
-	https://pypi.org/project/pycurl/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/7.44-fix-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# docs installed into the wrong directory
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# TODO
-	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
-		-i tests/option_constants_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug #510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_DESELECT=(
-		# refcounting tests are unreliable
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
-	)
-
-	epytest -p flaky tests
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.45.2.ebuild b/dev-python/pycurl/pycurl-7.45.2.ebuild
index 6b9568f444c6..b0b1d57414d6 100644
--- a/dev-python/pycurl/pycurl-7.45.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 toolchain-funcs
+inherit distutils-r1 pypi toolchain-funcs
 
 DESCRIPTION="Python bindings for curl/libcurl"
 HOMEPAGE="
@@ -14,11 +14,10 @@ HOMEPAGE="
 	https://github.com/pycurl/pycurl/
 	https://pypi.org/project/pycurl/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index afb51634a1d4..c294f2807ccf 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,2 +1,3 @@
 DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
+DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
diff --git a/dev-python/pygame/pygame-2.2.0.ebuild b/dev-python/pygame/pygame-2.2.0.ebuild
new file mode 100644
index 000000000000..98583ae7b73f
--- /dev/null
+++ b/dev-python/pygame/pygame-2.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="
+	https://www.pygame.org/
+	https://github.com/pygame/pygame/
+	https://pypi.org/project/pygame/
+"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/portmidi
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
+	!X? ( media-libs/libsdl2[threads] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)
+"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig
+"
+# util-linux provides script
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)
+"
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py || die
+}
+
+python_configure_all() {
+	find src_c/cython -name '*.pyx' -exec touch {} + || die
+	"${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 8fce3498b75f..0895eae045cf 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,2 +1,3 @@
 DIST pyglet-1.5.27.gh.tar.gz 6532179 BLAKE2B f1dc668530a69e275860befe11f4c86003c5de2dadede706df7abac9eb6fb1729ea030c7053f0149926f3ffdd12985d9abea4afac65de3b6b7541fe871eda369 SHA512 98896dab06873cbf3cdd0d4015cb0b9e062cffb1110908bd422ecdc4f0e16943adc8a4986e7dbfdae4392e82ac115bad6f937896e166989ad2c4d73a0f45c8be
 DIST pyglet-2.0.4.gh.tar.gz 6172461 BLAKE2B aa52844336b2fa34c6d75c8ee45070b7d8b85c283e374daeffa21367d6ddefaf39c22258eb00c666dad1f5ee8d157c0b1716a5cd1329942e98538e8172ed6137 SHA512 c26c59b9f7e6f2b1bd20456917ed50d6b70169dd2af5b92cc61d0e0515dc7c989eba9b41e00a106510d53e8ea218cde185f8b5038428490f3b9b3623a2f40207
+DIST pyglet-2.0.5.gh.tar.gz 6174681 BLAKE2B 6f4f80cee2984148a7579ad02ff86e6cc1c151688ace0153cf3a518eba3004518f900b0297877a86278f4159c342f190d22702bf1ebcaa254c4bef19e1ac0844 SHA512 54bd6630a61606a02103a6ebc9deaba1b1716ff4acbc3418f33496cd238421f6c015affd925ed8f61107a70ba373fe9cc5f89ea3c1b4050f44513b56d28eb11d
diff --git a/dev-python/pyglet/pyglet-2.0.5.ebuild b/dev-python/pyglet/pyglet-2.0.5.ebuild
new file mode 100644
index 000000000000..0a8fe221c50a
--- /dev/null
+++ b/dev-python/pyglet/pyglet-2.0.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="
+	https://pyglet.org/
+	https://github.com/pyglet/pyglet/
+	https://pypi.org/project/pyglet/
+"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	local EPYTEST_DESELECT=(
+		# lacking device/server permissions
+		tests/unit/media/test_listener.py::test_openal_listener
+		tests/unit/media/test_listener.py::test_pulse_listener
+		# fragile to system load
+		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
+		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
+	)
+	if [[ ${EPYTHON} == python3.11 ]]; then
+		EPYTEST_DESELECT+=(
+			# broken test
+			# https://github.com/pyglet/pyglet/issues/606
+			tests/unit/test_events.py::test_push_handlers_instance
+		)
+	fi
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygobject/pygobject-3.42.2.ebuild b/dev-python/pygobject/pygobject-3.42.2.ebuild
index 5a7978ffe59f..fbabfa8de064 100644
--- a/dev-python/pygobject/pygobject-3.42.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit gnome.org meson virtualx xdg distutils-r1
 
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-libs/atk[introspection]
+		>=app-accessibility/at-spi2-core-2.46.0[introspection]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		x11-libs/gdk-pixbuf:2[introspection,jpeg]
 		x11-libs/gtk+:3[introspection]
diff --git a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
index 1df296187ae4..a161439ad7b3 100644
--- a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,11 +7,13 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/sbraz/pymediainfo/
+	https://pypi.org/project/pymediainfo/
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyocr/pyocr-0.8.3.ebuild b/dev-python/pyocr/pyocr-0.8.3.ebuild
index fddb70bcf83d..043633454a4a 100644
--- a/dev-python/pyocr/pyocr-0.8.3.ebuild
+++ b/dev-python/pyocr/pyocr-0.8.3.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="An optical character recognition (OCR) tool wrapper"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -34,4 +33,9 @@ RDEPEND+="
 	tesseract? ( app-text/tesseract )
 "
 
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+src_prepare() {
+	# workaround setuptools failing due to version being None
+	# https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/issues/127
+	sed -i -e '/version=version/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 656ac40ed128..0c4ead2a4c43 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,4 +1,5 @@
 DIST pypdf-3.3.0.gh.tar.gz 6803536 BLAKE2B ff70995882581c816fbf7410232c68e9649632161b4927543924a11b1a0a816f1178be399079e32078fe8d89a2aa9cd0eb1562409dc8e7bd388cad3afde37198 SHA512 5db25d6c4b41a1d19b45fa907f53e0106e01c93eb4152079dc4ffbd7bf28fbf8915bf0e3bf1af4a371e805657884fe2c42de4856944085ca7bc07a477f3ba588
 DIST pypdf-3.4.0.gh.tar.gz 6931831 BLAKE2B 037ac998cc1e3d078281b64183197678a80345731f6d4691b00f9e546eb61eaa34c4d7f4b704191c887975517da73359983f1b7405776e99257f79b1604dafc0 SHA512 9bee70a039c42533b600f1e95e28a4889d7df212bae18deca7d88501008d3a3e2b4d7fe36134e947cb14b0acc650126688c358ce2b662917a4c6df46241db1ab
 DIST pypdf-3.4.1.gh.tar.gz 6930245 BLAKE2B 9e8a5a1ebe95b64c9274ce6b0ea252d65f41d4b6791d6c6acf87f810794892337aed13ddc9b77f05a404fe94b3d9c2444f2a06c4feea9661204e71684bbbbfd5 SHA512 e2e3fa74bc6e96afc5999429e7603dd3ab8e6443b6259e456bc6d90cb2d7a15a484b226e218478c1e92cfd7fe23c93247f212568c6fcd51d80afde32b83460ba
+DIST pypdf-3.5.0.gh.tar.gz 7181507 BLAKE2B 8f5c129613ed12a9eaa90cf0e6fa189b0fc5bf109f26b8cc35ff1550e916b0635715359b2ece9c3c0243095c2e802474e99fe4c59d16b0f75b4375fb2ce07e5d SHA512 a8a0fad3fd08d88738088a06df4f1cbf419571e9e817c6097ce8bdcf7b1dd32f478ac712879cabceb7034f4e9a421f887ff117a1812782eadb670c8043aff86c
 DIST pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
diff --git a/dev-python/pypdf/pypdf-3.5.0.ebuild b/dev-python/pypdf/pypdf-3.5.0.ebuild
new file mode 100644
index 000000000000..e9581fbc5b9a
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.5.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=0fe84b30ed33ff3daa9293e44349b8618f135699
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/pypdf/
+	https://github.com/py-pdf/pypdf/
+"
+SRC_URI="
+	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+S=${WORKDIR}/pypdf-${PV}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RESTRICT="test"
+# 150+ tests require network, too many to deselect
+PROPERTIES="test_network"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index de5d9083b178..ebda7445a38c 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,2 +1,2 @@
-DIST pypy3.9-gentoo-patches-7.3.11.tar.xz 6444 BLAKE2B adcc1ae4c3ae2c5317a05d6de51785945625d8bcc7cb35bd6608fa80f09b37c483c95663eacb0353013a5abec308d25b12666699c65512f5f3a6d7345f2b5b18 SHA512 f2064ecffa09ba23f5f8c281ca4c8c0740cb6b57185d66c02eec2bcb77cfb566b1a2db4f52c472bcaf0d5fb759ee8003b27761af37785d12465c2010fd73c49d
+DIST pypy3.9-gentoo-patches-7.3.11_p1.tar.xz 7480 BLAKE2B ffb478402e82244af25dd67bb9e21abb4bb186d98495899f8ca8f323bdf27a77356e40efd33217a5238ef86f6156fc7d85c681a747ea5a35bd73bab659972986 SHA512 6c3ee21b51145907c2434f740e9849ac02ad83203fdcb2802b97ba199f37d08297d8016f659069bea3f0854ace30aefb947af4f057cbc91332106d9fc1389cf4
 DIST pypy3.9-v7.3.11-src.tar.bz2 23460769 BLAKE2B fa8a827c28813243926c8689addb008c0a43acdc3f81a18749a8f2c1926b6294f2c0c95a4c315e3b77ce84b4f337af7a0bce5daf8dcb60ead965532d4af183cb SHA512 33c978ffbeeb39453028d1d1646ccfdace062ce48a5d939245bea41643038dd3687e80e34f88fa0622bcb175d7dd78f75cbe36b24229c8052f09d2d17dcdfd8c
diff --git a/dev-python/pypy3/pypy3-7.3.11-r1.ebuild b/dev-python/pypy3/pypy3-7.3.11_p1.ebuild
similarity index 100%
rename from dev-python/pypy3/pypy3-7.3.11-r1.ebuild
rename to dev-python/pypy3/pypy3-7.3.11_p1.ebuild
diff --git a/dev-python/pyrate-limiter/Manifest b/dev-python/pyrate-limiter/Manifest
index d4c433f1a851..5835c04acc67 100644
--- a/dev-python/pyrate-limiter/Manifest
+++ b/dev-python/pyrate-limiter/Manifest
@@ -1 +1,3 @@
+DIST pyrate-limiter-2.10.0.gh.tar.gz 71838 BLAKE2B 3b8fd16684268870991c3a731c5497802c6f7be51e57bc983a14a7484fad2d0983613304fa061fdb70a3e6645d17fe37fbd68e9ddeca57bc7bd97fef4a5d8585 SHA512 b0090b2d80d40ba2f86ac7b5c5612a35fa885b52a87d783aa9726782275e79ca8d54a9a44b1f0dd43c98bf2355f4c17e1686d7c7f806934ea492b67f66b06ffe
 DIST pyrate-limiter-2.8.2.gh.tar.gz 51233 BLAKE2B a9a8bbf123596c7c64f60ae2c9d4e23a394dae6d18a8d09c0ec0b289bbbfce9dacee523726b906a30cf17fd7243b3fa1d1f2dc60af1bec67dc242d944535a5fd SHA512 3ff703347a86f6a91cf6b9c8edce3017cf88f2373961ba235c2f521d0112b0116951be7314b95d737ef0bec5cb6bae9908874fafe4060eb773cf0577e2ddbdb3
+DIST pyrate-limiter-2.9.1.gh.tar.gz 71544 BLAKE2B 2f87f998abdb891673931f91a9980f5876f58a2225ca41af6ec390e59bd326e8614162549946552b22fea093f89f5c2a219eaa9223719dd4db9023944f040da2 SHA512 461b1627574ce09817b434ce0d47e3bbcb549fcd8176623b87640089c1dd9bb45030ae1c944ffd7906b04f9b1ba2977c841c1da9483619bc092570b86a49bcd6
diff --git a/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild b/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild
new file mode 100644
index 000000000000..b8c9c6a33c68
--- /dev/null
+++ b/dev-python/pyrate-limiter/pyrate-limiter-2.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Rate-Limiter using Leaky-Bucket Algorimth Family"
+HOMEPAGE="
+	https://github.com/vutran1710/PyrateLimiter/
+	https://pypi.org/project/pyrate-limiter/
+"
+SRC_URI="
+	https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/PyrateLimiter-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/redis[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/django-redis[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Optional dependency redis-py-cluster not packaged
+	"tests/test_02.py::test_redis_cluster"
+	# Python 3.11 is slightly faster, leading to a non-critical failure here
+	"tests/test_concurrency.py::test_concurrency[ProcessPoolExecutor-SQLiteBucket]"
+)
+
+# TODO: package sphinx-copybutton
+# distutils_enable_sphinx docs \
+# 	dev-python/sphinx-autodoc-typehints \
+# 	dev-python/furo \
+# 	dev-python/myst_parser \
+# 	dev-python/sphinxcontrib-apidoc
+distutils_enable_tests pytest
+
+src_prepare() {
+	# workaround installing LICENSE into site-packages
+	sed -i -e 's:^include:exclude:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyrate-limiter/pyrate-limiter-2.9.1.ebuild b/dev-python/pyrate-limiter/pyrate-limiter-2.9.1.ebuild
new file mode 100644
index 000000000000..b8c9c6a33c68
--- /dev/null
+++ b/dev-python/pyrate-limiter/pyrate-limiter-2.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Rate-Limiter using Leaky-Bucket Algorimth Family"
+HOMEPAGE="
+	https://github.com/vutran1710/PyrateLimiter/
+	https://pypi.org/project/pyrate-limiter/
+"
+SRC_URI="
+	https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/PyrateLimiter-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/redis[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/django-redis[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Optional dependency redis-py-cluster not packaged
+	"tests/test_02.py::test_redis_cluster"
+	# Python 3.11 is slightly faster, leading to a non-critical failure here
+	"tests/test_concurrency.py::test_concurrency[ProcessPoolExecutor-SQLiteBucket]"
+)
+
+# TODO: package sphinx-copybutton
+# distutils_enable_sphinx docs \
+# 	dev-python/sphinx-autodoc-typehints \
+# 	dev-python/furo \
+# 	dev-python/myst_parser \
+# 	dev-python/sphinxcontrib-apidoc
+distutils_enable_tests pytest
+
+src_prepare() {
+	# workaround installing LICENSE into site-packages
+	sed -i -e 's:^include:exclude:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 26740ccbcbc7..2f5442783337 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,2 +1 @@
-DIST pyrsistent-0.19.2.tar.gz 102438 BLAKE2B aa231a7c300d2f1501abdf2fc74dfa9672ad8000d87e3fa9beaa51aff4816dad4f142e9a2e609dee402352cf5a0477b6d4dc31460a71e7d98a592604fcaa97d6 SHA512 fdaadb65e72db4f90ecb1526fd68eb2b60b278071978d4b5a1b1379be83c60d30fd653dd7e6527c217d4e50f05c7d641290172aa5d5e4741dfe5e08f0b0c282b
 DIST pyrsistent-0.19.3.tar.gz 102640 BLAKE2B 60c5ef9d3f26c4529d05804df13453c75b6ff70e12fbbbbe22312686da929766fc903b18ca77d626192e1f3fc9fbdfdbbbd4eef102f1504b38feeeedf00450d5 SHA512 6bb70b6fd65b5cd9f961a3199c2d90725aaa66fb869e4eba2143735e2f3a7e4ecdc782b3498acc2d92e263c3bed14cec8cc77324f4ebd08c300ba6735db5ecf7
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
deleted file mode 100644
index ed5e8a0b7204..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="
-	https://github.com/tobgu/pyrsistent/
-	https://pypi.org/project/pyrsistent/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
index 39639be0862c..0122efd36c2b 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Persistent/Functional/Immutable data structures"
 HOMEPAGE="
 	https://github.com/tobgu/pyrsistent/
 	https://pypi.org/project/pyrsistent/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index e8784419c177..4559b2357a85 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,2 +1 @@
-DIST pysol_cards-0.14.2.tar.gz 18113 BLAKE2B 63704d97598927b600a8f34eb46565e8bf927bc27cd409579de6ac5f4b9154a881b1727c30a61381c169a267b313a4aabfe796a98341208ffb9a8327ca83ec71 SHA512 5e296819ebd6a874175c098b0000524defeb22456bdce961270ecfe26de48fb0d5f5b56eeb3457a12c51f72c9d90abdd35ebaf91244ceaa7d3034caff2b59386
 DIST pysol_cards-0.14.3.tar.gz 18322 BLAKE2B 730da3d597377305c86e528606edd3db9f07390d333283a228c2411d35f2e19da61d27f21e3d2650b84ba0f4b0d48e87cf7004d518845fe2a40b041e286d5a28 SHA512 00bb25393eab855d7444324b33e0561bfbcc86ae53306b58623fa15ea005378aff6af51846aab4634b43fdba5497c3872c32baf3a51013ee01d5ab2d7a7a9d51
diff --git a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
deleted file mode 100644
index 1310817c6113..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Deal PySol FreeCell cards"
-HOMEPAGE="https://pypi.org/project/pysol-cards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
index 6e95a5f30b3f..a329f39e97ae 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
@@ -42,11 +42,11 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	local -x EPYTEST_IGNORE=()
+	local -x EPYTEST_DESELECT=()
 
 	# This is the only test which actually fails if salt cannot be imported
 	if [[ ${EPYTHON} == python3.11 ]]; then
-		EPYTEST_IGNORE+=(
+		EPYTEST_DESELECT+=(
 			test/test_backends.py::test_backend_importables
 		)
 	fi
diff --git a/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
index 9b169a2d88d0..6fdc73564714 100644
--- a/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
+++ b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-daemon/python-daemon-2.3.2.ebuild b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
index 63029125b3a8..4d5e584703d1 100644
--- a/dev-python/python-daemon/python-daemon-2.3.2.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # build system and tests use GPL-3.0+ but none of these files are installed
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/lockfile[${PYTHON_USEDEP}]
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 142f2e7924a6..8e87bc3fd56d 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1 +1,2 @@
+DIST python-gammu-3.2.4.gh.tar.gz 144136 BLAKE2B ef06b78568e9b88da95d09029191a2de0c4e26cb6b222326bffd0134a9c7eb743bab20201347d3be8a81db43f6005ec2a0550e1976a59de9ee9202c733ae41e0 SHA512 9d76b402c50018cc52476376952edebb6b0934aa374ea2a2177f5497d0949fcc77644aa2a35c7402b3f2179962d903409b7b1949c5e85a0e5130058d34f89664
 DIST python-gammu-3.2.4.tar.gz 144136 BLAKE2B ef06b78568e9b88da95d09029191a2de0c4e26cb6b222326bffd0134a9c7eb743bab20201347d3be8a81db43f6005ec2a0550e1976a59de9ee9202c733ae41e0 SHA512 9d76b402c50018cc52476376952edebb6b0934aa374ea2a2177f5497d0949fcc77644aa2a35c7402b3f2179962d903409b7b1949c5e85a0e5130058d34f89664
diff --git a/dev-python/python-gammu/python-gammu-3.2.4-r1.ebuild b/dev-python/python-gammu/python-gammu-3.2.4-r1.ebuild
new file mode 100644
index 000000000000..9ac1f19a9373
--- /dev/null
+++ b/dev-python/python-gammu/python-gammu-3.2.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Gammu"
+HOMEPAGE="
+	https://wammu.eu/python-gammu/
+	https://github.com/gammu/python-gammu/
+	https://pypi.org/project/python-gammu/
+"
+SRC_URI="
+	https://github.com/gammu/python-gammu/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=app-mobilephone/gammu-1.34.0
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		$(python_gen_impl_dep sqlite)
+		app-mobilephone/gammu[dbi]
+	)
+"
+
+DOCS=( AUTHORS NEWS.rst README.rst )
+
+distutils_enable_tests unittest
+
+python_test() {
+	rm -rf gammu || die
+	eunittest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docompress -x /usr/share/doc/${P}/examples
+		dodoc -r examples
+	fi
+}
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 e6403c34e7d8..6319c7914137 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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild
index b0f9a2826d4a..7a9c2d8d1ade 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 IUSE="all-plugins"
 
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
index 3fb93cebd68d..014a0708ee5c 100644
--- a/dev-python/python-mpv/Manifest
+++ b/dev-python/python-mpv/Manifest
@@ -1 +1,2 @@
 DIST python-mpv-1.0.1.tar.gz 210008 BLAKE2B 3ba95ac4d3219615c80ea475c1f6dc3acd608a8ded919eea55efac8bb44a8946c959a2b39473e6c9e80fa1a4e52f525d6ef9871e3eb4b2664aeb1460208bc677 SHA512 16a6e93b63f30e535c1e3bd77702d7c703dd9c0a6a689f09e689663cac04e587bdc2135612062d791ffb38c709bc289d0297ebf9f1ddaf9b1771f25eae225f1b
+DIST python-mpv-1.0.2.gh.tar.gz 210975 BLAKE2B 1a364761405e430ed91f597e15aae7f6c221980c2ed9ce0152109486d1fb79ebb7b6257c79bfef34d72468bcf335e8e514324bdd10982096a64f8949b4bca261 SHA512 62a1c682de8d0308a80b66d6f435fba8563abc84b16670c3ef55cc3d9295fd3ead7c68d99e64c06734c5be9017549a53bd760ca201146427abcfbf7aca610b7a
diff --git a/dev-python/python-mpv/python-mpv-1.0.2.ebuild b/dev-python/python-mpv/python-mpv-1.0.2.ebuild
new file mode 100644
index 000000000000..194d0f3edd53
--- /dev/null
+++ b/dev-python/python-mpv/python-mpv-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to the mpv media player"
+HOMEPAGE="https://github.com/jaseg/python-mpv"
+SRC_URI="https://github.com/jaseg/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/mpv[libmpv]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/jaseg/python-mpv/issues/209
+	EPYTEST_DESELECT=(
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_negative
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_positive
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_shutdown
+		tests/test_mpv.py::TestLifecycle::test_wait_for_prooperty_event_overflow
+		tests/test_mpv.py::TestLifecycle::test_event_callback
+	)
+	virtx epytest
+}
diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest
index cdb993e00fa1..7ab83c256204 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1 +1,2 @@
 DIST python-multipart-0.0.5.gh.tar.gz 48018 BLAKE2B cfff5c1c57ada3ba3d50da71273435781d62d3907ca1b7e6180cd319f2680258b3e1e278dff760106e7ca9c116f4c5c7adf957601d6d8465bf300e6211b83773 SHA512 c2fabeb77a25119c4bbb71c3faa6de58e27ac2f0c768298eac62b519fc51e5d95fdea05c4f3846ed47205f297802982a001577a73b2feec2d9f585c784d6c3d7
+DIST python-multipart-0.0.6.gh.tar.gz 48648 BLAKE2B 4995136e6fcda8df952a6ee868238a507f3d5ea8f8454d4c4933e89b4897440f9186bd820af427f81b3240ca3610aa8300a944e4a0436291cc414f5e97daca30 SHA512 fb996725266996aefb5284b4815ecd8d0005344359f29780f0c2817125f625f3910be14d7d937e975b3ca9fb27a2a483401ab342a0c861df0e1112d447b1f083
diff --git a/dev-python/python-multipart/python-multipart-0.0.5.ebuild b/dev-python/python-multipart/python-multipart-0.0.5.ebuild
index a579eb5cd177..935c1b98994b 100644
--- a/dev-python/python-multipart/python-multipart-0.0.5.ebuild
+++ b/dev-python/python-multipart/python-multipart-0.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-multipart/python-multipart-0.0.6.ebuild b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
new file mode 100644
index 000000000000..22369255e3f3
--- /dev/null
+++ b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A streaming multipart parser for Python"
+HOMEPAGE="
+	https://github.com/andrew-d/python-multipart/
+	https://pypi.org/project/python-multipart/
+"
+SRC_URI="
+	https://github.com/andrew-d/python-multipart/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index b4c9835f540c..b983b9796e26 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,3 +1,2 @@
-DIST python-slugify-7.0.0.gh.tar.gz 13257 BLAKE2B 6d50fd25ac89caed3a970f4cce786d9b61de68386fc183659c0d884877edc934e121ad07316259af08deb61a30ac33f0076a90b2d5a650dfb113e6b6416addfe SHA512 c22743a28ffb273546541eaf59d2a7beb9070a7f81e504acaf73d220c2be83a87d02012b5841076539ba6bae5778dd47309ee7ceef9f8479c993dda6b3e09837
 DIST python-slugify-8.0.0.gh.tar.gz 13322 BLAKE2B 146b04d75aa1aefa0a28824c2c3dd3f323ddfd49dbaafc82a9d9401de8fbdea25793c833e17b4a04cfc646fa371a0a10c40011be870fef573a8f0f8977671d26 SHA512 24d9309873c5bd625a9301b3a7844c7a1f3d2adb5faad9e49563446e33ab08f3d984c6692fb36885fdc363bee8c86252092ea0fc8f1b70152cff3365db37fd82
 DIST python-slugify-8.0.1.gh.tar.gz 13574 BLAKE2B 24fe3dc74f2a867e81bfbb9eac4a1db59a185ddfaf0f2f80cb50d5f06b2061ce28d23ba09ffd214dba26563d1ef37900d016d75dde7a7c35fa756cf49f51b9c2 SHA512 721089244c90f784e49259ee70caa0908d8523c2cf42c8fd57804a73017a815311a9cc9981c1f70a8c2f7cd7e01d77eedf8f9bd3c9d5c55ac4d5f72dbe512b34
diff --git a/dev-python/python-slugify/python-slugify-7.0.0.ebuild b/dev-python/python-slugify/python-slugify-7.0.0.ebuild
deleted file mode 100644
index f808e43dda0d..000000000000
--- a/dev-python/python-slugify/python-slugify-7.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/text-unidecode[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-8.0.0.ebuild b/dev-python/python-slugify/python-slugify-8.0.0.ebuild
index e80db8044cf6..f808e43dda0d 100644
--- a/dev-python/python-slugify/python-slugify-8.0.0.ebuild
+++ b/dev-python/python-slugify/python-slugify-8.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/text-unidecode[${PYTHON_USEDEP}]
diff --git a/dev-python/python-socks/python-socks-2.1.1.ebuild b/dev-python/python-socks/python-socks-2.1.1.ebuild
index b6f2fb92b82c..946e30e9b2b6 100644
--- a/dev-python/python-socks/python-socks-2.1.1.ebuild
+++ b/dev-python/python-socks/python-socks-2.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/python-systemd/python-systemd-235.ebuild b/dev-python/python-systemd/python-systemd-235.ebuild
index e02e710d8ca7..c687ded790d1 100644
--- a/dev-python/python-systemd/python-systemd-235.ebuild
+++ b/dev-python/python-systemd/python-systemd-235.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="sys-apps/systemd:="
 RDEPEND="${DEPEND}
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index e0364abfab3b..c03dc430d529 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1 +1 @@
-DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
+DIST python-xmp-toolkit-2.0.1.gh.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
diff --git a/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch b/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch
index 7679542cf535..e2adc3c05403 100644
--- a/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch
+++ b/dev-python/python-xmp-toolkit/files/python-xmp-toolkit-2.0.1-test.patch
@@ -1,7 +1,67 @@
-diff -r -U1 python-xmp-toolkit-2.0.1.orig/test/test_exempi.py python-xmp-toolkit-2.0.1/test/test_exempi.py
---- python-xmp-toolkit-2.0.1.orig/test/test_exempi.py	2014-03-09 19:42:07.000000000 +0700
-+++ python-xmp-toolkit-2.0.1/test/test_exempi.py	2020-01-21 18:16:13.470778818 +0700
-@@ -539,2 +539,3 @@
+Squashed patches of the following:
+
+- https://github.com/exmakhina/python-xmp-toolkit/commit/3f7546173980610e0687f4eae4eb28aa026e4674
+  gentoo commit 14321e655b7b3f6e531c0a079cb131dbd767e1be
+
+- https://github.com/exmakhina/python-xmp-toolkit/commit/1459510907764746534ce41afa85a3bedd7029b9
+  test: disable tests involving BlueSquare.gif
+
+- https://github.com/exmakhina/python-xmp-toolkit/commit/bd8a0babef830e9a2c06150f6277ba0ddb1220bd
+  libxmp: exempi: exempi returns char-sized bool, not int
+
+diff --git a/libxmp/exempi.py b/libxmp/exempi.py
+index 683e240..cddc038 100644
+--- a/libxmp/exempi.py
++++ b/libxmp/exempi.py
+@@ -1693,6 +1693,7 @@ def check_error(success):
+         Return value from library function indicating success or failure.
+     """
+ 
++    success = success & 0xff
+     # Unfortunately the success parameter does not seem to always be reliable
+     # so we supplement it by explicitly checking the error code.
+     ecode = EXEMPI.xmp_get_error()
+diff --git a/test/common_fixtures.py b/test/common_fixtures.py
+index 135a795..363246c 100644
+--- a/test/common_fixtures.py
++++ b/test/common_fixtures.py
+@@ -44,7 +44,6 @@ samplefiles = {
+     'BlueSquare.ai'   : libxmp.consts.XMP_FT_ILLUSTRATOR,
+     'BlueSquare.avi'  : libxmp.consts.XMP_FT_AVI,
+     'BlueSquare.eps'  : libxmp.consts.XMP_FT_EPS,
+-    'BlueSquare.gif'  : libxmp.consts.XMP_FT_GIF,
+     'BlueSquare.indd' : libxmp.consts.XMP_FT_INDESIGN,
+     'BlueSquare.jpg'  : libxmp.consts.XMP_FT_JPEG,
+     'BlueSquare.mov'  : libxmp.consts.XMP_FT_MOV,
+diff --git a/test/samples.py b/test/samples.py
+index 4a97203..a7e0412 100644
+--- a/test/samples.py
++++ b/test/samples.py
+@@ -65,7 +65,6 @@ samplefiles = {
+     'BlueSquare.ai'   : libxmp.consts.XMP_FT_ILLUSTRATOR,
+     'BlueSquare.avi'  : libxmp.consts.XMP_FT_AVI,
+     'BlueSquare.eps'  : libxmp.consts.XMP_FT_EPS,
+-    'BlueSquare.gif'  : libxmp.consts.XMP_FT_GIF,
+     'BlueSquare.indd' : libxmp.consts.XMP_FT_INDESIGN,
+     'BlueSquare.jpg'  : libxmp.consts.XMP_FT_JPEG,
+     'BlueSquare.mov'  : libxmp.consts.XMP_FT_MOV,
+diff --git a/test/test_exempi.py b/test/test_exempi.py
+index 690ce15..54065e2 100644
+--- a/test/test_exempi.py
++++ b/test/test_exempi.py
+@@ -422,7 +422,6 @@ class TestExempi(unittest.TestCase):
+         """Verify that check_file_format function works as expected."""
+         pairs = { 'avi':  libxmp.consts.XMP_FT_AVI,
+                   'eps':  libxmp.consts.XMP_FT_EPS,
+-                  'gif':  libxmp.consts.XMP_FT_GIF,
+                   'indd': libxmp.consts.XMP_FT_INDESIGN,
+                   'jpg':  libxmp.consts.XMP_FT_JPEG,
+                   'mov':  libxmp.consts.XMP_FT_MOV,
+@@ -540,6 +539,7 @@ class TestIteration(unittest.TestCase):
+         self.assertEqual(props, ["2006, Hubert Figuiere"])
+ 
  
 +    @unittest.skip("Issue x1")
      def test_single_namespace_single_path_leaf_names(self):
+         """Get just leaf names from a single path, single namespace."""
+         # TODO:  why?
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index a7b06b8f81b0..c67bd6165c45 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -4,23 +4,23 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
-else
-	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
-fi
-
 DESCRIPTION="Library for working with XMP metadata"
-HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/"
+HOMEPAGE="
+	https://github.com/python-xmp-toolkit/python-xmp-toolkit/
+	https://pypi.org/project/python-xmp-toolkit/
+"
+SRC_URI="
+	https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 DEPEND="
 	test? ( media-libs/exempi )
@@ -29,7 +29,9 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.5.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.5.ebuild
index c3f74df611d5..aac5fc10b064 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.5.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
diff --git a/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch b/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch
new file mode 100644
index 000000000000..e9f65dd6a42a
--- /dev/null
+++ b/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch
@@ -0,0 +1,45 @@
+https://github.com/Qiskit/qiskit-aer/commit/cec5c11513118fa8d701e2bef1376dc3db7263c3
+
+From cec5c11513118fa8d701e2bef1376dc3db7263c3 Mon Sep 17 00:00:00 2001
+From: Jun Doi <doichan@jp.ibm.com>
+Date: Fri, 27 Jan 2023 18:55:59 +0900
+Subject: [PATCH] Fix test_aer_statevector (#1710)
+
+* fix test_aer_statevector
+
+* add plot directive to docs
+
+* fix test_aer_statevector and remove reno
+
+Co-authored-by: Hiroshi Horii <horii@jp.ibm.com>
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -67,6 +67,7 @@ extensions = [
+     'sphinx_tabs.tabs',
+     'jupyter_sphinx',
+     'reno.sphinxext',
++    'matplotlib.sphinxext.plot_directive',
+ ]
+ html_static_path = ['_static']
+ templates_path = ['_templates']
+--- a/test/terra/states/test_aer_statevector.py
++++ b/test/terra/states/test_aer_statevector.py
+@@ -1347,13 +1347,14 @@ class TestAerStatevector(common.QiskitAerTestCase):
+             ([-1, 1j], ["-", "+i"]),
+             ([1e-16 + 1j], ["i"]),
+             ([-1 + 1e-16 * 1j], ["-"]),
+-            ([-1, -1 - 1j], ["-", "+ (-1 - i)"]),
++            ([-1, -1 - 1j], ["-", "+(-1 - i)"]),
+             ([np.sqrt(2) / 2, np.sqrt(2) / 2], ["\\frac{\\sqrt{2}}{2}", "+\\frac{\\sqrt{2}}{2}"]),
+             ([1 + np.sqrt(2)], ["(1 + \\sqrt{2})"]),
+         ]
+-        for numbers, latex_terms in cases:
+-            terms = numbers_to_latex_terms(numbers)
+-            self.assertListEqual(terms, latex_terms)
++        with self.assertWarns(DeprecationWarning):
++            for numbers, latex_terms in cases:
++                terms = numbers_to_latex_terms(numbers, 15)
++                self.assertListEqual(terms, latex_terms)
+ 
+     def test_statevector_draw_latex_regression(self):
+         """Test numerical rounding errors are not printed"""
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild
index f9de54e64534..07d45fbdb52d 100644
--- a/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High performance simulator for quantum circuits that includes noise models"
 HOMEPAGE="
@@ -35,7 +35,11 @@ DEPEND="
 	virtual/cblas[eselect-ldso]
 	sci-libs/openblas[eselect-ldso]
 "
-
+RDEPEND="
+	${DEPEND}
+	>=dev-python/qiskit-terra-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.0[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	>=dev-util/cmake-3.17
 	>=dev-python/scikit-build-0.11.0[${PYTHON_USEDEP}]
@@ -43,21 +47,19 @@ BDEPEND="
 	test? (
 		dev-python/ddt[${PYTHON_USEDEP}]
 		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
 "
 
-RDEPEND="
-	${DEPEND}
-	>=dev-python/qiskit-terra-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.0[${PYTHON_USEDEP}]
-"
+PATCHES=(
+	# Remove cmake dependency from setup.py because of
+	# invalid dependency description. We put this dependency check in BDEPEND.
+	"${FILESDIR}/qiskit-aer-0.10.3-remove-cmake-dependency.patch"
+	"${FILESDIR}/qiskit-aer-0.11.2-terra-test.patch"
+)
 
 distutils_enable_tests pytest
 
-# Remove cmake dependency from setup.py because of
-# invalid dependency description. We put this dependency check in BDEPEND.
-PATCHES=( "${FILESDIR}/qiskit-aer-0.10.3-remove-cmake-dependency.patch" )
-
 check_openblas() {
 	local libdir=$(get_libdir) me="openblas"
 
@@ -75,7 +77,7 @@ check_openblas() {
 pkg_setup() {
 	if use test; then
 		check_openblas
-		if [ $? -ne 0 ]; then
+		if [[ $? -ne 0 ]]; then
 			die "Set blas implementation to openblas using 'eselect blas set openblas'!"
 		fi
 	fi
@@ -92,11 +94,15 @@ python_prepare_all() {
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
-		test/terra/states/test_aer_statevector.py::TestAerStatevector::test_number_to_latex_terms
+		test/terra/states/test_aer_statevector.py::TestAerStatevector::test_drawings
+
+		# TODO: GLIBCXX_ASSERTIONS, bug #897758
+		test/terra/backends/aer_simulator/test_algorithms.py::TestAlgorithms::test_extended_stabilizer_sparse_output_probs
+		test/terra/backends/aer_simulator/test_options.py::TestOptions::test_mps_options
 	)
 
 	rm -rf qiskit_aer || die
-	epytest -s
+	epytest -n "$(makeopts_jobs)" -s
 }
 
 pkg_postinst() {
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild
new file mode 100644
index 000000000000..c3eb8a31ec2f
--- /dev/null
+++ b/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ahash-0.7.6
+	ahash-0.8.0
+	autocfg-1.1.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.11
+	crossbeam-utils-0.8.12
+	either-1.8.0
+	fixedbitset-0.4.2
+	getrandom-0.2.8
+	hashbrown-0.11.2
+	hashbrown-0.12.3
+	hermit-abi-0.1.19
+	indexmap-1.7.0
+	indoc-1.0.7
+	libc-0.2.137
+	libm-0.2.5
+	lock_api-0.4.9
+	matrixmultiply-0.3.2
+	memoffset-0.6.5
+	memoffset-0.8.0
+	ndarray-0.15.6
+	num-bigint-0.4.3
+	num-complex-0.4.2
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	numpy-0.18.0
+	once_cell-1.16.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.4
+	petgraph-0.6.2
+	ppv-lite86-0.2.16
+	priority-queue-1.2.0
+	proc-macro2-1.0.47
+	pyo3-0.18.1
+	pyo3-build-config-0.18.1
+	pyo3-ffi-0.18.1
+	pyo3-macros-0.18.1
+	pyo3-macros-backend-0.18.1
+	quote-1.0.21
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	rand_distr-0.4.3
+	rand_pcg-0.3.1
+	rawpointer-0.2.1
+	rayon-1.6.0
+	rayon-core-1.10.1
+	redox_syscall-0.2.16
+	rustc-hash-1.1.0
+	rustworkx-core-0.12.1
+	scopeguard-1.1.0
+	smallvec-1.10.0
+	syn-1.0.103
+	target-lexicon-0.12.4
+	unicode-ident-1.0.5
+	unindent-0.1.10
+	version_check-0.9.4
+	wasi-0.11.0+wasi-snapshot-preview1
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.42.0
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cargo distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Terra is the foundation on which Qiskit is built"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit-terra/
+	https://pypi.org/project/qiskit-terra/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit-terra/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
+	Unicode-DFS-2016
+	|| ( LGPL-3 MPL-2.0 )
+"
+SLOT="0"
+IUSE="+visualization"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/rustworkx-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.10[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.8[${PYTHON_USEDEP}]
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7.3.0[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/qiskit-aer[${PYTHON_USEDEP}]
+		>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/transpiler/test_unitary_synthesis.py::TestUnitarySynthesis::test_two_qubit_synthesis_not_pulse_optimal
+
+		# TestOptions::test_copy - TypeError: argument of type 'Options' is not iterable
+		test/python/providers/test_options.py::TestOptions::test_copy
+
+		# DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('mpl_toolkits')`.
+		test/python/test_version.py::TestVersion::test_qiskit_version
+
+		# Hangs
+		# Broken by https://github.com/Qiskit/qiskit-terra/pull/8952?
+		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_dispatch_4_3
+		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_with_target_4_3
+	)
+	local EPYTEST_IGNORE=(
+		# TODO, also apparently slow
+		test/randomized/test_transpiler_equivalence.py
+	)
+
+	rm -rf qiskit || die
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	# Note: use -p timeout --timeout 500 if debugging hanging tests.
+	epytest -p xdist -n "$(makeopts_jobs)" test/python
+}
+
+pkg_postinst() {
+	optfeature "qiskit.circuit.classicalfunction support" dev-python/tweedledum
+}
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild
deleted file mode 100644
index 3d1bdc2d0aba..000000000000
--- a/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ahash-0.7.6
-	ahash-0.8.0
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.11
-	crossbeam-utils-0.8.12
-	either-1.8.0
-	fixedbitset-0.4.2
-	getrandom-0.2.8
-	hashbrown-0.11.2
-	hashbrown-0.12.3
-	hermit-abi-0.1.19
-	indexmap-1.7.0
-	indoc-1.0.7
-	libc-0.2.137
-	libm-0.2.5
-	lock_api-0.4.9
-	matrixmultiply-0.3.2
-	memoffset-0.6.5
-	memoffset-0.8.0
-	ndarray-0.15.6
-	num-bigint-0.4.3
-	num-complex-0.4.2
-	num-integer-0.1.45
-	num-traits-0.2.15
-	num_cpus-1.13.1
-	numpy-0.18.0
-	once_cell-1.16.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.4
-	petgraph-0.6.2
-	ppv-lite86-0.2.16
-	priority-queue-1.2.0
-	proc-macro2-1.0.47
-	pyo3-0.18.1
-	pyo3-build-config-0.18.1
-	pyo3-ffi-0.18.1
-	pyo3-macros-0.18.1
-	pyo3-macros-backend-0.18.1
-	quote-1.0.21
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rand_distr-0.4.3
-	rand_pcg-0.3.1
-	rawpointer-0.2.1
-	rayon-1.6.0
-	rayon-core-1.10.1
-	redox_syscall-0.2.16
-	rustc-hash-1.1.0
-	rustworkx-core-0.12.1
-	scopeguard-1.1.0
-	smallvec-1.10.0
-	syn-1.0.103
-	target-lexicon-0.12.4
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	version_check-0.9.4
-	wasi-0.11.0+wasi-snapshot-preview1
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.42.0
-"
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cargo distutils-r1 multiprocessing
-
-DESCRIPTION="Terra is the foundation on which Qiskit is built"
-HOMEPAGE="
-	https://github.com/Qiskit/qiskit-terra/
-	https://pypi.org/project/qiskit-terra/
-"
-SRC_URI="
-	https://github.com/Qiskit/qiskit-terra/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
-	Unicode-DFS-2016
-	|| ( LGPL-3 MPL-2.0 )
-"
-SLOT="0"
-IUSE="+visualization"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/rustworkx-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.10[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
-	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/symengine-0.8[${PYTHON_USEDEP}]
-	>=dev-python/tweedledum-1.1[${PYTHON_USEDEP}]
-	visualization? (
-		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7.3.0[${PYTHON_USEDEP}]
-		dev-python/pydot[${PYTHON_USEDEP}]
-		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
-		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
-	test? (
-		app-text/poppler[png]
-		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
-		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/qiskit-aer[${PYTHON_USEDEP}]
-		>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
-		test/python/transpiler/test_unitary_synthesis.py::TestUnitarySynthesis::test_two_qubit_synthesis_not_pulse_optimal
-
-		# TestOptions::test_copy - TypeError: argument of type 'Options' is not iterable
-		test/python/providers/test_options.py::TestOptions::test_copy
-
-		# DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('mpl_toolkits')`.
-		test/python/test_version.py::TestVersion::test_qiskit_version
-
-		# Hangs
-		# Broken by https://github.com/Qiskit/qiskit-terra/pull/8952?
-		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_dispatch_4_3
-		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_with_target_4_3
-	)
-	local EPYTEST_IGNORE=(
-		# TODO, also apparently slow
-		test/randomized/test_transpiler_equivalence.py
-	)
-
-	rm -rf qiskit || die
-	# Run the Python test suite rather than everything under test/ which
-	# includes the 'randomized' suite. Upstream run that in a separate CI job.
-	# Note: use -p timeout --timeout 500 if debugging hanging tests.
-	epytest -p xdist -n "$(makeopts_jobs)" test/python
-}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 09be4988fcd8..22a3158f855b 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1 @@
-DIST rich-13.2.0.gh.tar.gz 15066145 BLAKE2B 1a767de5d3b872e07e74374d956b4a3d1b6916a98846f98208f8a2e14a1c12f18fe7d85919f0b2104228fd74d25e640d446fae416a70254f7241fa726fb82802 SHA512 a3df2d3bdb35d25cad867cafad726a081d7fcba45e0b4ea2ec9aa17c28fc4d2c22f4ba1c7e3ef16fea7137c052875632b8d774895082d40804dc929021c0a2ef
-DIST rich-13.3.0.gh.tar.gz 15055287 BLAKE2B bf314606d2da55d1c20d01083c21edc6f10590431152d360f1a5731fc543d47360faabd5141d3bf9b46793145a08bd79c971974ae85956df8821a33afa45bc50 SHA512 1ad28c6ea505ad4088ccab8a034b5ffa49f9ad59e7b60fe27dbcb8fec485f9f695d25dde83b102021c24ff149fdd9e981a1009bb82eb545250824436bd818d62
 DIST rich-13.3.1.gh.tar.gz 15055408 BLAKE2B 79713ee232bc1c990c1432f7966cffd69b8ffef9ad8a562339d62b03fbab4620040c5ae1d735d3084d71f32581955f0ea5fad113ff992dcddb2dd0e20465484e SHA512 a3b5bef2183bbb888f0ef5a90b35fdb1ed7ef6103dfea01a5efa441ce8d1769b53d7888684e3b5cd76bcacf3768835d918d9fbb7801eab57c04d1412f129f6bb
diff --git a/dev-python/rich/rich-13.2.0.ebuild b/dev-python/rich/rich-13.2.0.ebuild
deleted file mode 100644
index 5a00191deda0..000000000000
--- a/dev-python/rich/rich-13.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.3.0.ebuild b/dev-python/rich/rich-13.3.0.ebuild
deleted file mode 100644
index 55b97b52578e..000000000000
--- a/dev-python/rich/rich-13.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.3.1.ebuild b/dev-python/rich/rich-13.3.1.ebuild
index 55b97b52578e..7b8ea901adce 100644
--- a/dev-python/rich/rich-13.3.1.ebuild
+++ b/dev-python/rich/rich-13.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 951d57716ea5..fb7bbad64f30 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1 +1,2 @@
 DIST roman-3.3.tar.gz 7577 BLAKE2B 651d30154e01c9bc61326581c5600efb5f717b2c21cb6345d51ba5aa44d79bff00e66492d3962ed4c9682103a9c00af8205ae9d90b30b9a3f13dc2d18e6f1592 SHA512 8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49
+DIST roman-4.0.tar.gz 9380 BLAKE2B f158a9c7ed9aae2e8c3aaf8b4db9610cd437119493af87c248f8f7d2157228f2bbeb7085eb8f02d169f3e3f5221831ebb10a773d70c5dc7133d32896d5c21dbd SHA512 5421ac46fc5f49c8913a6089d51781bc0a01f2863ea2655b57adba1d07632d4e459fcb26350d0c2dfdf4a31c64a31e9fc86b22165df212c9f8db4bf41cf2e2a1
diff --git a/dev-python/roman/metadata.xml b/dev-python/roman/metadata.xml
index 0616c0bd4c9b..d3f00828dac6 100644
--- a/dev-python/roman/metadata.xml
+++ b/dev-python/roman/metadata.xml
@@ -8,5 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">roman</remote-id>
+    <remote-id type="github">zopefoundation/roman</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/roman/roman-4.0.ebuild b/dev-python/roman/roman-4.0.ebuild
new file mode 100644
index 000000000000..334e4e988845
--- /dev/null
+++ b/dev-python/roman/roman-4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="An Integer to Roman numerals converter"
+HOMEPAGE="
+	https://pypi.org/project/roman/
+	https://github.com/zopefoundation/roman
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	mv "${S}/src/tests.py" . || die "moving test file failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rope/rope-1.7.0.ebuild b/dev-python/rope/rope-1.7.0.ebuild
index 01bc24f0fa0d..52f77cc18ffb 100644
--- a/dev-python/rope/rope-1.7.0.ebuild
+++ b/dev-python/rope/rope-1.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index 05272f65be96..0fa6e8e28578 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1 +1,2 @@
 DIST seaborn-0.12.0.tar.gz 1407601 BLAKE2B 3da8db0a0c08a40a3969a2ffce248f5521b4c7c93ecf0f014850093ef48331326454572ceea6ee1133805bf92540b0d2acecdfb7cb789d238f743b30e6a28947 SHA512 b2b06a22d48f19ace2448f465ca5e700f3486971d9fb86e85a1a8c9e2956b904e5f4c2c8075f848299b182cf8f69b2fac22366fedbd8012b9c44adc0bcb7e060
+DIST seaborn-0.12.2.tar.gz 1439798 BLAKE2B cf6903b1a2d27516bcafe46cabc81ea9fac80666394a6a82516630f9ac60afc7e9d31817e029cda9a08da04c0a37ce0244ad23acda16bca3283532ddb0fbdb71 SHA512 988a9922ee301b655911efa38905674b7dd15e7f7b157ad67f5befaeb02db492553f8bd6133b54d2dd7970b8dbbfd92d81d1faea3fa618247ebcaeb98620a060
diff --git a/dev-python/seaborn/files/seaborn-0.12.2-matplotlib-3.7.patch b/dev-python/seaborn/files/seaborn-0.12.2-matplotlib-3.7.patch
new file mode 100644
index 000000000000..dbc4908321d9
--- /dev/null
+++ b/dev-python/seaborn/files/seaborn-0.12.2-matplotlib-3.7.patch
@@ -0,0 +1,19 @@
+https://github.com/mwaskom/seaborn/commit/db7ae11750fc2dfb695457239708448d54e9b8cd
+
+From db7ae11750fc2dfb695457239708448d54e9b8cd Mon Sep 17 00:00:00 2001
+From: Michael Waskom <mwaskom@users.noreply.github.com>
+Date: Wed, 25 Jan 2023 16:58:26 -0500
+Subject: [PATCH] Update test to reflect change in matplotlib 3.7 (#3236)
+
+--- a/tests/test_axisgrid.py
++++ b/tests/test_axisgrid.py
+@@ -331,7 +331,7 @@ def test_subplot_kws(self):
+         g = ag.FacetGrid(self.df, despine=False,
+                          subplot_kws=dict(projection="polar"))
+         for ax in g.axes.flat:
+-            assert "PolarAxesSubplot" in str(type(ax))
++            assert "PolarAxes" in ax.__class__.__name__
+ 
+     def test_gridspec_kws(self):
+         ratios = [3, 1, 2]
+
diff --git a/dev-python/seaborn/seaborn-0.12.2.ebuild b/dev-python/seaborn/seaborn-0.12.2.ebuild
new file mode 100644
index 000000000000..276eda23158c
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.12.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-matplotlib-3.7.patch
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	cat > matplotlibrc <<- EOF || die
+		backend : Agg
+	EOF
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 81d5d6d13ad6..da712e266f63 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1,3 @@
+DIST sentry-python-1.16.0.gh.tar.gz 325763 BLAKE2B e53f6051a74065950c4f1ce9010a87071b4a715990643cb7e955411ffb784fabc7ca6f2ade3cc6c66eb0718c6fc4993c6035763a0937b8a1cd66289f3f026806 SHA512 7f46f6c66b0e4f97e7f64a0eba9c396fbb9ab95607ba8ecb4880bb117c4f3fff7881a6787ea814981bdfabd84ea2b172c878821877403852661e746b6fe666bb
 DIST sentry-sdk-1.14.0.gh.tar.gz 312667 BLAKE2B 02772c3313a6cdb5f872df93274b291cdbae35db8387eab3816261b446bb438afd41610580cc642299877d8f03732a1d7bae4e6ad9824a92f4126677a4a3ca1a SHA512 cd0c4ca10d61825919721335fe0413f1050bd8d1f41a2f3f4a25b843c4bf83d35610382f55dc14fe86f70cca962e30a8d9d0708a07b10730783ae09b22f20e04
 DIST sentry-sdk-1.15.0.gh.tar.gz 317804 BLAKE2B 65a45f0da5327057827f4533418d846d8d4dc4bdd2723fddd754e5391e12c50946bb2f3f7914c5ee03cfdac324d565e68158aaca8e6686dc4502a02813cd6442 SHA512 9ae477c3ddc90c4189f4cbcca8756d7b0bd2df0358afa553467b431a2a131f32c9a9df9ce0ca3cca4d98b5a14746222f21476c164bf6da09bc06d94ce7ed0afe
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
new file mode 100644
index 000000000000..f02570ff1556
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# TODO: causes breakage in other tests
+	tests/integrations/starlette
+	# TODO
+	tests/integrations/tornado
+	# requires mockupdb
+	tests/integrations/pymongo
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+	tests/test_profiler.py::test_sample_buffer
+	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
+	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
+	tests/test_profiler.py::test_thread_scheduler_single_background_thread
+	# broken with py3.11, *shrug*
+	tests/test_profiler.py::test_extract_stack_with_max_depth
+	# TODO
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
+)
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index 3a6c361530a4..0cc29cfc77b9 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1 +1,2 @@
 DIST sphinx-autoapi-2.0.0.gh.tar.gz 86051 BLAKE2B af6c2f997e7e018304c5f19d978fc87fa853d876781930c1220e8e823a078c80c86851a141ed01d7ab94fd76d747e8dfd7462dd5ccab84127f1c95d225324a92 SHA512 7188ed167de808028b2ac603abb6a136584698a1df4882755b80609f4760dab818cec5f4684bf5d16afc2ae1be112ecb96c7f02f989fcb67937c19c045f45b81
+DIST sphinx-autoapi-2.0.1.gh.tar.gz 85974 BLAKE2B 5beea907901603a665367c244188f847fcc59f889df5da4e27dba39f36c9714347dab1e867d3bbed0fb44139eb1f77863178a0c831e06a6d373211892e8ce6ab SHA512 b7301a86fa6ebde80fd6289e92e2e9149323044f6db34e39305541ccb4bcb136a777c8e38c152f7536435290c86a0543d51c14290fbdfeb7b13805f711e00a80
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
index ccd674abfc2c..f26014d3e974 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
@@ -38,4 +38,15 @@ EPYTEST_DESELECT=(
 )
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs --no-autodoc
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+python_test() {
+	# https://github.com/readthedocs/sphinx-autoapi/issues/368
+	if has_version ">=dev-python/sphinx-6.0"; then
+		EPYTEST_DESELECT+=(
+			tests/python/test_pyintegration.py::TestPositionalOnlyArgumentsModule::test_integration
+		)
+	fi
+
+	distutils-r1_python_test
+}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.1.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.1.ebuild
new file mode 100644
index 000000000000..9b8488762142
--- /dev/null
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A new approach to API documentation in Sphinx"
+HOMEPAGE="
+	https://sphinx-autoapi.readthedocs.io/
+	https://github.com/readthedocs/sphinx-autoapi/
+	https://pypi.org/project/sphinx-autoapi/
+"
+SRC_URI="
+	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/astroid[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.0[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst CHANGELOG.rst )
+
+# Test requires pypi download w/ internet: https://github.com/readthedocs/sphinx-autoapi/issues/329
+EPYTEST_DESELECT=(
+	tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample-override_conf2-AutoAPI
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+python_test() {
+	# https://github.com/readthedocs/sphinx-autoapi/issues/368
+	if has_version "<dev-python/sphinx-6.0"; then
+		EPYTEST_DESELECT+=(
+			tests/python/test_pyintegration.py::TestPositionalOnlyArgumentsModule::test_integration
+			tests/python/test_pyintegration.py::TestPy3Module::test_annotations
+			tests/python/test_pyintegration.py::TestAnnotationCommentsModule::test_integration
+		)
+	fi
+
+	distutils-r1_python_test
+}
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
index 4027fb7575d3..fd1fab5f0119 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..10} )
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
index afd2d94b8781..160e823b6cd8 100644
--- a/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
+++ b/dev-python/sphinx-rtd-theme/sphinx-rtd-theme-1.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
index 31321ae63c56..75441286f25d 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..10} )
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Testing utility classes and functions for Sphinx extensions"
 HOMEPAGE="https://github.com/sphinx-doc/sphinx-testing"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
index d7bad106fa3f..6f4c7f906d2a 100644
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
+++ b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 MY_PN="${PN//_/-}"
diff --git a/dev-python/sphinx_selective_exclude/files/sphinx_selective_exclude-description-file.patch b/dev-python/sphinx_selective_exclude/files/sphinx_selective_exclude-description-file.patch
new file mode 100644
index 000000000000..cc81f571d8f7
--- /dev/null
+++ b/dev-python/sphinx_selective_exclude/files/sphinx_selective_exclude-description-file.patch
@@ -0,0 +1,8 @@
+diff -r -U1 sphinx_selective_exclude-1.0.3.orig/setup.cfg sphinx_selective_exclude-1.0.3/setup.cfg
+--- sphinx_selective_exclude-1.0.3.orig/setup.cfg	2019-12-24 05:59:33.000000000 +0700
++++ sphinx_selective_exclude-1.0.3/setup.cfg	2023-02-28 17:56:05.055719498 +0700
+@@ -1,3 +1,3 @@
+ [metadata]
+-description-file = README.md
++description_file = README.md
+ 
diff --git a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3-r1.ebuild b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..68910c386949
--- /dev/null
+++ b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx selective rendition extensions"
+HOMEPAGE="https://github.com/pfalcon/sphinx_selective_exclude"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-description-file.patch )
diff --git a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
deleted file mode 100644
index 94f900d359e5..000000000000
--- a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx selective rendition extensions"
-HOMEPAGE="https://github.com/pfalcon/sphinx_selective_exclude"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-3.0.0.ebuild b/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-3.0.0.ebuild
index c58e3b8c78bd..d65d6615c392 100644
--- a/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-3.0.0.ebuild
+++ b/dev-python/sphinxcontrib-jquery/sphinxcontrib-jquery-3.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 # MIT for jQuery
 LICENSE="0BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/starlette/starlette-0.25.0.ebuild b/dev-python/starlette/starlette-0.25.0.ebuild
index 11774ffe5326..fde4a1932966 100644
--- a/dev-python/starlette/starlette-0.25.0.ebuild
+++ b/dev-python/starlette/starlette-0.25.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/stomp-py/Manifest b/dev-python/stomp-py/Manifest
index 110bda934ae0..e102c44a5334 100644
--- a/dev-python/stomp-py/Manifest
+++ b/dev-python/stomp-py/Manifest
@@ -1 +1,2 @@
 DIST stomp.py-8.0.1.tar.gz 35300 BLAKE2B 12209e99066fb5bb1f3015398f5eb27186322ce9d92feca46adc4d275aff1d5138908da69abe3be512325bd30a3a21773886ba5fa21917c71d13bc53b0977de4 SHA512 009189cd07c379641c9fa3b3af1df70c9e26b77bbb6d2443a78b56ff9895b4382e90a753db83f4a863fae5ef5765c660d2f82ef14ab6e74817bc83e7ea8ba6d3
+DIST stomp.py-8.1.0.tar.gz 39808 BLAKE2B c6efb19fbee81142f251c4bf4114b445878b81fa457260a306cb82ef5e9c57f0b75e3dc8cd6035676e688f1d33081cdf936ac6ccc0628819722849d60f4d8602 SHA512 7385842a23fbe6022c386489641948932e805430ce71c09079d9484fe17d02241ee705d92a1bcdf873eebcbacf68f44bbf884ea103c8963944b84758073fdac7
diff --git a/dev-python/stomp-py/stomp-py-8.1.0.ebuild b/dev-python/stomp-py/stomp-py-8.1.0.ebuild
new file mode 100644
index 000000000000..2aaf49e80681
--- /dev/null
+++ b/dev-python/stomp-py/stomp-py-8.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client library for the STOMP messaging protocol"
+HOMEPAGE="https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+# stomp.py test suite requires quite a few appropriately configured
+# messaging servers (as of 7.0.0: RabbitMQ, ActiveMQ, ActiveMQ Artemis,
+# stompserver). Upstream relies on Docker to provide those servers, however
+# doing the same in src_test would require both granting the portage user
+# extra permissions and packaging the base image (trying to download it
+# on the fly would violate the network sandbox).
+# Side note: PyPI tarballs do not include tests.
+RESTRICT="test"
diff --git a/dev-python/tabulate/tabulate-0.9.0.ebuild b/dev-python/tabulate/tabulate-0.9.0.ebuild
index 26f8a7898049..f076ab90fff3 100644
--- a/dev-python/tabulate/tabulate-0.9.0.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/tasklib/Manifest b/dev-python/tasklib/Manifest
new file mode 100644
index 000000000000..58c909507410
--- /dev/null
+++ b/dev-python/tasklib/Manifest
@@ -0,0 +1 @@
+DIST tasklib-2.5.1.tar.gz 23805 BLAKE2B 354c2719bd73f992d1d7ed1d6d14ed25bab4eb417397f3c4d3e1fc9c000957634547c615b5a6a90d8defbc4eb35a70067e12a0ea181796c77fb3dbca18f032e6 SHA512 ab1a681558c22017d36da9bdcc8fd7367550d8b8375dd6967188647d21525bc0a6f0e7645c9bb6505087ab539a4173bf3988b6ad2449ba8bc37f062f38b12d78
diff --git a/dev-python/tasklib/metadata.xml b/dev-python/tasklib/metadata.xml
new file mode 100644
index 000000000000..0630c0e02e8c
--- /dev/null
+++ b/dev-python/tasklib/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="github">GothenburgBitFactory/tasklib</remote-id>
+    <remote-id type="pypi">tasklib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tasklib/tasklib-2.5.1.ebuild b/dev-python/tasklib/tasklib-2.5.1.ebuild
new file mode 100644
index 000000000000..405a37e4b487
--- /dev/null
+++ b/dev-python/tasklib/tasklib-2.5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python library for interacting with taskwarrior databases"
+HOMEPAGE="
+	https://github.com/GothenburgBitFactory/tasklib
+	https://pypi.org/project/tasklib/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-misc/task-2.4.0"
+
+distutils_enable_tests unittest
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 0f72648107ee..0ad9fde44e11 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1 +1,2 @@
 DIST tempest-33.0.0.tar.gz 1126464 BLAKE2B 14bce9e0baf1878fc30cc5026c7849cda5abc0291706c7cd051827ffb1e15670e653a20ba6c0c898e86a7e1bee498d14139f82887606f5587b7775d18f96595f SHA512 1a34bc81a18121e3be05ab1a2b637aa8bfc41a0a8e11824294c78468762fb5f303ebf9607f5e72aed1cc5b130b26e22bf72c0574472a0de4eca083e899ff6eb0
+DIST tempest-34.0.0.tar.gz 1138466 BLAKE2B fb08579592445ad9d7bebff5c828b507ddd4d3db560d3d6548a1f26e3ee942f0fda74082eaeee8bba224f284942a4dcf1cabeab9a35821b1a03d0d9d1d126b45 SHA512 83d23d8e6cf6507eec175733372a4f8a4e95e9cb66cdb0ad716bdd4de211a8ae290ba0f56f6ebd1262ff8769619aa6b9e4cba4bc6e7e3dabf1c702167077a962
diff --git a/dev-python/tempest/tempest-34.0.0-r1.ebuild b/dev-python/tempest/tempest-34.0.0-r1.ebuild
new file mode 100644
index 000000000000..9143d3959fb9
--- /dev/null
+++ b/dev-python/tempest/tempest-34.0.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenStack Integration Testing"
+HOMEPAGE="
+	https://pypi.org/project/tempest/
+	https://docs.openstack.org/tempest/latest/
+	https://launchpad.net/tempest/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		dev-python/stestr[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Small subset of tests, which fail as result of not using specific
+	# testing environment. Others expect to run suite using stestr.
+	rm -r tempest/tests/lib/services/volume/v3/ || die
+	rm tempest/tests/test_list_tests.py || die
+	rm tempest/tests/lib/cmd/test_check_uuid.py || die
+
+	# remove dep on hacking
+	rm tempest/tests/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	mv "${BUILD_DIR}"/install/{usr/,}etc || die
+}
+
+python_test() {
+	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
+	local -x OS_TEST_TIMEOUT=300
+	eunittest -b -s tempest/tests -t .
+}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 011e7093f29d..b13e58d363b6 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,3 +1,4 @@
 DIST tenacity-8.1.0.tar.gz 37658 BLAKE2B 4f9e2ea44ac0f0ed8b694b0f60e938fadbcf65bd989e9d641f7a40750f499aa9635a70d80e406aa2ebf436ebd37cde0d88e8ecb6cb3436ba755c2d921541c8e8 SHA512 194312e80233d6edcdf30496a355b272a4de4809bbe187948a7ce9c1382958845d12401498569f2b8d4251ede2857317820779f13a65bb2e69dcb97dde9bb501
 DIST tenacity-8.2.0.tar.gz 39842 BLAKE2B 4c7b58654eff79e2b5e7412f5a920dd09df44a7699d6959dd6e1c5ee87a1e74a0c60df28239be6976368859ebabc4ab35e318a71a7ad5861d92da76a516bd721 SHA512 7bb962257200a450a5599309977c895b9e2918a195a2b60c942dad934145e85e64cf1c043e81fe1a4eb5a4a7d4eaeca626a21388297cf0983bdcea22d56553d3
 DIST tenacity-8.2.1.tar.gz 39876 BLAKE2B 5141a5ee79ee6b5664e35c06c2d95e65daf75bfcb2ea6b33418385e49f9136adde2ff99bfd8215f056f6370c7b3c2e0a755c749c164c3857c0aae4c27cc63d1b SHA512 43decc20206544165d7ad4ae67292388c45c70a126d3b1ba529529429897dafc1bf8df72a15b545a80cc1fe0eee766866e592d3f49ee6a24feddcb525dffaab8
+DIST tenacity-8.2.2.tar.gz 40186 BLAKE2B af24fa209a0f9de0bb7ddd0d0979620fdb3a41967ea2d45c8864cc9feb3237d345b85015379228dd7714d7dd3f921e190bfdea3ba5c3fe627df804de6641894d SHA512 a1e2569dd5afdc982716f22ba7c67f7a43351e9f2dbefad30854d8655fa7600300c624b7353ea7d68aa462cbf2f33cf93e643e2868e8e197a61eb1ccf25c275e
diff --git a/dev-python/tenacity/tenacity-8.2.2.ebuild b/dev-python/tenacity/tenacity-8.2.2.ebuild
new file mode 100644
index 000000000000..2b2710dd1228
--- /dev/null
+++ b/dev-python/tenacity/tenacity-8.2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="
+	https://github.com/jd/tenacity/
+	https://pypi.org/project/tenacity/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 8ca55cf87099..bfc44b8c4c52 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,3 +1,2 @@
-DIST tifffile-2023.1.23.1.gh.tar.gz 324017 BLAKE2B ffc4a329096ac3eb44990635dea4f5d0211564d5a8847795671d3d816148721d3c6fab059514764eb45bc48c8a114382c0a1705cc606d750ef869d49e67b2c85 SHA512 fad8e2f40cc550a83030b29b528566d7b5b9cbe016c9fd04911ab4cca4e8e69523d9b17db83eee018d1ff3005cab0f36762b4a1271859b504c77a0809e07b0be
-DIST tifffile-2023.2.2.gh.tar.gz 324485 BLAKE2B fb3404efa1af8197af8e3b77c2b1fbb76c215ee8d599da8974c6231b72789117edddf23072c898eb752789d789080b16106da90406a3a178388f3a863171d202 SHA512 5915374d62665d766b02d2a3c0e2f644581f3809cc650dda70feffec43151398fbbd23b2fe000be02a65fd7647e097c43c3c92482c85fe5027966038179a785f
+DIST tifffile-2023.2.27.gh.tar.gz 326444 BLAKE2B 8c5081b7434329181d5f6df416b739c43d24ff9a9c3dc2ac4b3d6d6dd5ba165290d224648e5e6b4f46bd611c85204114f8b563cb110b7b50ba73aefd0e427f2e SHA512 97ba6b6ac469e4ab92822fd51dc45ebc00776834e5b171679abed24448d5be479a06e5e401bd055a21029641668f63912246b93f15424a3b268733729515452e
 DIST tifffile-2023.2.3.gh.tar.gz 324906 BLAKE2B b9417ea561de7a185f1a57a6f36a6efde12caa85cd15fd787ae1ca50e73d328f83ec6cd196042d3a11a62706ac27bfad8ecc42e0a235201ee208fdb95d942c16 SHA512 f73dd77c149afa976ac468f0fac37a1bafe35ae4bcb377a91e7922573237805cdc6e00cbcd7bb78f3213a9da4878ec020a058567523b9a4c5958e013f9bdc94b
diff --git a/dev-python/tifffile/tifffile-2023.2.2.ebuild b/dev-python/tifffile/tifffile-2023.2.2.ebuild
deleted file mode 100644
index 66babf481615..000000000000
--- a/dev-python/tifffile/tifffile-2023.2.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.cgohlke.com/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dask[${PYTHON_USEDEP}]
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_tifffile.py::test_class_omexml
-	tests/test_tifffile.py::test_class_omexml_fail
-	tests/test_tifffile.py::test_class_omexml_modulo
-	tests/test_tifffile.py::test_class_omexml_attributes
-	tests/test_tifffile.py::test_class_omexml_multiimage
-	tests/test_tifffile.py::test_write_ome
-	tests/test_tifffile.py::test_write_ome_manual
-	# requires tons of free space
-	tests/test_tifffile.py::test_write_3gb
-	tests/test_tifffile.py::test_write_5GB_bigtiff
-	tests/test_tifffile.py::test_write_5GB_fails
-	tests/test_tifffile.py::test_write_6gb
-	tests/test_tifffile.py::test_write_bigtiff
-	'tests/test_tifffile.py::test_write_imagej_raw'
-	# TODO
-	tests/test_tifffile.py::test_issue_imagej_hyperstack_arg
-	tests/test_tifffile.py::test_issue_description_overwrite
-)
diff --git a/dev-python/tifffile/tifffile-2023.1.23.1.ebuild b/dev-python/tifffile/tifffile-2023.2.27.ebuild
similarity index 100%
rename from dev-python/tifffile/tifffile-2023.1.23.1.ebuild
rename to dev-python/tifffile/tifffile-2023.2.27.ebuild
diff --git a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild b/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
index ec60fe7de7e2..b090bcd6673a 100644
--- a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
+++ b/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index e0bbd83b0256..769fa0952c76 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,2 +1,3 @@
 DIST tld-0.12.6.tar.gz 358405 BLAKE2B cf7bd68f26507cd4ac1c681705d8c495131a8b3aa64115e0259f7ef33f61c5db4911cc8cb1493e901237d401bd4eff4bda9cd687d19d9e1e275c3d87980069ae SHA512 ff10041178976af97c920a519ce3bb5a0a46f4299c24419db9a0502e89296e2bd66885dac5927e940c3abc22d6b390336916622cab771a57ba1c8f0960de2583
 DIST tld-0.12.7.gh.tar.gz 444946 BLAKE2B ccd39014b3facdbb836aa33b0daddc819be2ad246985f8bbcd0f13ef01d026c7c9aaeb1cb41312602cf7babe6ec8273c9456a5afb83850f77cd90ad3f9a9b7f9 SHA512 11b573cea770f7aa1ae58f2e6787e62dddd515b2a91b5d4f89e160615b4e3d0d9219f43e3c94251efd3d5b46779390ed66a312ca1751b224284a0765da972b28
+DIST tld-0.13.gh.tar.gz 443877 BLAKE2B 9f84307ce704500096dd2abff75ead534dbd17b59ea0d3dae84394b791aeee873638e6e224ddd3b5c598293a46ead964ae36022b0c3c7411de7c64096d0c69cc SHA512 87157ca2fc8977a96f6289269015bc5a90f3f033fb8ea96552eb8d00d05a346d8f3c61123a311803aa301c735a510a2c0986364f3b2ae4366e2c34aea15b538d
diff --git a/dev-python/tld/tld-0.13.ebuild b/dev-python/tld/tld-0.13.ebuild
new file mode 100644
index 000000000000..cdcf22f36571
--- /dev/null
+++ b/dev-python/tld/tld-0.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="
+	https://github.com/barseghyanartur/tld/
+	https://pypi.org/project/tld/
+"
+SRC_URI="
+	https://github.com/barseghyanartur/tld/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/Faker[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' pytest.ini || die
+}
diff --git a/dev-python/toposort/Manifest b/dev-python/toposort/Manifest
index e0352e8e82f3..94f90bad6cf9 100644
--- a/dev-python/toposort/Manifest
+++ b/dev-python/toposort/Manifest
@@ -1 +1,2 @@
+DIST toposort-1.10.tar.gz 11132 BLAKE2B 373c9549cb5e64d2636fe8bd67d73a8eeab671243b562654660bc59c2ceddc4196fad3882bd68d873647ddf504a6c90174b5c995dbd7c8e457744b4daceaa099 SHA512 7578706b2b383f4e1c7228aebc2f590ec51953e36d594572d494bc928d4f207da7419a9b662a2f77426347f49d33f355f67f45e28226a7e4546d6c16c743dc4e
 DIST toposort-1.9.tar.gz 10878 BLAKE2B fc2f6543ae74ea6e448ffe2be4e47438842b5ba95eac2f45fcc8d72e682054af0b80a0d453c5afaebeb1c9881d6874ab16ea523b19aad589545c8aae0b8cf255 SHA512 ec86f59f5e61b6d1c783965095f71693306a83a8b54a0661cddb3c51a5e2f9314075b453a901b5e3664b77d9e047901120622dbc23d642269a9546f41395388a
diff --git a/dev-python/toposort/toposort-1.10.ebuild b/dev-python/toposort/toposort-1.10.ebuild
new file mode 100644
index 000000000000..8ff89edcaf7c
--- /dev/null
+++ b/dev-python/toposort/toposort-1.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Implements a topological sort algorithm"
+HOMEPAGE="
+	https://gitlab.com/ericvsmith/toposort/
+	https://pypi.org/project/toposort/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" test/test_toposort.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 3dede266efe1..e2edda34e53e 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1 +1,2 @@
 DIST ubelt-1.2.3.gh.tar.gz 324632 BLAKE2B bafb67048a8a6525fc0aa1393fff22a3bf56d3843d195dc29125b8f452c4700dff77282349fbb44e0fc23a5495bcf48d6626879603f6c68a14ee04435d0f1831 SHA512 2a0a3e8b40ebaa5d2c7856cd197cdd8113ff58be6827ce57f394284f824e310078ef2a754247575c9eec2d3d1eecce2ec22239102eade025d556a79552e5f9d3
+DIST ubelt-1.2.4.gh.tar.gz 337670 BLAKE2B 4c8b1c05cbed0f28e69b43445f12881e4c619be4a513b9263a6eb4d674e56b0a869d1e78072e1e89a505a12b3b40dddbb48424bccdcfbae1a7eabf7746bc79d0 SHA512 5fbe36598a035d1504b24a06e8f0fcd1c9d0ccc238f81bfad582288aced9ebc8323e7acf2705d47e60f36513cbf665051f554cce122d75d55247b5fc122af419
diff --git a/dev-python/ubelt/metadata.xml b/dev-python/ubelt/metadata.xml
index 3714117854ff..1cb34565e417 100644
--- a/dev-python/ubelt/metadata.xml
+++ b/dev-python/ubelt/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">Erotemic/ubelt</remote-id>
 		<remote-id type="pypi">ubelt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ubelt/ubelt-1.2.4.ebuild b/dev-python/ubelt/ubelt-1.2.4.ebuild
new file mode 100644
index 000000000000..1900b772e9f4
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_editable_modules.py::test_import_of_editable_install
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 1173cae68ca4..972e67cc782d 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,2 +1,3 @@
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
 DIST vdirsyncer-0.19.0.tar.gz 122533 BLAKE2B 18e3359fb743a8ce71f80c46da21555c4984ca47791e1a4e899408050e4a4bbad184fa94026fede1168fa3a7695539d93f1985b85c640aa1c0ca4fdf52920766 SHA512 9b8e467bdc9daf6d50981bfec1f67a1c990b07bc62a6e2d3ede35712fde60206672af53d53aca6587daee132ab74bf74f04d8bb4dbaa804dfe97dca9370b323c
+DIST vdirsyncer-0.19.1.tar.gz 122699 BLAKE2B 31fd6351046f5e668312594fa698a647e67f4b66e989a60c2bc6312748f09ea7971d3b5c04ceacbedbb7618e75febfdf175a82f286ca9425f14828ff044997d5 SHA512 2b0917bf69cfa298600b6b35b50db12ca57e1a963baf2ea9839a3c2f9f686f2f83f47c01e44ad2e12287ecfd470fe1a9ee4a756c0f8985236c2fe8d0454b6a15
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild
new file mode 100644
index 000000000000..66223c31a60b
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 pypi systemd
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="
+	https://github.com/pimutils/vdirsyncer/
+	https://pypi.org/project/vdirsyncer/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/click-9[${PYTHON_USEDEP}]
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	<dev-python/click-log-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.8.0[${PYTHON_USEDEP}]
+	<dev-python/aiostream-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aiostream-0.4.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/aioresponses[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+distutils_enable_tests pytest
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/system/utils/test_main.py::test_request_ssl
+	)
+
+	epytest -o addopts=
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_douserunit contrib/vdirsyncer.{service,timer}
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 60d94bc4806b..9a28b501c371 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-20.17.1.tar.gz 12269737 BLAKE2B 5caa223d549ecb69de3a17dec84a608f34f01c5abd39ab478c27438f71e36e6878a719f9002464dbf0f335bc90a2f4552e201d59e0e757fabef6f3caaaf857fb SHA512 6b32145f431f6b1f4c2a2ed888e8b9e5cb941e04ea1e68830053dceac80ee8bbf2286c1f353951d50d4b8417b8d81ee4b30dae597c94f2a3baf50f174f7ef4d4
 DIST virtualenv-20.18.0.tar.gz 12063086 BLAKE2B 272957077dd0a5868e8979c7c34bda1ae28af857d1d5bbafeef6955bcf44a7c5d38f4f131b57a2593180ffdc5a034b18998ba3e4307b7191ebafccc80ef46278 SHA512 b02533878b8d8859f10b51dbdb9fecddf9b49aa2cf1437ddc10cadba82e5361fdeb8b8c94efcc3c8268ddecef31651c28c213e87588aa917479e8d0e2e823493
 DIST virtualenv-20.19.0.tar.gz 12063084 BLAKE2B 6a6d94c7099aa841523909173b04821697c7fc8b284325dbf191f6b2184bce19802924e0a001267448a785c35f8bbd7cee74f7514a375e4e47a9d3275404f756 SHA512 75c63fea11ad070985cb2ba17adfcb7e1739e8798b80919cc17a527d7180f68a04197436b44146cd07423d8d2e4982d1716b0e18159add5ce6a748b31f6b2776
+DIST virtualenv-20.20.0.tar.gz 12069625 BLAKE2B 3db53d2859c542953be233af0d195d992eecef345700ad7c229b88519f7042189907263d312d3613b45c5c069bec2440a8639bcc58b2c6894ed79301735e65b2 SHA512 6710efcbead1358479961c84ec3f6b9c3a1fc59c2f6b33fa13e2609554f7072aee7ef8cc07b4aa2fbc27ac950a78e447529fb8ceb2e4ee0881a4356a67d26641
diff --git a/dev-python/virtualenv/virtualenv-20.20.0.ebuild b/dev-python/virtualenv/virtualenv-20.20.0.ebuild
new file mode 100644
index 000000000000..d32afc1e8df6
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.20.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/distlib-1[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+	<dev-python/filelock-4[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
+	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx-rtd-theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+	)
+
+	epytest
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index b90d67731b2f..e832e3dd4d86 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,2 +1,3 @@
 DIST watchdog-2.2.1.gh.tar.gz 101485 BLAKE2B 4ec0a2c14d0dcb8d39ed4dea48c1318474768298b4eade4f7c08f811282ffdbf5871c7d55d71681863c38d1f0603c46aaadda73bf38a20ef263fa3b4cf76c354 SHA512 bbd6e3e3fdc7ee5df21b78241922c0050aeb0c01e394fa7d025465f04f3307d190af4cf6e822826975a3b095fb479dfd103be0675f12782e8899f556797baed4
 DIST watchdog-2.3.0.gh.tar.gz 103265 BLAKE2B 0817b64e6fc4b31b922f2f73091cc39f702605fa31041a75312635e5500dfeeeab749f0bfd95f3e27900be8f017c4a1b0c07aab40989a9000d1970a2b1e06c1f SHA512 733d408e74a81ce834075472d7488e8d767f80ef92a2a13cc986c1f5d879b0353f0cb85c1996168ae6b8b82d135bcb26c6c18b51a01a8d75915bdec94acd607d
+DIST watchdog-2.3.1.tar.gz 123140 BLAKE2B a49307b890b9f69eda760c6285d325fddc7281347740b36d7c840a5e28ef496498420c21424f1553bf1dc0d47a928194720ef1ae542e7c0f6f58085760c2e8f5 SHA512 a492c818fcc8b21ca4052fecafdf6b4d00f441034d73b10464fc9c09a89d539acd8304e591ded96e5d992e2c9455be018373ba4f06a33b047e606c083f9061e8
diff --git a/dev-python/watchdog/watchdog-2.3.1.ebuild b/dev-python/watchdog/watchdog-2.3.1.ebuild
new file mode 100644
index 000000000000..a40cce8f861b
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="
+	https://github.com/gorakhargosh/watchdog/
+	https://pypi.org/project/watchdog/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i setup.cfg || die
+	default
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# known flaky
+		tests/test_emitter.py::test_close
+		# requires root powers via sudo (yes, seriously)
+		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
+	)
+
+	epytest -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index c33120385faf..4e0db6d8a1cc 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,2 @@
-DIST websocket-client-1.4.2.tar.gz 49113 BLAKE2B d1d25d7066512ae5a8fa189b22ad320331b3d34e6ae953a29b7b5644065a9d60ffd6743bae6e769f356b7294374690fba103ee42ed59f5f9b213dfeda7f038af SHA512 4003a6b387096a738e9b9f76129b954bbc208b8b75c6ba9d6f0dade82078645109f985164ce25c1a600e630833f7187d51d6236997d6c72315d206e91f1aae7a
 DIST websocket-client-1.5.0.tar.gz 49931 BLAKE2B 03911ba7c147e19dab2fe3198ead34f1dc7d7ac970f33d20cb1eaa9ade0924be873c8ccc585326a8feb9ccf86443b1f5ee1482191cb14a50dddae5b5275b1f9e SHA512 678ab14a8c036e341134e6ae19d422a8888e64ec781983c2eff9d7897298a3b1899b65813351bb566319c931918c034cf0a730aa07c06e48ebac3ddb409a8dee
 DIST websocket-client-1.5.1.tar.gz 49942 BLAKE2B 7996798a5ff8c2eb1322fc7a9fa61d5cff99c71413293ce5b05f9af3581cff472350e79813ce3b393ce4fa4b7d19de956f0ad9ff6232c426be3c8adb8c91fb40 SHA512 9fce0c8de64e051b151c40a295a7f722ed7f95d19bd92ffd5cd9c64962821024e79b70d18ca7e30ca8b8707ba86be041134f13d7e2cf7bc4a4539eb22ba60895
diff --git a/dev-python/websocket-client/websocket-client-1.4.2.ebuild b/dev-python/websocket-client/websocket-client-1.4.2.ebuild
deleted file mode 100644
index d98896f264c6..000000000000
--- a/dev-python/websocket-client/websocket-client-1.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.5.0.ebuild b/dev-python/websocket-client/websocket-client-1.5.0.ebuild
index 4e70f6ad65d9..d98896f264c6 100644
--- a/dev-python/websocket-client/websocket-client-1.5.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/websocket-client/websocket-client-1.5.1.ebuild b/dev-python/websocket-client/websocket-client-1.5.1.ebuild
index 4e70f6ad65d9..3112bf6e3795 100644
--- a/dev-python/websocket-client/websocket-client-1.5.1.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.5.1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="WebSocket client for python with hybi13 support"
 HOMEPAGE="
 	https://github.com/websocket-client/websocket-client/
 	https://pypi.org/project/websocket-client/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 5144e4372843..c8d81271307f 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,2 +1 @@
-DIST werkzeug-2.2.2.gh.tar.gz 844463 BLAKE2B 84da3dd89375d6925e7e7018701339ddfd2b608acf6b3f126bd56c2020056511de6ab157de9024069d1342f9bce4b481ba91a06089fff1a3b31f4a851af7f935 SHA512 cded6c7e0b00871366b70a41de45e31323c0fc09300413d0efca98f5a2f8207026fd77c7e5670fde727da377fd02b9b636f390a2524d2b5778e9e3bdbdfe3e3a
 DIST werkzeug-2.2.3.gh.tar.gz 847768 BLAKE2B 7d0b891a2b15e4fc469c3d331cfb2565f452ae77f772f7ab8e6254aedd172f9115cd3ebd9c82e951ea7505c0e58d6b6f07fb643a8e87af505e04686cccf56cd4 SHA512 3968e663f67e41da5148a4aa1d8e047ffd88416fa8df665e359bbe87992e4e723e1c915eed59ae86b53dd18817e41cdcef059483bce7aa8ed7b388dd4add1482
diff --git a/dev-python/werkzeug/werkzeug-2.2.2.ebuild b/dev-python/werkzeug/werkzeug-2.2.2.ebuild
deleted file mode 100644
index 7e2db22b86dc..000000000000
--- a/dev-python/werkzeug/werkzeug-2.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' python3_{8..10})
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.2.3.ebuild b/dev-python/werkzeug/werkzeug-2.2.3.ebuild
index a9d4ea56708e..7e2db22b86dc 100644
--- a/dev-python/werkzeug/werkzeug-2.2.3.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/whatever/Manifest b/dev-python/whatever/Manifest
index 11b9a3c92eeb..56de536a49fd 100644
--- a/dev-python/whatever/Manifest
+++ b/dev-python/whatever/Manifest
@@ -1,2 +1 @@
-DIST whatever-0.6.gh.tar.gz 6003 BLAKE2B 410093960b8e17b1e0a7f91d7692bfd9e3f88a73cffb17a9a1763d42674cb1ec75da2b0a6575279c93451f24504086bdb89487bcc44bb116cbb2af89b9a7521b SHA512 f982100f0d6a8bf4c30e452a083c75f4cb2bca07e57e40ba4fd66baca752f039aea9519ffb97b3d43708df0ff5e981d0c4d03773f225106aa2f43e7770ee1975
 DIST whatever-0.7.gh.tar.gz 6373 BLAKE2B 401edadee8379dda2a2a90d7e02b64e2c091b4ad6a9ae3c25b9513b3953f09c89b7cad5bf48fc96713a332a8e3891f2bbca755c7f6d4817578eeab1f986e8640 SHA512 7641957f6eabad0d8485dac9b9cfaf0c6a8426ec9817c4e0748e669561fb5fbe21932f9bb864362ee34f5a5bff8ce6f6803c428130c1af3aabef3d583d7a582e
diff --git a/dev-python/whatever/whatever-0.6-r1.ebuild b/dev-python/whatever/whatever-0.6-r1.ebuild
deleted file mode 100644
index 8f64b4f30626..000000000000
--- a/dev-python/whatever/whatever-0.6-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Easy anonymous functions by partial application of operators"
-HOMEPAGE="https://github.com/Suor/whatever"
-SRC_URI="
-	https://github.com/Suor/whatever/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/whatever/whatever-0.7.ebuild b/dev-python/whatever/whatever-0.7.ebuild
index 24b4808c54e5..e662527bfda6 100644
--- a/dev-python/whatever/whatever-0.7.ebuild
+++ b/dev-python/whatever/whatever-0.7.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/whatthepatch/Manifest b/dev-python/whatthepatch/Manifest
index b631f6baed56..bcc8a300fb0e 100644
--- a/dev-python/whatthepatch/Manifest
+++ b/dev-python/whatthepatch/Manifest
@@ -1,2 +1 @@
-DIST whatthepatch-1.0.3.tar.gz 28634 BLAKE2B 94c5a074bf30ce81dbad1c8c3830efa726f8526e35da03949abb32803721ed01f3faf4c6bfe098bf679e3990489c19a7ba06c73a86959e4ee59adc2a37d59e3b SHA512 87e3e0aa78f71ad73f1b9663c3b1b53ae700ce82f2a5135717487d2ce8e597e3eeb2a9316b3ac96c27eb25a4a8c1e11658d93e976e882dd9f46cb1057f317211
 DIST whatthepatch-1.0.4.tar.gz 31063 BLAKE2B b3f66ca0783ae147ebf5d47aa155a23cfbc16fc19aaca9812b53b2a292543f64447e31b469645bfeffb8ab1b8a5ea7cebb9ebad5e9815d6a84a3b44068329448 SHA512 89705fa1ad4a797038b8c4cd30c7ca88b5b51474265bc157f45c244b258075cde587c6da16fabfaa2d6b90eee858ccf82c9f01ce8e44412a5eac504f95fb413b
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.3.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.3.ebuild
deleted file mode 100644
index 77385ba4720c..000000000000
--- a/dev-python/whatthepatch/whatthepatch-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A patch parsing and application library."
-HOMEPAGE="
-	https://github.com/cscorley/whatthepatch/
-	https://pypi.org/project/whatthepatch/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.4.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.4.ebuild
index 14cb3b738351..cb31437231b8 100644
--- a/dev-python/whatthepatch/whatthepatch-1.0.4.ebuild
+++ b/dev-python/whatthepatch/whatthepatch-1.0.4.ebuild
@@ -6,17 +6,16 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A patch parsing and application library."
 HOMEPAGE="
 	https://github.com/cscorley/whatthepatch/
 	https://pypi.org/project/whatthepatch/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index e3c349abfe4a..139040ecc8fd 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1 +1,2 @@
 DIST wrapt-1.14.1.gh.tar.gz 133767 BLAKE2B 407a9531f581b034be7fe4392dcbf94803aa9c3a82d7c392750dfef62a5cbb84582e292819bf749356fad2b6e98cc89777df0f3b0f4ca70422e75b72ad256711 SHA512 c67e99eb29afeefb2512fb545cd180b8e96f69235d6281edebe62ea5e411188a904a7e683afdda2d6a86cf8b7fd74f79a3c3bec04e19a7c5ef347729bb43f94c
+DIST wrapt-1.15.0.gh.tar.gz 137402 BLAKE2B 8c4764251a89f7795fef71dd71d9c36611d896d2e2791a5e7ce4f665f7b477e683f21aa05251a6ceb96644221a7ff9b01dfe98a7f4d278987dedc17ead39b343 SHA512 6be3fc6380e6bb11a26e35fb093ca54d2e851ab384682f6b1201599980c0429c1e2f23089540b66dd80985baaaf3fb93ce29034758e062e2cfb2f52e3b362779
diff --git a/dev-python/wrapt/wrapt-1.15.0.ebuild b/dev-python/wrapt/wrapt-1.15.0.ebuild
new file mode 100644
index 000000000000..1b7cfe7b88b0
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="
+	https://github.com/GrahamDumpleton/wrapt/
+	https://pypi.org/project/wrapt/
+"
+SRC_URI="
+	https://github.com/GrahamDumpleton/wrapt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+python_compile() {
+	local -x WRAPT_INSTALL_EXTENSIONS=true
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/yapf/yapf-0.32.0-r1.ebuild b/dev-python/yapf/yapf-0.32.0-r1.ebuild
index d8665695e7b3..db3d7b1b2d2e 100644
--- a/dev-python/yapf/yapf-0.32.0-r1.ebuild
+++ b/dev-python/yapf/yapf-0.32.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 04626a0484a3..8436d1d679fa 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,2 +1,3 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
+DIST zc.lockfile-3.0.post1.tar.gz 10190 BLAKE2B 80f732b758581b25f7d45c843b73b35985ad24185a04d207b612b448e6a1c52e49103d214e9a8b1fa0c3965037c8bcd73c504c5e0e8267814a380e08dc6f1256 SHA512 180d167ffd5760d8f9de02fcbf8e715ad04382d530f3b2970b92e346a588bb3da16926871be944441b2c0d4c8501a9d59fed2dc3c0a733b6c4478b6571d4b911
 DIST zc.lockfile-3.0.tar.gz 10043 BLAKE2B 9435f9999f976e6bfd6302b3d24960e21992f54755c6dadd9f0392254ff89b474039d7502c81c9667b4bb741300ced33bca35634f8990840809692cb025cb7f5 SHA512 65662d03933b0e295d69971a74a1d1ddf67086287bd98752d6d23d793130b0c612413c0dba365f7fa2213a5ef0981fc20bccbde304dc36a4092ad1f702ee9429
diff --git a/dev-python/zc-lockfile/metadata.xml b/dev-python/zc-lockfile/metadata.xml
index 681f8ff378db..ad9c502a6d7a 100644
--- a/dev-python/zc-lockfile/metadata.xml
+++ b/dev-python/zc-lockfile/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">zopefoundation/zc.lockfile</remote-id>
 		<remote-id type="pypi">zc.lockfile</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
new file mode 100644
index 000000000000..db027ffcd598
--- /dev/null
+++ b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Basic inter-process locks"
+HOMEPAGE="
+	https://github.com/zopefoundation/zc.lockfile/
+	https://pypi.org/project/zc.lockfile/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
+S=${WORKDIR}/${PN/-/.}-${PV/_p/.post}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# rdep is only needed for namespace
+	sed -i -e '/install_requires.*setuptools/d' setup.py || die
+	# use implicit namespace
+	sed -i -e '/namespace_packages/d' setup.py || die
+	# do not install README into site-packages
+	sed -e '/^    include_package_data/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest zc.lockfile.tests -v || die
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index e3d208fc7ef2..0d7f8d9679a9 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 72012ac9ff90..db6cd834f163 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,4 +1,3 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
-DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
diff --git a/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild b/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild
index 8a73d92538bc..6ef89508857d 100644
--- a/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=5
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtsql/qtsql-5.15.8.ebuild b/dev-qt/qtsql/qtsql-5.15.8.ebuild
deleted file mode 100644
index d4bfc51740fa..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-
-SLOT=5/${QT5_PV} # bug 639140
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usev sqlite -system-sqlite)
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7ae8d901dfd3..379ee524f2ff 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 1904f423a997..c117a5b8af0e 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,5 +1,2 @@
-DIST rack-2.2.4.tar.gz 278632 BLAKE2B 2d12a9c1e239590a4aedea5f3bb4c171b6032255658688a151e665aa1cb33dee17754c7b2736f8f1725c70b8344f5f6664cace8c4d4cb4e9f6f2ee1c7a3117c0 SHA512 aef54a06efce54d58e600829bbf550162bf68fe710b61b2b81022b2a8581819fb575e03992f493f11ed5f3391349f21cd142f6acc5b6017ec4c8e21cb17e4874
-DIST rack-2.2.5.tar.gz 278648 BLAKE2B 8778364969506e8fdb152c5f88ab4b0b07c8764bf2cff9aee82ab6ca9958669038100816804215a09947a15b8ce06597c9204d4f2b34218178c14dfc8298ac48 SHA512 bc0e33d7bab700e2a5ad05aa1089d261b3f78a6c456ff14def57645df853915057ae9d42fb5ecd72989737a2882dcbdefe7af4939020efdde1ada38a4cf274e2
 DIST rack-2.2.6.2.tar.gz 278839 BLAKE2B 30cb5607bba97ef3a6a20f917b82c46de734cd0c248ae20bf3af266814e32250cf6cd77aea49de28a24651335cdc888385968cb4b9937843ffd99cad2283e896 SHA512 73202990bad9e34da84c45f70c71c45bd6291960d58a04ee4b013835d5c5a8a066f36d31275913744a63cb9836c5071bb237b7f613a717794f49236c195107a8
-DIST rack-3.0.3.tar.gz 786619 BLAKE2B 471c76e05dc52809e1cd95463ffe7fd2b9bbb0f0d97783d5cbea728cad1cf8272b7045f7329aec6efc9d3881c87b1e3a6e3eb376de015eb6e1188c37668531c1 SHA512 9b5860c62191df983a76aacc0c765d6275aff6d0d146fe0f2f1361e9ad6b76115ba0cbb94682bf9bdede8170e086b67018d362044099c91ea3dc015944d1b444
 DIST rack-3.0.4.1.tar.gz 787073 BLAKE2B 532bd36dcb521da8387d464dca0983417a9a89a4d365e5652894003e38ffdf5939a903510be73aaf607c6a695909058aaef311967e6d66c525b26af3ea4c5e82 SHA512 6cfb35d78901fdb5e7b4571eb6b37b035014cfea705aeff280a73930793e53cd6d2d9b51ae86803567884b5509af358c95687eecc222a5df61dc80d0ada019af
diff --git a/dev-ruby/rack/rack-2.2.4.ebuild b/dev-ruby/rack/rack-2.2.4.ebuild
deleted file mode 100644
index 8845730cf3f3..000000000000
--- a/dev-ruby/rack/rack-2.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-	=dev-ruby/psych-4*
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !!<dev-ruby/rack-2.0.8-r1:2.0 !!<dev-ruby/rack-2.1.1-r1:2.1"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
-
-	# Avoid test failing due to security version number usage
-	sed -i -e '/support -v option to get version/askip "broken with security version number"' test/spec_server.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-2.2.5.ebuild b/dev-ruby/rack/rack-2.2.5.ebuild
deleted file mode 100644
index 79462f5c22de..000000000000
--- a/dev-ruby/rack/rack-2.2.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-	=dev-ruby/psych-4*
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !!<dev-ruby/rack-2.1.1-r1:2.1"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
-
-	# Avoid test failing due to security version number usage
-	sed -i -e '/support -v option to get version/askip "broken with security version number"' test/spec_server.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-3.0.3.ebuild b/dev-ruby/rack/rack-3.0.3.ebuild
deleted file mode 100644
index 7aee70d2e0f0..000000000000
--- a/dev-ruby/rack/rack-3.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index dc52dfef3415..ac9193191705 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/snack/snack-2.2.10-r12.ebuild b/dev-tcltk/snack/snack-2.2.10-r12.ebuild
new file mode 100644
index 000000000000..98877b833d37
--- /dev/null
+++ b/dev-tcltk/snack/snack-2.2.10-r12.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=yes
+
+inherit distutils-r1 flag-o-matic toolchain-funcs virtualx
+
+DESCRIPTION="The Snack Sound Toolkit (Tcl)"
+HOMEPAGE="http://www.speech.kth.se/snack/"
+SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+IUSE="alsa examples python vorbis"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
+	alsa? ( media-libs/alsa-lib )
+	python? ( ${PYTHON_DEPS} )
+	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${DEPEND}"
+BDEPEND="python? (
+	${PYTHON_DEPS}
+	${DISTUTILS_DEPS}
+)"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S="${WORKDIR}/${PN}${PV}/unix"
+
+PATCHES=(
+	"${FILESDIR}"/alsa-undef-sym.patch
+	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
+	"${FILESDIR}"/${P}-debian-args.patch
+	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/${PN}${PV}-seektell-fix.patch
+	"${FILESDIR}"/tcl-${P}-python3.patch
+	"${FILESDIR}"/${P}-lto.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+	"${FILESDIR}"/${P}-implicit.patch
+	"${FILESDIR}"/${P}-parallelMake.patch
+)
+
+HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*"
+
+src_prepare() {
+	# adds -install_name (soname on Darwin)
+	[[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch )
+
+	sed \
+		-e "s:ar cr:$(tc-getAR) cr:g" \
+		-e "s|-O|${CFLAGS}|g" \
+		-i Makefile.in || die
+
+	cd ..
+
+	default
+
+	sed \
+		-e 's|^\(#define roundf(.*\)|//\1|' \
+		-i generic/jkFormatMP3.c || die
+	rm tests/{play,record}.test || die
+	if use python; then
+		cd python
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	# For Clang 16, bunch of -Wimplicit-int, etc
+	append-flags -std=gnu89
+
+	local myconf=""
+
+	use alsa && myconf+=" --enable-alsa"
+
+	if use vorbis; then
+		myconf+=" --with-ogg-include="${EPREFIX}"/usr/include"
+		myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)"
+	fi
+
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--includedir="${EPREFIX}"/usr/include \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		$myconf
+	if use python; then
+		cd ../python
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd ../python
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	TCLLIBPATH=${S} virtx default | tee snack.testResult
+	grep -q FAILED snack.testResult && die
+}
+
+src_install() {
+	default
+
+	if use python ; then
+		cd "${S}"/../python || die
+		distutils-r1_src_install
+	fi
+
+	cd "${S}"/.. || die
+
+	if use examples ; then
+		docinto examples
+		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
+		dodoc -r demos/tcl
+
+		use python && dodoc -r demos/python
+	fi
+}
diff --git a/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild b/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
new file mode 100644
index 000000000000..0731a9cc5200
--- /dev/null
+++ b/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="Python package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclpython.htm"
+SRC_URI="https://github.com/amykyta3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+	emake PKG_NAME=tclpython3 CC="$(tc-getCC)" \
+		MYCFLAGS="${CFLAGS}" \
+		MYLDFLAGS="${LDFLAGS} $(python_get_library_path)"
+}
+
+src_test() {
+	emake PKG_NAME=tclpython3 CC="$(tc-getCC)" test
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)
+	doins -r build/tclpython3/tclpython3
+	fperms 775 /usr/$(get_libdir)/tclpython3/tclpython3.so.${PV}
+	dosym tclpython3.so.${PV} /usr/$(get_libdir)/tclpython3/tclpython3.so
+
+	dodoc README.md VERSION.md
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index a4041aa19c00..83865f86c881 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/rubber/rubber-1.5.1-r1.ebuild b/dev-tex/rubber/rubber-1.5.1-r1.ebuild
index f0854a9d276b..2a80c8a79354 100644
--- a/dev-tex/rubber/rubber-1.5.1-r1.ebuild
+++ b/dev-tex/rubber/rubber-1.5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-tex/rubber/rubber-1.6.0-r1.ebuild b/dev-tex/rubber/rubber-1.6.0-r1.ebuild
index 5fd200da2906..5785279df623 100644
--- a/dev-tex/rubber/rubber-1.6.0-r1.ebuild
+++ b/dev-tex/rubber/rubber-1.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit distutils-r1
diff --git a/dev-tex/rubber/rubber-9999.ebuild b/dev-tex/rubber/rubber-9999.ebuild
index 90521d934140..52c54772aed8 100644
--- a/dev-tex/rubber/rubber-9999.ebuild
+++ b/dev-tex/rubber/rubber-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit distutils-r1
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 68ab943c1394..6510465d227b 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index e7d3040a9ecc..63b988181e17 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,2 +1,3 @@
 DIST android-studio-2021.2.1.14-linux.tar.gz 1010969463 BLAKE2B 24899d0b81303c5f7ad061afd80eac734444b313f40257d20dc99b99f11a867bb92fe7b77428e5431889fc2beabcea58a5875608087a5de96105675c42b2a8ba SHA512 9d9184828a8ca0007e613e53215b0af1abd2c79a482670fe7bbb708f2bcb144b8881ef2d1c89ca8e2528aedc1f3b7d4a40c0c6d3e20a16de520aaf075f6990a7
 DIST android-studio-2021.3.1.16-linux.tar.gz 976205257 BLAKE2B 8854a346b751338bfadac61820a78f7ea9aa87828f9049a22d69221fc3ac2c4a9e6e738b84b2eb81023ceeb7866c35b74d38b0d9c2fca534df6e0947b6699b05 SHA512 4c033e1b5dd68fc73fe203ff19e134cf72d3a8faa9a9ba041bf478e529376f962c31d598b85e43a625fa56ef24f2ab6e13378125a7b710449daaf6d727ab51f5
+DIST android-studio-2022.1.1.21-linux.tar.gz 1014162603 BLAKE2B a3cc78ba4ba869d9615a55a90827171164ab961730681fa48962feeabf6a355930bb32d1822c31fb024f56f3e5d8d6880471505c3b48b1fe507ef15d44e2b0fa SHA512 5e850c6c5bb05923b41e4fafb0a20afcbec884cea427d5bb26a82e767930ef2c4477592e9338b1ea0458a3590d017f057a615749d9b9e1e8b364f67582ef0263
diff --git a/dev-util/android-studio/android-studio-2022.1.1.21.ebuild b/dev-util/android-studio/android-studio-2022.1.1.21.ebuild
new file mode 100644
index 000000000000..5cd01065fae6
--- /dev/null
+++ b/dev-util/android-studio/android-studio-2022.1.1.21.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+RESTRICT="bindist mirror strip"
+
+QA_PREBUILT="
+	opt/${PN}/bin/*
+	opt/${PN}/jbr/bin/*
+	opt/${PN}/jbr/lib/*
+	opt/${PN}/jbr/lib/jli/*
+	opt/${PN}/jbr/lib/server/*
+	opt/${PN}/lib/pty4j-native/linux/*/*
+	opt/${PN}/plugins/android/resources/installer/*/*
+	opt/${PN}/plugins/android/resources/native/*
+	opt/${PN}/plugins/android/resources/perfetto/*/*
+	opt/${PN}/plugins/android/resources/screen-sharing-agent/*/*
+	opt/${PN}/plugins/android/resources/simpleperf/*/*
+	opt/${PN}/plugins/android/resources/trace_processor_daemon/*
+	opt/${PN}/plugins/android/resources/transport/*/*
+	opt/${PN}/plugins/android/resources/transport/native/agent/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/android/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/bin/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib/python3.9/lib-dynload/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib64/*
+	opt/${PN}/plugins/design-tools/resources/layoutlib/data/linux/lib64/*
+	opt/${PN}/plugins/c-clangd/bin/clang/linux/*
+	opt/${PN}/plugins/webp/lib/libwebp/linux/*
+"
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="https://developer.android.com/studio"
+SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${P}-linux.tar.gz"
+
+LICENSE="Apache-2.0 android BSD BSD-2 CDDL-1.1 CPL-0.5
+	EPL-1.0 GPL-2 GPL-2+ JDOM IJG LGPL-2.1 MIT
+	MPL-1.1 MPL-2.0 NPL-1.1 OFL ZLIB"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.8-r4
+	>=dev-libs/expat-2.5.0
+	>=dev-libs/libffi-3.4.4
+	>=media-libs/fontconfig-2.14.0-r1
+	>=media-libs/freetype-2.12.1-r1
+	>=media-libs/libpng-1.6.39
+	>=media-libs/mesa-22.2.5[X(+)]
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	sys-libs/ncurses-compat:5[tinfo]
+	>=sys-libs/zlib-1.2.13-r1
+	>=x11-libs/libX11-1.8.1
+	>=x11-libs/libXau-1.0.11
+	>=x11-libs/libXdamage-1.1.6
+	>=x11-libs/libXdmcp-1.1.4-r2
+	>=x11-libs/libXext-1.3.5
+	>=x11-libs/libXfixes-6.0.0
+	>=x11-libs/libXrender-0.9.11
+	>=x11-libs/libXxf86vm-1.1.5
+	>=x11-libs/libdrm-2.4.114
+	>=x11-libs/libxcb-1.15-r1
+	>=x11-libs/libxshmfence-1.3.2
+	virtual/libcrypt:=
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	insinto "${dir}"
+	doins -r *
+
+	fperms 755 "${dir}"/bin/{fsnotifier,format.sh,game-tools.sh,inspect.sh,ltedit.sh,profiler.sh,remote-dev-server.sh,restart.py,studio.sh}
+	fperms -R 755 "${dir}"/bin/{helpers,lldb}
+	fperms -R 755 "${dir}"/jbr/bin
+	fperms 755 "${dir}"/jbr/lib/{jexec,jspawnhelper}
+	fperms -R 755 "${dir}"/plugins/Kotlin/kotlinc/bin
+	fperms -R 755 "${dir}"/plugins/android/resources/installer
+	fperms -R 755 "${dir}"/plugins/android/resources/perfetto
+	fperms -R 755 "${dir}"/plugins/android/resources/simpleperf
+	fperms -R 755 "${dir}"/plugins/android/resources/trace_processor_daemon
+	fperms -R 755 "${dir}"/plugins/android/resources/transport/{arm64-v8a,armeabi-v7a,x86,x86_64}
+	fperms -R 755 "${dir}"/plugins/android-ndk/resources/lldb/{android,bin,lib,shared}
+	fperms 755 "${dir}"/plugins/c-clangd/bin/clang/linux/{clang-tidy,clangd}
+	fperms -R 755 "${dir}"/plugins/terminal/{,fish}
+	fperms 755 "${dir}"/plugins/textmate/lib/bundles/git/src/{askpass-empty.sh,askpass.sh}
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+
+	# https://developer.android.com/studio/command-line/variables
+	newenvd - 99android-studio <<-EOF
+		# Configuration file android-studio
+		STUDIO_JDK="${dir}/jbr"
+	EOF
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-android-studio-inotify-watches.conf" || die
+}
+
+pkg_postrm() {
+	elog "Android Studio data files were not removed."
+	elog "If there will be no other programs using them anymore"
+	elog "(especially another flavor of Android Studio)"
+	elog "remove manually following folders:"
+	elog ""
+	elog "		~/.android/"
+	elog "		~/.config/Google/AndroidStudio*/"
+	elog "		~/.local/share/Google/AndroidStudio*/"
+	elog "		~/Android/"
+	elog ""
+	elog "Also, if there are no other programs using Gradle, remove:"
+	elog ""
+	elog "		~/.gradle/"
+}
diff --git a/dev-util/cargo-tarpaulin/Manifest b/dev-util/cargo-tarpaulin/Manifest
index dff7243835f0..aecb76d3796f 100644
--- a/dev-util/cargo-tarpaulin/Manifest
+++ b/dev-util/cargo-tarpaulin/Manifest
@@ -13,7 +13,9 @@ DIST camino-1.1.1.crate 30737 BLAKE2B f2403e2f3c4c66f14c298faf582d5ce4f3071be62e
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-tarpaulin-0.24.0.gh.tar.gz 201826 BLAKE2B 501441f8faf35b4e74ec1bfbed330cffbd3faad2e096d64927d6cebb57d3c39bc81318f4fbbb9e5009a915b77b3173d7a91c1b71adefbcf0fe8010493cd69e9b SHA512 4d96ca39889ea3794db491c7baefdc83d5820fdc6cddc8ae5ea2652194adf5300f9b86cf0e55e8468f2e258984f1be448f77469a8d246ffc68cf2a0917d7c7d7
 DIST cargo-tarpaulin-0.25.0.gh.tar.gz 204488 BLAKE2B e24b191ecc4068ed4f2ec7870fad04d62432bdc34c3058f43c4bf7d6dff468d86b9890f12555b6d00c5d765d2564ed0971bd37f975d77949a3819e32501a578e SHA512 0454183b134185ab8b9fd7e3c04e9c503a76c25ca8cb64caf4740830433ff84bf065ec095b9776c532c8b336af10b1599f1886d903ee1e2491205cb46ddf2296
+DIST cargo-tarpaulin-0.25.1.gh.tar.gz 205749 BLAKE2B 1127334e9a81f4655b58dd7d77b90e7a39f7646528c1cd0cccac08edb5c8a87d6b0d02e8c4c8bd79e7b402d9fb998da3e9f6d80100615a66dc3f85e7712438d0 SHA512 c21dc4c05d4b0f6ce2aa81d83b4d8716d0eeeb1336d7d9debef246fa26dcf4f402e327a9997eec0c451a2b89f941e1d19f41a4c58a960c3e0f211eb74cb1a670
 DIST cargo_metadata-0.15.2.crate 18528 BLAKE2B cb80318d0cf7316fa57badcaa0502737232b28bc9efd17a71ef1afa8e1b61a597d7f36d6ecfb41a2859360ed7ed7c7ffa86b9184400c4646d3196fb895cf3e94 SHA512 f663676ac3e2182d67d1047164eddd24d1006f61f378003abb1d5f53f9dfee672202d33a530cac1bb749955edd142ca78169dc3412d78c8fe98d6121c4303fd3
+DIST cargo_metadata-0.15.3.crate 19738 BLAKE2B fee5834f3eb741704c2322d9035943b1e841c8043c18686ee0748b90facad535c715bb882b61dfadf9e027556927051fe816de15c5f4f11e89c8927ddf717583 SHA512 60c0e601c73f11a02da6a168ea80e7cfaa27b895ef6f869ecf5932126364cc23bb480457601edcc7d0bf8c8635e71c0d1dbdfe37ab3e95ddec41f797bbfbac7e
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa
@@ -32,6 +34,7 @@ DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c84
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST gimli-0.27.1.crate 721022 BLAKE2B 65e69592d922379ea3d1e2ee9310a9af12d1c56bc256a668561d084deb925e60e7ff4f9bc6fa58879a8588d97a035de247a579e29bc26e30fbce1a2013604e08 SHA512 de9a0191c8fce8bb7a6fd778d261e28ecc34a06daffd8bfda00f20fe5cfd097080972ead0f1854fe0615d982e5eedb8ab2896e8504b1749ef271074a3f6946fa
+DIST gimli-0.27.2.crate 721636 BLAKE2B 61a202545529618b44035450c696b52559d5aa8af091dccc613d62b21733dadde0da467d40595aab71f4532d1fc2f2a6b3744e0aefe89f244e54b9eebf422d99 SHA512 1c0bf53754db2503033c17988e1cfa824af4e01f43c874b02fa61a475467185b13657c7ddf891e06f5984db3ef6b1e37586b184443716dbe45db1aa8bd082ba2
 DIST git2-0.16.1.crate 199956 BLAKE2B bf187855d683b13ec8ec0e103f6536fc2d8321d2a023eebca907a15f0bba760f833cce4a4b0958804675aeae1ee9d2dc0270edf02c66cc2d7231980ba7ab15d1 SHA512 4963798b6d9fc087a4394515b0f6da0a9e01fcbc220dc3d1880a277ea0487083ac05c0bc3a52a537885eb065a9b2209658a199835457b38c94e45395ad8d6252
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST gzip-header-0.3.0.crate 12503 BLAKE2B 6ce8d4676d761ff20d8a5f96b794743ed36122b16d0fb93e0cd0546e86e9373f4a63e62901ac21e25415f898bdeea21111a0cb93f357aca83bfed90bce97d755 SHA512 29ac184a5a3ea31235c597e29f40efdaf4c1aec5954019b05b2ab7fc3fcc680212860b4fe3cfbbb9ef3c6dec533f5ab599e46619d263268fc064a945381a78ec
@@ -76,12 +79,15 @@ DIST object-0.30.3.crate 258901 BLAKE2B 73e190fcbf7c47950ac036306ca8e6e03bd17724
 DIST once_cell-1.13.1.crate 31335 BLAKE2B f8455c5aa78073289669b8f277490ac9bfeafca3249bd54af91a51709262562f07e3154287f7a7db1711d0884fa2804aa82df5d7efb90b8ce5b2380c851be23c SHA512 492831607d12846923107b464a70de62f5997845faaae1625f3e54e2610e96b0355ce9e554051c2fae28f7e6e558ed456a6fc0b3c6a71b26f7443ede5eff5b32
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-src-111.22.0+1.1.1q.crate 5103224 BLAKE2B 3d437377cc0a320e852721af6baf119b8e9bb3f461b7fca45e510e2b8e76086a52809c359e2bb2ceeab789c44d8d8ee7a8eef9b521202fb96704e90c5a291e03 SHA512 edecb0d0115b8db74447bab4c347761c2ce88436fa2d17ffce938258f7d4d6533995f2029f5466ea730d833dd3ac86e637ed846736184584846411b36f7f242b
+DIST openssl-src-111.25.0+1.1.1t.crate 5112453 BLAKE2B 74eb78ed6cef3fece7206e969b4969ee0000e7c5e09be9243b4a643f13fb82a7f16fe85c2461eb07932179515e40b48246c9b9239d2d0cf392f90b12f74c78f9 SHA512 297ee8398611892f12841a0559092fb57eacd8219f78f542b92f27bc11df96029886d6509ec41a28901545013f6f623f21db14625c95d466c5c192e4b6ae6113
 DIST openssl-sys-0.9.75.crate 60028 BLAKE2B 1e4b3733d3309a1157c16a236728aeaf48b1b0ea448643416747343fbb96af86c8035ae0cf4170038b4521c88842f42a2379fd733f92fc9742e7c2d837eccecc SHA512 14985af6224bf1b6aae0fbd22c09e6b8ce7b9a6ace0970b1b45fc0e8c700e6a4bcb6b1883e3c78dbeafa02a18d4a84f537a952460d3f0baac3135d1f994af13a
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST proc-macro2-1.0.50.crate 41667 BLAKE2B 6ee76c87013226881a0cb1221f449b052feaf1b92fa6f7a3aa82420ee1881713b8bb71ac6cebff67fad436f5c05b2a8f601a84ba361bc08a06b0b26aec0e11e7 SHA512 89ddaf9b994026519e5ddd618ffdca1fb39d31904a13229c1496dc862e2a259086ed9554821ff33f73adf6df45f446231217fa7e22922289fe6fbd71e06ddd2b
+DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
 DIST procfs-0.14.2.crate 116068 BLAKE2B 86099545f027e8bfd78200e1048c711b05f4009250861a31e5b02f5b14348b3acfcf048bdf17516a7d785d027a9347c9af0bb2e1a4c5ae8d50d386e7167cba99 SHA512 70473fd8c6309507cf3451ed13d014b03e3bbc77bf50425849788e93cbe1082ed74780315a11f84def39f4dabf165df09a6faeaf9ebc14e2ecd57876c61de4c3
+DIST procfs-0.15.1.crate 128786 BLAKE2B c61d2d514eea64d4e6e55ded61eebaf63f391a77c2e6f36dee6730ebe3c5a6908507e514295c1562c722ec587e45550a2f8798167952689e80e1096f0bcb58fb SHA512 8ccd80a027deb759798d055e21ae56f346e3cb869af40de23970f7237100f46087b3c3f1908900ce558b92bf5d341421a1b717cfacdcdd6d38b256255f15ac82
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quick-xml-0.27.1.crate 146699 BLAKE2B 96926ddfd676113854bec7731acb7e775cbce4fddec2bda497a3a65cb06c3aa1c0566101305c59dd64978eaa5b100602b02fc9ccff79da75c74e609a9b1a67e4 SHA512 0b9fb9c7ce65ba00d756fe61183596912e326fe09ef83afb9d64be0b9f16e1b5a74c5bbb181f8f32c2d7fb3a7e4406ff814b3abcf481ad81acb5cdd4922d8787
 DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
@@ -101,6 +107,7 @@ DIST semver-1.0.13.crate 29653 BLAKE2B 382a1fd00b20e55d5c5f8bf536ee012f8bc4c2163
 DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_json-1.0.91.crate 144654 BLAKE2B 857f25cb43f8153ed4266fdc38b0a426ea04edd9e7954ceeab384729abb51ead1378a819eca6ced5cf20ed0cf237548b4c81ad507e3f4684aeb9bfd7e4958684 SHA512 b0bfa3d64fe9fb0d09ec8dcb6e41eba75ad0f0c4e34e0ffd5e2a3230057d7499a57ffda8c1615bea5195ef398afe414f3b0a143a39865123c1c5f976ea1a0337
+DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
 DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
@@ -108,6 +115,7 @@ DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
+DIST syn-1.0.108.crate 237607 BLAKE2B c9943d7d286faae9f9916f330b59f9473411296d56d8d7598827bddc3556d3e16cd189e752da726ce9853c4e21bbe4561cb3e15e46af41a3189cfbb5b0dd5df4 SHA512 db3f5f732b231e8cb7e50ae2cfa469507429c3400e6e80a7e402e23dde6a942c0fe383c046e83c166849b85caeec1ac2f903fab2e88a7c64a4a85fa92d0e271e
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.32.crate 17241 BLAKE2B 70a1fa10c54078a49cc167c2792fd54bbff17543966c221d1648a80f08da2fb880ae64f0d08984b7e0ffd6a79cac4c31c04a1c0bdea5b26d18e4a8c7d83dfe1f SHA512 cb1839b2687e228ea43838a8a2d55a04f5f3bd8c2972df0ff6a703560454abf9b838558c16095cc9b030b6b13e9d715e2b4741de6af9d5decdfeaaa508481138
diff --git a/dev-util/cargo-tarpaulin/cargo-tarpaulin-0.25.1.ebuild b/dev-util/cargo-tarpaulin/cargo-tarpaulin-0.25.1.ebuild
new file mode 100644
index 000000000000..0859dd7d5651
--- /dev/null
+++ b/dev-util/cargo-tarpaulin/cargo-tarpaulin-0.25.1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	adler32-1.2.0
+	aho-corasick-0.7.18
+	android_system_properties-0.1.4
+	ansi_term-0.12.1
+	anyhow-1.0.65
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bumpalo-3.12.0
+	byteorder-1.4.3
+	camino-1.1.1
+	cargo-platform-0.1.2
+	cargo_metadata-0.15.3
+	cc-1.0.73
+	cfg-if-1.0.0
+	chrono-0.4.23
+	clap-2.34.0
+	core-foundation-sys-0.8.3
+	coveralls-api-0.5.0
+	crc32fast-1.3.2
+	curl-0.4.44
+	curl-sys-0.4.56+curl-7.83.1
+	deflate-0.8.6
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fallible-iterator-0.2.0
+	fastrand-1.8.0
+	flate2-1.0.24
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	gimli-0.27.2
+	git2-0.16.1
+	glob-0.3.1
+	gzip-header-0.3.0
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	hermit-abi-0.2.6
+	hex-0.4.3
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	iana-time-zone-0.1.46
+	idna-0.2.3
+	indexmap-1.8.2
+	instant-0.1.12
+	io-lifetimes-1.0.3
+	itoa-1.0.3
+	jobserver-0.1.24
+	js-sys-0.3.59
+	lazy_static-1.4.0
+	lcov-0.8.1
+	leb128-0.2.5
+	libc-0.2.137
+	libgit2-sys-0.14.2+1.5.1
+	libssh2-sys-0.2.23
+	libz-sys-1.1.8
+	linux-raw-sys-0.1.3
+	llvm_profparser-0.3.1
+	log-0.4.17
+	matchers-0.0.1
+	matches-0.1.9
+	md5-0.7.0
+	memchr-2.5.0
+	minimal-lexical-0.2.1
+	miniz_oxide-0.5.3
+	nix-0.26.2
+	nom-7.1.1
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.15.0
+	object-0.26.2
+	object-0.30.3
+	once_cell-1.13.1
+	openssl-probe-0.1.5
+	openssl-src-111.25.0+1.1.1t
+	openssl-sys-0.9.75
+	percent-encoding-2.1.0
+	pin-project-lite-0.2.9
+	pkg-config-0.3.25
+	proc-macro2-1.0.51
+	procfs-0.15.1
+	quick-error-1.2.3
+	quick-xml-0.27.1
+	quote-1.0.23
+	redox_syscall-0.2.16
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.27
+	remove_dir_all-0.5.3
+	rustc-demangle-0.1.21
+	rustc_version-0.4.0
+	rustix-0.36.4
+	rusty-fork-0.3.0
+	ryu-1.0.11
+	same-file-1.0.6
+	schannel-0.1.20
+	semver-1.0.13
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.93
+	sharded-slab-0.1.4
+	smallvec-1.9.0
+	socket2-0.4.4
+	stable_deref_trait-1.2.0
+	static_assertions-1.1.0
+	strsim-0.8.0
+	syn-1.0.108
+	tempfile-3.3.0
+	textwrap-0.11.0
+	thiserror-1.0.32
+	thiserror-impl-1.0.32
+	thread_local-1.1.4
+	time-0.1.44
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	toml-0.5.11
+	tracing-0.1.37
+	tracing-attributes-0.1.23
+	tracing-core-0.1.30
+	tracing-log-0.1.3
+	tracing-subscriber-0.2.25
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.3
+	unicode-normalization-0.1.21
+	unicode-width-0.1.9
+	url-2.2.2
+	valuable-0.1.0
+	vcpkg-0.2.15
+	vec_map-0.8.2
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.82
+	wasm-bindgen-backend-0.2.82
+	wasm-bindgen-macro-0.2.82
+	wasm-bindgen-macro-support-0.2.82
+	wasm-bindgen-shared-0.2.82
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.36.1
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.36.1
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.36.1
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.36.1
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.36.1
+	windows_x86_64_msvc-0.42.0
+"
+
+inherit cargo
+
+DESCRIPTION="Cargo-Tarpaulin is a tool to determine code coverage achieved via tests"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/xd009642/tarpaulin"
+SRC_URI="
+	https://github.com/xd009642/tarpaulin/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+S="${WORKDIR}/${P#cargo-}"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="/usr/bin/cargo-tarpaulin"
+
+PATCHES=(
+	# integration tests require internet access
+	"${FILESDIR}/cargo-tarpaulin-0.20.1-tests.patch"
+	# test fails when not in a git repo
+	"${FILESDIR}/cargo-tarpaulin-0.25.0-tests.patch"
+)
+
+DOCS=(
+	CHANGELOG.md
+	CONTRIBUTING.md
+	README.md
+)
+
+src_install() {
+	cargo_src_install
+
+	dodoc "${DOCS[@]}"
+}
diff --git a/dev-util/cmake/cmake-3.25.2.ebuild b/dev-util/cmake/cmake-3.25.2.ebuild
index 8825af2a4a7c..decf97199034 100644
--- a/dev-util/cmake/cmake-3.25.2.ebuild
+++ b/dev-util/cmake/cmake-3.25.2.ebuild
@@ -47,7 +47,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 3ba8918f4b97..ddd5f53a1544 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -2,3 +2,5 @@ DIST cproto-4.7t.tgz 181095 BLAKE2B 60e8fc26acab8a7475d08c413b85bfc68b1fec877845
 DIST cproto-4.7t.tgz.asc 729 BLAKE2B 9b668a41374d273263d535fb4dba5038a72f3ee3d0f44a2bc5f6fa85a426f1c2209dea4655639b772f6d5d036af1131dec476c1e2e9dbb808a18a734ff538ede SHA512 d3874a04159a092322097c254a2a855db55409eaa7d529eaee973a4763bf71c525f8b40e9d5fbdf5028108713a8e891f45b26e31bd5c879d3d4e5249c8dcae3f
 DIST cproto-4.7u.tgz 183364 BLAKE2B 679cb2c41b396e363ebcf69c61c8b00448ddd27c4d1126b8d3eda1f1b429a7be42359d1b695b94dd1095b707d70a1b425930acc7d2998634159836e4a51ef953 SHA512 6ed7e98319cf2b8d701dcd0ccdbe29537e3b57725da527da1b3889edd696374728ae87cdda34c68314c3e3f80f10e5f99199771200ffb429091c91d378c672e9
 DIST cproto-4.7u.tgz.asc 729 BLAKE2B 4120151f5ffcaf42c1134e8998cd767aab58c4f09bf488186829d96bdc44266273e89b96e1bcad3b84d998ca3d82c4b1bc7d9213f11790853d9fd2f4d0a7c901 SHA512 bdaa60edf0a04e15f2de61398d118efced4c25849d8d2a326e2ad21cd296b73cb6a809933476fcbe7b4471b297368c8090b31e725a9ab3081e334a06c2282753
+DIST cproto-4.7v.tgz 193874 BLAKE2B 0fb13ac8f501b9111096666c54ccfa466fe7ecce6f26f7b62d72e12d19cd2f8dcef9ce37247018abe8ec4affc8c26f4d899e01f960c36b4cb7ee2239b11361fb SHA512 865d65a0db1198d4d07e8a9fba85e347a69d61530423feafae9b3a881606942279942af42ea67558ad2ae82926aaef76bd635913b3e00604eaffe82a8a6621fc
+DIST cproto-4.7v.tgz.asc 729 BLAKE2B 577ce738de30ab32099836041fe7b651764750eddee13135a9340410a50c0b46cf8034fb566d31748ea1db8d6d013e4e0c2abecc02d074a998828ce8b00d0fe8 SHA512 b0b03400b79aa04131bfe7176811dcb46cce05d339ab73552b787d9ade26a38e234f6c4f588e5a3cbe3a0521df73a6f7565a3a20181f3b677446ba9379ba8532
diff --git a/dev-util/cproto/cproto-4.7v.ebuild b/dev-util/cproto/cproto-4.7v.ebuild
new file mode 100644
index 000000000000..99cd309dd08c
--- /dev/null
+++ b/dev-util/cproto/cproto-4.7v.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Generate C function prototypes from C source code"
+HOMEPAGE="https://invisible-island.net/cproto/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="app-alternatives/lex"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/gperf
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
diff --git a/dev-util/cscope/cscope-15.9-r1.ebuild b/dev-util/cscope/cscope-15.9-r1.ebuild
index f0ca12cf9cfc..bf23e6c4ee32 100644
--- a/dev-util/cscope/cscope-15.9-r1.ebuild
+++ b/dev-util/cscope/cscope-15.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-util/lldb/lldb-16.0.0.9999.ebuild b/dev-util/lldb/lldb-16.0.0.9999.ebuild
index 985e9ba9d42f..1d8c4b56e83c 100644
--- a/dev-util/lldb/lldb-16.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-16.0.0.9999.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 		-DLLDB_ENABLE_LUA=OFF
 		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
 		-DLLDB_INCLUDE_TESTS=$(usex test)
diff --git a/dev-util/lldb/lldb-16.0.0_rc2.ebuild b/dev-util/lldb/lldb-16.0.0_rc2.ebuild
deleted file mode 100644
index 985e9ba9d42f..000000000000
--- a/dev-util/lldb/lldb-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-16.0.0_rc3.ebuild b/dev-util/lldb/lldb-16.0.0_rc3.ebuild
index 985e9ba9d42f..2fda5f613de4 100644
--- a/dev-util/lldb/lldb-16.0.0_rc3.ebuild
+++ b/dev-util/lldb/lldb-16.0.0_rc3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
+KEYWORDS="~loong"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/lldb/lldb-17.0.0.9999.ebuild b/dev-util/lldb/lldb-17.0.0.9999.ebuild
index 985e9ba9d42f..1d8c4b56e83c 100644
--- a/dev-util/lldb/lldb-17.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-17.0.0.9999.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 		-DLLDB_ENABLE_LUA=OFF
 		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
 		-DLLDB_INCLUDE_TESTS=$(usex test)
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230211.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 985e9ba9d42f..000000000000
--- a/dev-util/lldb/lldb-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230218.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 985e9ba9d42f..000000000000
--- a/dev-util/lldb/lldb-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
index 985e9ba9d42f..1d8c4b56e83c 100644
--- a/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
+++ b/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 		-DLLDB_ENABLE_LUA=OFF
 		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
 		-DLLDB_INCLUDE_TESTS=$(usex test)
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 1e2e70a18a12..23b20c34f651 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -10,13 +10,8 @@ DIST askama-0.11.1.crate 8182 BLAKE2B 5cfa6a0cf5679e271c1d35500b5ae40eb4fe1f955f
 DIST askama_derive-0.11.2.crate 7097 BLAKE2B 395811d68825531552ac9bedc30c1d59e15ade43b3818576212456974799c0713df8eb099970affed54397c800f62310d5f6f201bc2275f5168cd805f2330257 SHA512 c9b4c2b444c9c9f9054403b25a62e0415d87f0c8a0cd1ac9fc1cdd341c94c15eb91249006e59504a34a18703dd3b9bc5a4012804a4ce3d9401126b66c3632e65
 DIST askama_escape-0.10.3.crate 8875 BLAKE2B 6bb88f18aa0bd05a36e7bf5cfcaed3138ddb96ed366e7da9b9a64c4e0345fba384cfa3e9bfab3674c1697a7722bd59a9428438b78d44bcac78740d4c53c3d3e8 SHA512 1978add567021fac7f086b6091c97de81919877726455828164642c55607d5b5f6f01c0187f8a8a3371c9b3a1ef41f4c3c9e14d9068826c38ee8a6efe2eeb5a2
 DIST askama_shared-0.12.2.crate 38015 BLAKE2B 7f1f461abc5e1a6c692b254b939309be986435d8c7fe1adb8f3590478e0b0bfcd9c98b68f1f5cd72ea5b72afdc17f79927cbcc86500502965d5e2a8ff41236cc SHA512 05d9bbd47ed09700ea2ee32b5b27801c7b8ea3953a186ede54570a68e2541dcc07f49858cf55ff61c86e129c5d84ff1d92d555514064fd43b5fa2160bc24bb32
-DIST async-broadcast-0.5.1.crate 20134 BLAKE2B a45a7ff0b05eaab687f0912b2fdd0c3d9379402d5ccb8269568fbf77e235b42db0f741b4743438511fc00e7e1c6ec09c7b2f6e37b4b9a4df07846ae582e9c812 SHA512 48de28fad3fa8258b61f1adc0f13e69698f0fc3e11c68eb6b6d2df11784dc5c1e09f6f2c03dd12679d9888171b87cff3362ee06b910833e55d278738ab7508ae
-DIST async-executor-1.5.0.crate 15068 BLAKE2B d764f9166018d0dd07ca687be64f139e4dd8ae8488a1d6ada0595a17abb5fbd1c04b37c00b1f02e6c100529eeb0e9147729833e2203c56d4b92ae76fa75929ab SHA512 0fa79f50648aafed31d572e25534ac10df7d5d105119d4f6e1cc9af710e86103b0def49829ed6523e384634a3ccd697d01f07e4898c1e84dcb48d3fe52aaed5d
 DIST async-io-1.12.0.crate 37087 BLAKE2B 60cdb60d027be65df5bcdb83fd4e9bf8ef56d7500bde14261cf6488ba5b34b803ad3c546884cdc3ba524018e9951ffca71cdf04535e2964e49ca263c970e44df SHA512 21f978a9ae11300ba3dce493cc4a753bd07eb2dce69130cfea8a64983ac35416ab00eec5a94e53cf74f12a23fa91caccbbd3df766ad369c774cfbc844eeb5dbf
 DIST async-lock-2.6.0.crate 20497 BLAKE2B 9703dec1ecfda4b482b6df48bb1691b8aa5e6645c310e437656cb7eccd2115f2af6443063dd9f1ffd0108aa866cacdbabbebc287800b7824a25f2d1b8fbb4a42 SHA512 20cb5f5f37d4c4fd7f010d96ed79a924dcc7eee3584027c48ea0edc04d19158f080771acd63fe0534dc5762937a0c1ea8bce8df707526a9f245b5dda61317dad
-DIST async-recursion-1.0.2.crate 11383 BLAKE2B ccfc58c3e2c03cbbeb288bfcad171e4165de541a82355473e5ed62fd1e5c49737373497d7c4f2947e2bdde19ffa99c94dee16c5b6c665dbe5d44caab909fc6b4 SHA512 7851ca4f557b87c2d8ae38d72d5359d7e7f7a30c46ca6314fabd4464547fef0fc917a20e2ca7ebac04569cf3de0c4f151d4a29532b3d26a1ef0f5722d37a053d
-DIST async-task-4.3.0.crate 29544 BLAKE2B ed27a637b0c7196f9dbc13b597cd97afbf4bdcd78d5f46e20862a39f41ea3b2dd9335795dbb8fc22e2c4ba75e4678156fb062f91211e1caf2475546ca99ba327 SHA512 55f4fa697d1e00946e3e518e35117552e66a28a4c52e72f66af4c1b9a31e932d1fd32f31a4097fea707789575a9aec0db2ce9eb51643909480a41c52d3558d22
-DIST async-trait-0.1.64.crate 29196 BLAKE2B 8cd25de53df989d7d5b79181e0ed5b6bd7cad71a2dee24b56eca9c7c9d6024f4fcce89764fda830168c093dc5e447455443b319491097171ef4c049eeb7199b2 SHA512 0487a688cddae7529def0645f6ef4440916eaa757b14e8e414f910b55e17e2c1fe3fe18c216c3a1916a21909c32cba7add8e461adeefaa4be5deaa3c7085fad7
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
@@ -108,9 +103,7 @@ DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e680
 DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
 DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a
 DIST enumflags2-0.6.4.crate 10713 BLAKE2B 86219df31b9c8a60470f676a365f0f0890892baa7c9e3101a385d9475f9398ff8b62ce3295ca318a266f551c85048e02f26fa67ea9ac689e94a5ccafcb8f5ea3 SHA512 5814f58a8d22f093b94eb71611b9a5c8bf2145db9544397255d93126fdae220c261010d1dd2a278475e7e3c76bb9e67bd671c44f1edddc620924fd6fdc7dc03b
-DIST enumflags2-0.7.5.crate 15117 BLAKE2B 416be2914575d608e907b5ea964f80167ba4353c2c2ec3f65a9cf073e5f19e8597e24d7abcfbf951e35c0207a0325469d7a6211e82afa7481ed8c83b0f48bde5 SHA512 d275f1b7f49d5efaf2e4ed7b6665ad10526730192be9fd6b73ee0d414ce461a18b4024525527a867eaa007314c477700da5aadd8c44cab0e69b6331c711e75ce
 DIST enumflags2_derive-0.6.4.crate 3659 BLAKE2B b49a73fe2977e8f62af37c367f1452979cdc0575b532d086e612b84495113041221bd508cbf2b72e3179d929a2eabad59b9913db98b21491186a1f1bcf571a9a SHA512 a8a166ed48c77a3d23c1b1afe4dec1812c2a440736cb6c6059e46b90a0a216c81cb45ae6e439ed5b3dcd656faf1bb6dace4e46b908dd02321b4a59351240911b
-DIST enumflags2_derive-0.7.4.crate 8166 BLAKE2B 33b7be39b07a01fdf1f877b393353ec86e4b341acf1e2dd27b66ee5c00379dd834a3a6e619c58f84859670cad94c59749c9096b702e3777e69be2be5fdfc6db1 SHA512 9d70027993e6784674c5142750568374528d8b4290c629cbbc967e4812599145d74f577ec1bc4049f43235246fa7200e6348e93ff163a0f56d7643830583f19d
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
 DIST event-listener-2.5.3.crate 15392 BLAKE2B c56ed5eafa64014141e869dcf952e86f755eb35ed1722f8139260cb502ba226351ed1bea301618e94c9ca7f3309747057eb5f7d7986cfcdb7f6b79d13d52b439 SHA512 ddd67c1139ffe2aba95d763b73db0e2a9985dd2e57cf8f72030047d53d46d833df4b4192730cf0af4e060ce52e4f2df23aab6509abb94a6cd02e0d8cc3559d22
@@ -144,11 +137,8 @@ DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a82
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
-DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hkdf-0.11.0.crate 171707 BLAKE2B f9494dc22784324952e79f65fe697b313820bb982a7fac7a8ec9998136571cc9b3ce08aef3d2551a4ffd637526f2613f8e39a771a327f440492088879fb5dca2 SHA512 54255df9d478422d090103b6d66a31280a4c99025834e7930c21bfc7772f713015304f288de16ba3b91628714cde94b552eb1086724bc45e163c74fefa1393bf
-DIST hkdf-0.12.3.crate 170910 BLAKE2B 08d0c28891f780abb46936481251f217e9d8f2d17d04e6e504368fe9028300ed02f091cf6a0a0983eeb02dee04309f713f73278e9b0f1b918caa2cd998112753 SHA512 bba8bd837e994e5f5131d4269fb80fb84d789dc0ca68dd967d71e92576617c933ee8c355427b470ad71ab89178b1c36e8a7e122457287f023dd4073605784d3f
 DIST hmac-0.11.0.crate 11385 BLAKE2B 850527040c0fef278175f35a0c8bf77bc005708539af8ec5a85111f83e9c94a912741a2b24965c026fd75db6c58fc82a46a9c5de9454540400c9f19341561b4c SHA512 82d83071d1cea14603b1f1a85d564c78e28d982025a029779d8d83522fd5c56583303dd3a902d8023b5e9df2ddb5c5d9a5fc88000d41dba45dc026239ec81d0d
-DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
 DIST home-0.5.4.crate 8538 BLAKE2B 1512afc063cc31104e24a744aefc2a28f07d4ded12b4500480610124289e5b7c7f2fa3f1e66da36832cc45874c4bd2d08c1a584fed25aab4ecc962abc6675e33 SHA512 2494111301bd1281c89dc77f4f78d3bc6e3a04d1969938cf4584d465c01af12ad85022832b4a99a5c0ce6adc31a83c00820df2d513a09bf5c0d4fe44c53812a4
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
@@ -174,7 +164,7 @@ DIST lddtree-0.3.2.crate 11344 BLAKE2B 81715c157e0bf2ffa4db48ccf05cf6bc8ef55cd40
 DIST libc-0.2.134.crate 603330 BLAKE2B afca337bf7120e933c56745a51261156f4af7cc58427f623b9cdf1b2d5fc67fb2bc7c078ccab3cf232024e5013e8edcbbb0baab6a8a3762f9b20d975ed92411d SHA512 fcc142061df7b363b2dacec5fb3c9a19e63addd8210678117f681b8e1b62e5784cb78067639df464f32e22c9ab4d0932bbe1c01cc992348cc0fad4a46cc7b1c3
 DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
-DIST linux-keyutils-0.2.2.crate 17782 BLAKE2B f937190bcd080c3d280299f8f97730b9f9b1abe03f5269c21440ccb1f66d4cf9be984d91ca6a9617c34e52046041f82f2eaba292c43bbb7b26287c8272f1863a SHA512 67d5abb31bc200cbb35620f8ddc4def7028e0039a3a8de63d7ed0ae2ac857fb61cce32329746b2621636ae880dc3d48446103dee883d4bc8061f8bd1b6038c76
+DIST linux-keyutils-0.2.3.crate 18434 BLAKE2B a31163a446ef8897be8ad73be22ae3bf56a9ddac4ddb6b89bba2360b967f0f6eab4aaea98eaee16e5fcf0ddb43fc1883bd0da2a5c85db505b7b404586ae6604b SHA512 3dd56475a93dc46f9645e60eb145c315e647e3779fb66326962b8780d3a5955fb217fbfbf56d18d0c3d4872bcc02e64f09dd7734e6df3418d82e5648fe6bfe70
 DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
@@ -184,7 +174,7 @@ DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a6
 DIST maturin-0.14.12.gh.tar.gz 387648 BLAKE2B 12f4d6625b0e0633e14591c98aad994f33393e981f9f2fef9422c00cb86e5b8eed1c8c5fe56cafd67dc6f06afae34aecda47e19ca757d3bafe9076806cfee110 SHA512 ce6cb8513dbd2f25abb6639d9b8becb5617bc1d9a43248c8bd32a9792e2239c78bb665c90bd3bf885155469d84d812f83000221c7536f7ebd3ceeccc7fb2a117
 DIST maturin-0.14.13.gh.tar.gz 391487 BLAKE2B 33fd35fd7ff0b90b451261b48133f2f78ef7edae4c633950850d918f577f204d32d6d8f7ba0bc1fc30ca42af3048dd0b8fd6e55139403f7e347619088b52b8aa SHA512 5debe5289b0efb4bad37b962558e467d3b88a9a70f9ac2b886b43e1fcec8ec521400e06231b767135533ee8892c9f3de7752299d4ef2b2b8ad1a89b75c97f803
 DIST maturin-0.14.14.gh.tar.gz 391895 BLAKE2B c03f6c7ee5deb492c78677545d28979e0694a2ea870362ceda9294d8ec80d658c018928c1a870b5f2887d4f68515b26793708fac1fbba244a6b59eb5ee02b80e SHA512 3fafc15732c32a49797c05166e3e2a1289b8b85200c13beb9dbafda9445bb1dea2f503f4f4cc6776d272652e64eb53997e9588ffcdfd9824adf7d751c6f604e2
-DIST maturin-1.0.0_beta3.gh.tar.gz 398079 BLAKE2B 6bc1f4ca1881fd10aa264a697fad0e935cf7a914babcc4ee72ff5cd245b092f92428ff67d5b046ff55ab6b052599fdc739e53ac139deb806e196702acfbbf1ac SHA512 8391bae1ae6353d80217f7b13529847197013295a99688bc418e146167fb23ea3bff39dfe827df3ac4784e64370a114a60ca4ace9ad8e3a244d9fc4b7f427ad9
+DIST maturin-1.0.0_beta4.gh.tar.gz 394297 BLAKE2B 8b511ae940720719407af2b954d7291ee6456286ab3319ed75da344237316560e0d8767d66a921112da58f446322ef140f534de24c8dda9be5998846324ba694 SHA512 b2a3b0c0cd96370ba41c66530b0b6fdc54a5eda5925d27d3a5fd321c78dc574f8feb36dab0dd9a1ec555e9fdba35e13a63d8eb103cfb1fdfa95d11dcbedad368
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
@@ -201,7 +191,6 @@ DIST multipart-0.18.0.crate 62797 BLAKE2B 438abdd6041c3a52e836b7627bb0a490494b6a
 DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c
 DIST nb-connect-1.2.0.crate 8126 BLAKE2B 7c43883af6b2e8bb8a845c7b27defb89507409e71826e701a1b9c856b8958a9eafa8c187474752c231e8349a5b6575e1000f0321716c8deafda0a1c9036cad46 SHA512 29a615f1956da23f76b8d29ad05dc008d0287504fe9c835386d6ccb9168d005e00bdefbcf668314d1430b00a9d536c4f3845b46f9dee6519707fb1c69c348061
 DIST nix-0.22.3.crate 230252 BLAKE2B a65e42918c99f903a3f0b1cb64b7e4ded5ddf22aa4d4b7976938f166ab457fd5c0abd821060f7df777ca770254cc3018234a15ac4c00c6240cceb9ebb8c00430 SHA512 ee0c9c57f57ce7e723b32575e41ccce973af9fb290e314c7a1ed57c4c08dafc8500c81da34788a1c11e921e765098e074587c31498b5c0133b19530ce4a9cd28
-DIST nix-0.25.1.crate 272312 BLAKE2B 5981fec66eb96dfeb4b380130c4f2927a1f904b10744690e361b480355be31ac625f52614f95a89ea19fa07cc383b0975b3985f743c64f6780800e64a2f11f14 SHA512 e80b3a4e38b26687ba39b52ebebc6415e9618ca41e037d571fcaa33638ef28d022be02e2265db0149088a927fb81935329e651e2cda5c29c92038eb07fe55538
 DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST nom8-0.2.0.crate 162020 BLAKE2B e196fb349cdbb263d4fc754f922cd3b819f85bd323672f2f23ad465eea5352fdd631a7e411381f19447ff3b1f2780186fbb738d6f04fff33d97ca060ab94c2c2 SHA512 0d4cca8f13978e9101cc2eb9fb65ad879929a5361353c9a04e9850061e788e942948a6ea064c6986440a2576c10ce84daa8aa21d75214f322691da5f63668454
@@ -228,7 +217,6 @@ DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf
 DIST openssl-src-111.24.0+1.1.1s.crate 5106276 BLAKE2B a2da79f567049f5bcb15d15b5083ff9a4830ea7493cff48c58c7cec06bf965f3f123af4cff2b0a24b8262a8f7a0da797f351a61b77778ac005b45dd72e05b383 SHA512 c573a93df6a226d4a451d6b1d1badf49e55ae5bd1b60ce3d6a380dbc999abefac9b46df099f31e30d47231fd55ea93f7fcf2bb8c13340b6b201fb8eb9622cbc8
 DIST openssl-src-111.25.0+1.1.1t.crate 5112453 BLAKE2B 74eb78ed6cef3fece7206e969b4969ee0000e7c5e09be9243b4a643f13fb82a7f16fe85c2461eb07932179515e40b48246c9b9239d2d0cf392f90b12f74c78f9 SHA512 297ee8398611892f12841a0559092fb57eacd8219f78f542b92f27bc11df96029886d6509ec41a28901545013f6f623f21db14625c95d466c5c192e4b6ae6113
 DIST openssl-sys-0.9.80.crate 61687 BLAKE2B afe13340a51b5f7c6242085a0861c02ca20de7ec24e12efadb4eafd55b769f45d0ec4866799bf64bc383e68933277503639f148dc600f8036ecf6c325b745f5d SHA512 e141423f7a7c72d9062616b87163d2e1ded028ec165b3758c52a2e5f8519cd517fb1a89fa0ab3da27e0b47a1f5973772673d8233e98cf4ef79ded56e0363a072
-DIST ordered-stream-0.1.4.crate 17751 BLAKE2B c933c368b6a86a88822ab9c1c1230ca8b6ae129965bf615bd0a0408aeadabde28631bceb9d5c50770962cdea0b5522477ad4f54f8c1f2c1af072f82f436c5d6d SHA512 c6c1f666530ac2667c4fdd4c8450365459e5ecd32645082dde147746bb1f2e19e3110a36d03e722cff73a956371a9368515431e73dcf5a270c4793e947ea0fc5
 DIST os_pipe-1.1.2.crate 11375 BLAKE2B 076382ac0ae63fa10073341f6a61a3749baf18ed3a7fa78b3fe4b9ad4bc146e53a1820f61de7390b5d181b4311b159ff6e4801a900f7d3fa18cc771b46c60163 SHA512 daff52e9f78695a964b7d9c0253ea9f9d97418a66875c01af161148b3189e88f7cd23e794106e8780ea99d8a57efa3b01a9f9ccce32c16187be99eee7e1832a4
 DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e409b10a99284c7b669304c0cd701a3d20e690350018f5d7de8c6c7d38521f3413ac81d08067dc26f76b7c0e5b056b SHA512 2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43
 DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89
@@ -311,7 +299,6 @@ DIST scroll-0.11.0.crate 27354 BLAKE2B 21c885468642a77d6871ccf2bb748972f33c8abd5
 DIST scroll_derive-0.11.0.crate 5615 BLAKE2B 83b8b5d68b7496cf49f16b7a1450ff5927b9b9afa887fca80d2763e88f1be3fc4650e18a74944521867f4d920ec040bd91e7133132d97692cee4b93b9900fb1c SHA512 71cea55a78cceaea15147eb71f463c4a3cc6137a499a7712b61e1c3a340e72f5dd438e49433ba9e73e5a3e9d23515a0e81b2abd2ce1f426aabf1930f7d251ff4
 DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
 DIST secret-service-2.0.2.crate 26687 BLAKE2B d813dd84ed60ca57f6fc8193756cebe8a4b45bb02e1ac2cf623673589dc7e6ffc376662d1f1863c3bffc27a131b2dd7c700008fa22a8de47e50fcfa14fdb6db9 SHA512 8c64d20f0206f54f3749e516e0b0090c83d84d9c5d73d9e36afb69ae91096c97b019754f39f14844e95e73de7a14a0a30712543379e54be9ae353cd5f2788676
-DIST secret-service-3.0.1.crate 36343 BLAKE2B cef282f06499539ea9fe8fe6b9bbc63d081308bad914af3304ffb92196b502fb257293a012a04ea2caf5aea076fb8327009e624f37fe0d9a7b8caffe9fa06c0e SHA512 f5613aaeb09fbcaa74a4d2e21947b89cdeabdea30f85d73c97d1b7a4775c0f369314e56ff53cc09e2c0f93b7722b6f40022640543f878980c52f12400475a65b
 DIST security-framework-2.8.2.crate 77045 BLAKE2B 8581e0056fc0422aef0122e4948d6244eebdad0935c73ac1b01fe31de19f730325f11446dc3dbf5f1ec4400de099eed1d61caef5b8e318365c4dbf9dabab3be3 SHA512 6abaf2129cff62220f152786a36fd4728c72fb2b55f3f75b396ffdf4344902077c8c0784eaaf07e2a4d9311f833298b46372a968b798dd838ea495668fde1be3
 DIST security-framework-sys-2.8.0.crate 17911 BLAKE2B ed066e2cb8986930bdcf55060fcb5a34f826aa27d51ba4236f8a8e56de8fe3a2b33be8da14c64c0809f46c0dce02a20729e6863af2261a04006ac65a291ddea7 SHA512 5e670f5f5d54f2bc11e05435b975d5d26d990d6f7446613dcd5be88c3cd52baeb702931cfc663fd5018c8c99f4619c23e57f31eea60b15d3a5e7ce01a291886c
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
@@ -325,7 +312,6 @@ DIST serde_json-1.0.91.crate 144654 BLAKE2B 857f25cb43f8153ed4266fdc38b0a426ea04
 DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
 DIST serde_repr-0.1.10.crate 9760 BLAKE2B 79b47fc51164c019e4d327ac9706c99fab2979c930f89592c40ffcdbf9c1f9da7385e47bfac48aa30dc5da26052766553adbd126a764f33ef6c21533da807dfa SHA512 09e0dfc950b04aa12f501fb2b73ab7a0ff8ccb54facbe8e183c8dde2448362c4d1745e71df880dd6cfd9fcca99a8d75563ffba8383cbd02954f6fb08ab9a7309
 DIST serde_spanned-0.6.1.crate 7828 BLAKE2B 78d39bca0850b78f0835167ca7786c0bf356d668389aaaf3ace946e91d9a7db8dcba895e833d87e88502b2ba969cac9aad6c1a053c5ecb37f845ebb3b0bb5b32 SHA512 6271aa2af243021002a10cdbd16cb081bf10ab53a61cace104182eb4f28e0c0d7c447b7dcedb350ce78debf5ed6ce6502cb823ae9177d98c5288310094eb22d9
-DIST sha1-0.10.5.crate 12146 BLAKE2B 476a0c365ab639a0ce427856787595865a60339fd6b81a45f879ff9b9112021d2c3a62e0a817b4555951131a7fe257d0c30988631ddddc3d217274c46c79ebe6 SHA512 1046b91a9ea64b90098ee6e16c63f0620dc7c2dc847d200972a3da3c8d1ac61fa9030682099a411cdd24717b64d488e0b1be1cbe8f7bfee26b8c15cf4f8e5e9b
 DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
@@ -335,7 +321,6 @@ DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7
 DIST similar-2.2.1.crate 51147 BLAKE2B c86005ff69a14980db2cb90b13ed908448a711f09d1ee20a109d1dab2cc5bd839274f3803082721f1d81003c9011efdadcd190f4cb46eb09b26e338107546f45 SHA512 9a353bfbe495bab83e401314bb97c6605fa6283af06e03bad50bc429388c7abf44bb9cc68db781ef2b786840eb444907f35b70b17343b2cb993800536b4e36a2
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
-DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST snapbox-0.4.4.crate 33655 BLAKE2B 73aa89530c066d96d12538c49be1be8ed2986c3f22b19207658c113973a1fe260478f7bc5c13ec26ce7825a8c569e77329e0c206af145c4c869bbda9b603019e SHA512 1bb1fe987fc84d261a686106929d7e19480f2c08f69c88ffb23b8d2fad0bf512f3962d60406fe4c1d4df9e2744c9e8646aef38dbf055f98472e12b73dc959667
@@ -391,7 +376,6 @@ DIST trycmd-0.14.10.crate 33481 BLAKE2B adeb25f59cb683ca1520c000d53bfec019460c21
 DIST trycmd-0.14.11.crate 33478 BLAKE2B 1593b60618bb71a47ca8cae9ca104af93c69763ac952b94a1cb3a29108d045068ce07895ad8e6f22c745c1f6ec4a1d9b9e07c017aa825aa1f897756b53b913ed SHA512 375d3c5e91b4a45376e7ba7200f4bebd5deaad620d368ad0ef1de477e77c636f1abf305449ffd5a40512b58670ef9acf508d247e5e14936ec849dbc6e5dd21a7
 DIST twox-hash-1.6.3.crate 21842 BLAKE2B 67c261b2b0a93293717a4e2e07dc11df2abde09da6fe713b9d04917ace73de1b59b8d4fd9449ab46cb7cf496fad1e440effdfa1fae6f5cae4ca78af8cd019c42 SHA512 f7ce63e6e5ca79ce9330caf40b32578a5d2088c5d8ed371604268760d6e212d447d9e3a95378378a283024155bccdaea47597902c488a94c5d5f79770baec8fc
 DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2
-DIST uds_windows-1.0.2.crate 16206 BLAKE2B e895e97b5610c1402023b2b86daa5b248c4528f06fcbdb900cc996ff1f62a8234cbd6d8cfae84008345399f73363f9cdf62b1def60b782e06514b9d215236a30 SHA512 a58806bb9673f583d58ba2088c0dcb03808752bea6c0a502b717a541cb54c1b4cf70af8c8f3ae48437069c9017012c6e880a1e7c3c754835193e581849f28587
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.10.crate 43530 BLAKE2B 2bd5ffea133793ed7588ea95b0848adea16e79fc3ce9a159c33c73929a1af90e0578c44980fe114aeec1d6424d294552bcbf4089e3c196c2ed3d0751d992c216 SHA512 70f81dcf3fb3ada1eb503cfda548e083cae6e7001dc445c0a481b8f467025f17dc26ac14e487edcdc2aba8b67f94a35eb4b5083a62d5b954dafca7b734edd3e3
 DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c
@@ -470,19 +454,14 @@ DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e0
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-DIST winnow-0.3.0.crate 163401 BLAKE2B 158dff81d00be1df2b131b1324271d757b75ac927da5a3fc067d8963f35da4b1275f56c64eb4cabb87a90aad349dd6231fd6a60d9c890f1d2977b501e17a4fca SHA512 755d9192abcbd1f0e58ac914e1f1415ea57da2de4b8c49a9072fc7b124c49fe1973aa870776c5451f8f75b1b1827084f619e81ad59a4de3aebc84e667ac0d516
+DIST winnow-0.3.3.crate 176347 BLAKE2B 091a68048257d8dd931411ac14eadfb4dac942f8c3d9fba01d6c03a86ed3f141466999c6596f3a8d8df4719895b1e3f1c7dfd94b98e50b38e726e6c77e11318b SHA512 ff6c2f2c228263947dd9eb8ac098e5743ec48e69aed4f99c4a4c27946ec71f3666a9002e6a92b3007d32520d002cc7858d523896dee68b17ca1f7b18ac82ce85
 DIST xattr-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac
 DIST xwin-0.2.10.crate 218629 BLAKE2B d5624b2b11c2647a8a5762d937d982ea94429522f7966ead17e973f99fff5ed6fdc3e94b3aece20971d35277c2c9f370d12bfd3fa38df7911c202ec5f7c836c2 SHA512 cb05c1644c298e33544959ebf6786e868105319a50aaff4fb60ea2f9558d88133d3c6db30ca81378aa634f2866dc5def9b68994e053f74ae65cea3f4b6533be2
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 DIST zbus-1.9.3.crate 62957 BLAKE2B b7011d1c78e5b8a23a93b0d88ef5d13164b964d046f65917c45544b0a85fd013f375aecb49b957a519d128cdd2e23c52672e3746418f06ac6eac29a8cf155ca8 SHA512 b5d471d5d962a46c02380c91374ff4e9379a0ad436665c540a9ccca3fe45355872b3add3d18759bb271d30cf218c8b25f169c515953bdd6ce9a8ce81905a6865
-DIST zbus-3.9.0.crate 141946 BLAKE2B ff961215fc814466751df67811a213d540427136fe6249235e1bfab8d39c0288d1b4425e489212b054cdbbd5d319c657825e776e3d44f825630ac2f974eb585f SHA512 c9622a952048cf4fc1027591a4a73689ff9e9d859801ebfd8bfd533217525a9754914ddf5807314dc6dd09f7529b9cdcb52e41a8993d2d313642ca2abb0b6470
 DIST zbus_macros-1.9.3.crate 14794 BLAKE2B 7ae5cc45f8d7c9eae4d282f3c4884abfedf91ff14b48f09f21a3a7e5d80100b001f2e7a7b3dc24bbb35b65f7c6ce615a80869c5d81336bf5c12fea99802b0925 SHA512 1b22cf49dc10d9854f9f4150e52307e98dff1f6d3102c5e5af4bfb305cf3509d5b8f07ed6ae43f8b4f03c4e22d11648ccb49f5f3f7731400a34cceea7ee19677
-DIST zbus_macros-3.9.0.crate 27739 BLAKE2B 3a01d167bc8f791fd64da7da4f478eec000883788bd57f1cd871649302bd82caf993919ceb89a690a33a3ee2ff018490df5714de322f1aa33dc14379f5c1dc82 SHA512 90826a1f0e551d92c2d013cdaf56719e3b8887fdb1655e194749234633a62596b57958fdf3190048f8b986c3a0996941284960d59eed4b9db0b182a058bd1c1e
-DIST zbus_names-2.5.0.crate 9861 BLAKE2B c171980b661d97142abc873eaa0acbf21300ac0165aa9e28012e798c79db871e10c52336e7eb73a568359d7e9b395e5782457530da509fb81afc767d0180fb17 SHA512 7a42f274e2d9d6dd452d8ca47b22d3b1e2e13bf0708693cfd71293ecffc7a13fa957175aa0dc78b8d17251933faf04d6e2250bb9edb2034eff7bba99392076e8
 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
 DIST zip-0.6.3.crate 61785 BLAKE2B aa59cfa836cdac9cda7e5423cf7146a8fa2be74a4a2f7853b9a8e272bffc10cc8d81a2a1bba2466ceaf16995974d7d2699609ecfb0c7ed2861d64261dcbb0db3 SHA512 b19fd29c8a212f61b6c1810dfef7514d3f346c4589a35b18e8113b864d6bb612342c0bcbffb56dc0f36efc29149b8454b6a5a7ef4db5c13614ab761e18d1bd01
 DIST zip-0.6.4.crate 62396 BLAKE2B cfe4d7fcdb71ee6da3b6bf6f8cf4ecca9f717f7bbe96307af943c1b3d75dc233f1ae0df2f8515356da2fa27c0bcb534ee73c72e7afced4ae997b888c9078e149 SHA512 29392175711fb8585d400f99798596e10415423b3fda245069ca3144bce4b1027db845526c233bcf8be13b756e9605df21657bd2b5713339adeb334fe964ff8e
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
-DIST zvariant-3.11.0.crate 71214 BLAKE2B 19a83841b8dda8a733ffca5da2b143708bb5a96627297da866f85d3f021a5764709cc87dc49c833207f7f66f6fcf0516649a27fefd6144d02301a9f1a2003141 SHA512 17860c24098048e510e5dd8c8e9bd5c94ecaddec86ef4cc54dff23fb89e23ec3a5ef8348ea0e6d24b6fb8422bcf427c17ec2ae9b5a3f2af71b72218d2461bb54
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
-DIST zvariant_derive-3.11.0.crate 12364 BLAKE2B 611dd5211c398941d3967692ca462a365222c3c8dee0c8c7869aee345e9094176692100e77ac07ffbf8f2985efae472248fadc735f7a245dc52505b6a0d88274 SHA512 9030aae818ab3b54774ab50e6674c05f9f3c5ec640d052a8c9fdba6520b608273deab463e0e08e77204754c546a6161b07b7cf4540db1073a95c04fd452aa3b7
diff --git a/dev-util/maturin/maturin-1.0.0_beta3.ebuild b/dev-util/maturin/maturin-1.0.0_beta3.ebuild
deleted file mode 100644
index 2a1a65fa391f..000000000000
--- a/dev-util/maturin/maturin-1.0.0_beta3.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	aes-0.7.5
-	ahash-0.3.8
-	ahash-0.7.6
-	aho-corasick-0.7.20
-	anyhow-1.0.69
-	async-broadcast-0.5.1
-	async-executor-1.5.0
-	async-io-1.12.0
-	async-lock-2.6.0
-	async-recursion-1.0.2
-	async-task-4.3.0
-	async-trait-0.1.64
-	autocfg-1.1.0
-	base64-0.13.1
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	block-modes-0.8.1
-	block-padding-0.2.1
-	bstr-1.3.0
-	bumpalo-3.12.0
-	byteorder-1.4.3
-	bytes-1.4.0
-	bytesize-1.2.0
-	bzip2-0.4.4
-	bzip2-sys-0.1.11+1.0.8
-	cab-0.4.1
-	camino-1.1.3
-	cargo-config2-0.1.5
-	cargo-options-0.6.0
-	cargo-platform-0.1.2
-	cargo-xwin-0.14.0
-	cargo-zigbuild-0.16.1
-	cargo_metadata-0.15.3
-	cbindgen-0.24.3
-	cc-1.0.79
-	cfb-0.7.3
-	cfg-expr-0.14.0
-	cfg-if-1.0.0
-	charset-0.1.3
-	chumsky-0.8.0
-	cipher-0.3.0
-	clap-4.0.32
-	clap_complete-4.0.7
-	clap_complete_command-0.4.0
-	clap_complete_fig-4.0.2
-	clap_derive-4.0.21
-	clap_lex-0.3.0
-	cli-table-0.4.7
-	concolor-0.0.11
-	concolor-query-0.1.0
-	concurrent-queue-2.1.0
-	configparser-3.0.2
-	console-0.15.5
-	const-random-0.1.15
-	const-random-macro-0.1.15
-	content_inspector-0.2.4
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.13
-	crossbeam-utils-0.8.14
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	ctor-0.1.26
-	data-encoding-2.3.3
-	derivative-2.2.0
-	dialoguer-0.10.3
-	diff-0.1.13
-	digest-0.10.6
-	dirs-4.0.0
-	dirs-sys-0.3.7
-	dunce-1.0.3
-	either-1.8.1
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	encoding_rs-0.8.32
-	enumflags2-0.7.5
-	enumflags2_derive-0.7.4
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	event-listener-2.5.3
-	fastrand-1.9.0
-	fat-macho-0.4.6
-	filetime-0.2.19
-	flate2-1.0.25
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	form_urlencoded-1.1.0
-	fs-err-2.9.0
-	futures-core-0.3.26
-	futures-io-0.3.26
-	futures-lite-1.12.0
-	futures-macro-0.3.26
-	futures-sink-0.3.26
-	futures-task-0.3.26
-	futures-util-0.3.26
-	generic-array-0.14.6
-	getrandom-0.2.8
-	glob-0.3.1
-	globset-0.4.10
-	goblin-0.6.0
-	hashbrown-0.12.3
-	heck-0.4.1
-	hermit-abi-0.2.6
-	hex-0.4.3
-	hkdf-0.12.3
-	hmac-0.12.1
-	home-0.5.4
-	humantime-2.1.0
-	humantime-serde-1.1.1
-	idna-0.3.0
-	ignore-0.4.20
-	indexmap-1.9.2
-	indicatif-0.17.3
-	indoc-2.0.0
-	instant-0.1.12
-	io-lifetimes-1.0.4
-	is-terminal-0.4.2
-	itertools-0.10.5
-	itoa-1.0.5
-	js-sys-0.3.61
-	keyring-2.0.1
-	lazy_static-1.4.0
-	lddtree-0.3.2
-	libc-0.2.139
-	linux-keyutils-0.2.2
-	linux-raw-sys-0.1.4
-	lock_api-0.4.9
-	log-0.4.17
-	lzxd-0.1.4
-	mailparse-0.13.8
-	matchers-0.1.0
-	memchr-2.5.0
-	memoffset-0.6.5
-	memoffset-0.7.1
-	mime-0.3.16
-	mime_guess-2.0.4
-	minijinja-0.30.4
-	minimal-lexical-0.2.1
-	miniz_oxide-0.6.2
-	msi-0.5.0
-	multipart-0.18.0
-	native-tls-0.2.11
-	nix-0.25.1
-	nom-7.1.3
-	normalize-line-endings-0.3.0
-	normpath-1.0.1
-	nu-ansi-term-0.46.0
-	num-0.4.0
-	num-bigint-0.4.3
-	num-complex-0.4.3
-	num-integer-0.1.45
-	num-iter-0.1.43
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	number_prefix-0.4.0
-	once_cell-1.17.1
-	opaque-debug-0.3.0
-	openssl-0.10.45
-	openssl-macros-0.1.0
-	openssl-probe-0.1.5
-	openssl-src-111.25.0+1.1.1t
-	openssl-sys-0.9.80
-	ordered-stream-0.1.4
-	os_pipe-1.1.2
-	os_str_bytes-6.4.1
-	output_vt100-0.1.3
-	overload-0.1.1
-	parking-2.0.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.6
-	path-slash-0.2.1
-	pep440-0.2.0
-	percent-encoding-2.2.0
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.26
-	plain-0.2.3
-	platform-info-1.0.2
-	polling-2.5.2
-	portable-atomic-0.3.19
-	ppv-lite86-0.2.17
-	pretty_assertions-1.3.0
-	proc-macro-crate-1.2.1
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.20+deprecated
-	proc-macro2-1.0.51
-	pyproject-toml-0.3.3
-	python-pkginfo-0.5.5
-	quote-1.0.23
-	quoted_printable-0.4.7
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rayon-1.6.1
-	rayon-core-1.10.2
-	redox_syscall-0.2.16
-	redox_users-0.4.3
-	regex-1.7.1
-	regex-automata-0.1.10
-	regex-syntax-0.6.28
-	remove_dir_all-0.5.3
-	rfc2047-decoder-0.2.1
-	ring-0.16.20
-	rustc_version-0.4.0
-	rustix-0.36.7
-	rustls-0.20.8
-	rustls-pemfile-1.0.1
-	rustversion-1.0.11
-	ryu-1.0.12
-	same-file-1.0.6
-	schannel-0.1.21
-	scopeguard-1.1.0
-	scroll-0.11.0
-	scroll_derive-0.11.0
-	sct-0.7.0
-	secret-service-3.0.1
-	security-framework-2.8.2
-	security-framework-sys-2.8.0
-	semver-1.0.16
-	serde-1.0.152
-	serde_derive-1.0.152
-	serde_json-1.0.93
-	serde_repr-0.1.10
-	serde_spanned-0.6.1
-	sha1-0.10.5
-	sha2-0.10.6
-	sharded-slab-0.1.4
-	shell-escape-0.1.5
-	shell-words-1.1.0
-	shlex-1.1.0
-	similar-2.2.1
-	slab-0.4.8
-	smallvec-1.10.0
-	smawk-0.3.1
-	snapbox-0.4.4
-	snapbox-macros-0.3.1
-	socket2-0.4.7
-	socks-0.3.4
-	spin-0.5.2
-	static_assertions-1.1.0
-	strsim-0.10.0
-	subtle-2.4.1
-	syn-1.0.109
-	tar-0.4.38
-	target-lexicon-0.12.6
-	tempfile-3.3.0
-	termcolor-1.2.0
-	terminal_size-0.2.3
-	textwrap-0.16.0
-	thiserror-1.0.38
-	thiserror-impl-1.0.38
-	thread_local-1.1.7
-	time-0.3.20
-	time-core-0.1.0
-	time-macros-0.2.8
-	tiny-keccak-2.0.2
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.1
-	toml-0.5.11
-	toml-0.7.2
-	toml_datetime-0.6.1
-	toml_edit-0.19.4
-	tracing-0.1.37
-	tracing-attributes-0.1.23
-	tracing-core-0.1.30
-	tracing-log-0.1.3
-	tracing-serde-0.1.3
-	tracing-subscriber-0.3.16
-	trycmd-0.14.11
-	twox-hash-1.6.3
-	typenum-1.16.0
-	uds_windows-1.0.2
-	unicase-2.6.0
-	unicode-bidi-0.3.10
-	unicode-ident-1.0.6
-	unicode-linebreak-0.1.4
-	unicode-normalization-0.1.22
-	unicode-width-0.1.10
-	untrusted-0.7.1
-	ureq-2.6.2
-	url-2.3.1
-	uuid-1.3.0
-	valuable-0.1.0
-	vcpkg-0.2.15
-	version_check-0.9.4
-	versions-4.1.0
-	wait-timeout-0.2.0
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	web-sys-0.3.61
-	webpki-0.22.0
-	webpki-roots-0.22.6
-	wepoll-ffi-0.1.2
-	which-4.4.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.1
-	windows_aarch64_msvc-0.42.1
-	windows_i686_gnu-0.42.1
-	windows_i686_msvc-0.42.1
-	windows_x86_64_gnu-0.42.1
-	windows_x86_64_gnullvm-0.42.1
-	windows_x86_64_msvc-0.42.1
-	winnow-0.3.0
-	xattr-0.2.3
-	xwin-0.2.10
-	yansi-0.5.1
-	zbus-3.9.0
-	zbus_macros-3.9.0
-	zbus_names-2.5.0
-	zeroize-1.5.7
-	zip-0.6.4
-	zvariant-3.11.0
-	zvariant_derive-3.11.0"
-# additional crates used by test-crates/* test packages,
-# `grep test-crates tests/run.rs` to see which are needed
-CRATES_TEST="
-	askama-0.11.1
-	askama_derive-0.11.2
-	askama_escape-0.10.3
-	askama_shared-0.12.2
-	bincode-1.3.3
-	camino-1.1.2
-	cc-1.0.73
-	cc-1.0.74
-	indoc-1.0.7
-	libc-0.2.134
-	libc-0.2.137
-	memoffset-0.8.0
-	once_cell-1.15.0
-	once_cell-1.16.0
-	once_cell-1.17.0
-	parking_lot_core-0.9.3
-	parking_lot_core-0.9.4
-	paste-1.0.11
-	proc-macro2-1.0.46
-	proc-macro2-1.0.47
-	pyo3-0.18.1
-	pyo3-build-config-0.18.1
-	pyo3-ffi-0.18.1
-	pyo3-macros-0.18.1
-	pyo3-macros-backend-0.18.1
-	python3-dll-a-0.2.6
-	quote-1.0.21
-	siphasher-0.3.10
-	syn-1.0.102
-	syn-1.0.103
-	syn-1.0.107
-	target-lexicon-0.12.4
-	unicode-ident-1.0.5
-	uniffi-0.23.0
-	uniffi_bindgen-0.23.0
-	uniffi_build-0.23.0
-	uniffi_checksum_derive-0.23.0
-	uniffi_core-0.23.0
-	uniffi_macros-0.23.0
-	uniffi_meta-0.23.0
-	uniffi_testing-0.23.0
-	unindent-0.1.10
-	weedle2-4.0.0
-	windows-sys-0.36.1
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.36.1
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.36.1
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.36.1
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.36.1
-	windows_x86_64_msvc-0.42.0"
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-inherit bash-completion-r1 cargo distutils-r1 edo flag-o-matic toolchain-funcs
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://www.maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV/_beta/-beta.}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-S="${WORKDIR}/${P/_beta/-beta.}"
-
-# note: ring is unused, so SSLeay+openssl licenses can be skipped
-LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC
-	MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-# unkeyworded beta for testing
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc +ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.{9,10})"
-DEPEND="ssl? ( dev-libs/openssl:= )"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	doc? ( app-text/mdbook )
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-RDEPEND+=" ${DEPEND}"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# used to prevent use of network during tests
-	cat > "${T}"/pip.conf <<-EOF || die
-		[install]
-		no-index = yes
-		no-dependencies = yes
-	EOF
-}
-
-src_configure() {
-	filter-lto # TODO: cleanup after bug #893658
-
-	local cargoargs=(
-		$(usev debug '--profile dev')
-		--no-default-features
-		# like release.yml + native-tls for better platform support than rustls
-		--features full,password-storage$(usev ssl ,native-tls)
-	)
-
-	export MATURIN_SETUP_ARGS=${cargoargs[*]} # --no-default-features if empty
-	export OPENSSL_NO_VENDOR=1
-}
-
-python_compile_all() {
-	use !doc || mdbook build -d html guide || die
-
-	if ! tc-is-cross-compiler; then
-		local maturin=target/$(usex debug{,} release)/maturin
-		${maturin} completions bash > "${T}"/${PN} || die
-		${maturin} completions fish > "${T}"/${PN}.fish || die
-		${maturin} completions zsh > "${T}"/_${PN} || die
-	else
-		ewarn "shell completion files were skipped due to cross-compilation"
-	fi
-}
-
-python_test() {
-	local -x MATURIN_TEST_PYTHON=${EPYTHON}
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	local skip=(
-		--skip locked_doesnt_build_without_cargo_lock
-		# relies on 80-chars terminal output but ignores exported COLUMNS=80
-		--skip cli_tests
-		# avoid need for wasm over a single hello world test
-		--skip integration_wasm_hello_world
-		# fragile depending on rust version, also wants libpypy*-c.so for pypy
-		--skip pyo3_no_extension_module
-	)
-
-	edo cargo test $(usev !debug --release) ${MATURIN_SETUP_ARGS} -- "${skip[@]}"
-}
-
-python_install_all() {
-	dodoc Changelog.md README.md
-	use doc && dodoc -r guide/html
-
-	if ! tc-is-cross-compiler; then
-		dobashcomp "${T}"/${PN}
-
-		insinto /usr/share/fish/vendor_completions.d
-		doins "${T}"/${PN}.fish
-
-		insinto /usr/share/zsh/site-functions
-		doins "${T}"/_${PN}
-	fi
-}
diff --git a/dev-util/maturin/maturin-1.0.0_beta4.ebuild b/dev-util/maturin/maturin-1.0.0_beta4.ebuild
new file mode 100644
index 000000000000..3ab68f477568
--- /dev/null
+++ b/dev-util/maturin/maturin-1.0.0_beta4.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	ahash-0.3.8
+	ahash-0.7.6
+	aho-corasick-0.7.20
+	anyhow-1.0.69
+	autocfg-1.1.0
+	base64-0.13.1
+	bitflags-1.3.2
+	block-buffer-0.10.3
+	bstr-1.3.0
+	bumpalo-3.12.0
+	byteorder-1.4.3
+	bytes-1.4.0
+	bytesize-1.2.0
+	bzip2-0.4.4
+	bzip2-sys-0.1.11+1.0.8
+	cab-0.4.1
+	camino-1.1.3
+	cargo-config2-0.1.5
+	cargo-options-0.6.0
+	cargo-platform-0.1.2
+	cargo-xwin-0.14.0
+	cargo-zigbuild-0.16.1
+	cargo_metadata-0.15.3
+	cbindgen-0.24.3
+	cc-1.0.79
+	cfb-0.7.3
+	cfg-expr-0.14.0
+	cfg-if-1.0.0
+	charset-0.1.3
+	chumsky-0.8.0
+	clap-4.0.32
+	clap_complete-4.0.7
+	clap_complete_command-0.4.0
+	clap_complete_fig-4.0.2
+	clap_derive-4.0.21
+	clap_lex-0.3.0
+	cli-table-0.4.7
+	concolor-0.0.11
+	concolor-query-0.1.0
+	configparser-3.0.2
+	console-0.15.5
+	const-random-0.1.15
+	const-random-macro-0.1.15
+	content_inspector-0.2.4
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.5
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.13
+	crossbeam-utils-0.8.14
+	crunchy-0.2.2
+	crypto-common-0.1.6
+	ctor-0.1.26
+	data-encoding-2.3.3
+	dialoguer-0.10.3
+	diff-0.1.13
+	digest-0.10.6
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	dunce-1.0.3
+	either-1.8.1
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	encoding_rs-0.8.32
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fastrand-1.9.0
+	fat-macho-0.4.6
+	filetime-0.2.19
+	flate2-1.0.25
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.1.0
+	fs-err-2.9.0
+	generic-array-0.14.6
+	getrandom-0.2.8
+	glob-0.3.1
+	globset-0.4.10
+	goblin-0.6.0
+	hashbrown-0.12.3
+	heck-0.4.1
+	hermit-abi-0.2.6
+	home-0.5.4
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	idna-0.3.0
+	ignore-0.4.20
+	indexmap-1.9.2
+	indicatif-0.17.3
+	indoc-2.0.0
+	instant-0.1.12
+	io-lifetimes-1.0.4
+	is-terminal-0.4.2
+	itertools-0.10.5
+	itoa-1.0.5
+	js-sys-0.3.61
+	keyring-2.0.1
+	lazy_static-1.4.0
+	lddtree-0.3.2
+	libc-0.2.139
+	linux-keyutils-0.2.3
+	linux-raw-sys-0.1.4
+	lock_api-0.4.9
+	log-0.4.17
+	lzxd-0.1.4
+	mailparse-0.13.8
+	matchers-0.1.0
+	memchr-2.5.0
+	memoffset-0.7.1
+	mime-0.3.16
+	mime_guess-2.0.4
+	minijinja-0.30.4
+	minimal-lexical-0.2.1
+	miniz_oxide-0.6.2
+	msi-0.5.0
+	multipart-0.18.0
+	native-tls-0.2.11
+	nom-7.1.3
+	normalize-line-endings-0.3.0
+	normpath-1.0.1
+	nu-ansi-term-0.46.0
+	num_cpus-1.15.0
+	number_prefix-0.4.0
+	once_cell-1.17.1
+	openssl-0.10.45
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.25.0+1.1.1t
+	openssl-sys-0.9.80
+	os_pipe-1.1.2
+	os_str_bytes-6.4.1
+	output_vt100-0.1.3
+	overload-0.1.1
+	parking_lot-0.12.1
+	parking_lot_core-0.9.6
+	path-slash-0.2.1
+	pep440-0.2.0
+	percent-encoding-2.2.0
+	pin-project-lite-0.2.9
+	pkg-config-0.3.26
+	plain-0.2.3
+	platform-info-1.0.2
+	portable-atomic-0.3.19
+	ppv-lite86-0.2.17
+	pretty_assertions-1.3.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.20+deprecated
+	proc-macro2-1.0.51
+	pyproject-toml-0.3.3
+	python-pkginfo-0.5.5
+	quote-1.0.23
+	quoted_printable-0.4.7
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	rayon-1.6.1
+	rayon-core-1.10.2
+	redox_syscall-0.2.16
+	redox_users-0.4.3
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.28
+	remove_dir_all-0.5.3
+	rfc2047-decoder-0.2.1
+	ring-0.16.20
+	rustc_version-0.4.0
+	rustix-0.36.7
+	rustls-0.20.8
+	rustls-pemfile-1.0.1
+	rustversion-1.0.11
+	ryu-1.0.12
+	same-file-1.0.6
+	schannel-0.1.21
+	scopeguard-1.1.0
+	scroll-0.11.0
+	scroll_derive-0.11.0
+	sct-0.7.0
+	security-framework-2.8.2
+	security-framework-sys-2.8.0
+	semver-1.0.16
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.93
+	serde_spanned-0.6.1
+	sha2-0.10.6
+	sharded-slab-0.1.4
+	shell-escape-0.1.5
+	shell-words-1.1.0
+	shlex-1.1.0
+	similar-2.2.1
+	smallvec-1.10.0
+	smawk-0.3.1
+	snapbox-0.4.4
+	snapbox-macros-0.3.1
+	socks-0.3.4
+	spin-0.5.2
+	static_assertions-1.1.0
+	strsim-0.10.0
+	syn-1.0.109
+	tar-0.4.38
+	target-lexicon-0.12.6
+	tempfile-3.3.0
+	termcolor-1.2.0
+	terminal_size-0.2.3
+	textwrap-0.16.0
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	thread_local-1.1.7
+	time-0.3.20
+	time-core-0.1.0
+	time-macros-0.2.8
+	tiny-keccak-2.0.2
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.1
+	toml-0.5.11
+	toml-0.7.2
+	toml_datetime-0.6.1
+	toml_edit-0.19.4
+	tracing-0.1.37
+	tracing-attributes-0.1.23
+	tracing-core-0.1.30
+	tracing-log-0.1.3
+	tracing-serde-0.1.3
+	tracing-subscriber-0.3.16
+	trycmd-0.14.11
+	twox-hash-1.6.3
+	typenum-1.16.0
+	unicase-2.6.0
+	unicode-bidi-0.3.10
+	unicode-ident-1.0.6
+	unicode-linebreak-0.1.4
+	unicode-normalization-0.1.22
+	unicode-width-0.1.10
+	untrusted-0.7.1
+	ureq-2.6.2
+	url-2.3.1
+	uuid-1.3.0
+	valuable-0.1.0
+	vcpkg-0.2.15
+	version_check-0.9.4
+	versions-4.1.0
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.84
+	wasm-bindgen-backend-0.2.84
+	wasm-bindgen-macro-0.2.84
+	wasm-bindgen-macro-support-0.2.84
+	wasm-bindgen-shared-0.2.84
+	web-sys-0.3.61
+	webpki-0.22.0
+	webpki-roots-0.22.6
+	which-4.4.0
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	winnow-0.3.3
+	xattr-0.2.3
+	xwin-0.2.10
+	yansi-0.5.1
+	zeroize-1.5.7
+	zip-0.6.4"
+# additional crates used by test-crates/* test packages,
+# `grep test-crates tests/run.rs` to see which are needed
+CRATES_TEST="
+	askama-0.11.1
+	askama_derive-0.11.2
+	askama_escape-0.10.3
+	askama_shared-0.12.2
+	bincode-1.3.3
+	camino-1.1.2
+	cc-1.0.73
+	cc-1.0.74
+	indoc-1.0.7
+	libc-0.2.134
+	libc-0.2.137
+	memoffset-0.8.0
+	once_cell-1.15.0
+	once_cell-1.16.0
+	once_cell-1.17.0
+	parking_lot_core-0.9.3
+	parking_lot_core-0.9.4
+	paste-1.0.11
+	proc-macro2-1.0.46
+	proc-macro2-1.0.47
+	pyo3-0.18.1
+	pyo3-build-config-0.18.1
+	pyo3-ffi-0.18.1
+	pyo3-macros-0.18.1
+	pyo3-macros-backend-0.18.1
+	python3-dll-a-0.2.6
+	quote-1.0.21
+	siphasher-0.3.10
+	syn-1.0.102
+	syn-1.0.103
+	syn-1.0.107
+	target-lexicon-0.12.4
+	unicode-ident-1.0.5
+	uniffi-0.23.0
+	uniffi_bindgen-0.23.0
+	uniffi_build-0.23.0
+	uniffi_checksum_derive-0.23.0
+	uniffi_core-0.23.0
+	uniffi_macros-0.23.0
+	uniffi_meta-0.23.0
+	uniffi_testing-0.23.0
+	unindent-0.1.10
+	weedle2-4.0.0
+	windows-sys-0.36.1
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.36.1
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.36.1
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.36.1
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.36.1
+	windows_x86_64_msvc-0.42.0"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+inherit bash-completion-r1 cargo distutils-r1 edo flag-o-matic toolchain-funcs
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+HOMEPAGE="https://www.maturin.rs/"
+SRC_URI="
+	https://github.com/PyO3/maturin/archive/refs/tags/v${PV/_beta/-beta.}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
+S="${WORKDIR}/${P/_beta/-beta.}"
+
+# note: ring is unused, so SSLeay+openssl licenses can be skipped
+LICENSE="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC
+	MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )"
+SLOT="0"
+# unkeyworded beta for testing
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.{9,10})"
+DEPEND="ssl? ( dev-libs/openssl:= )"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	doc? ( app-text/mdbook )
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+		dev-python/boltons[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+RDEPEND+=" ${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# used to prevent use of network during tests
+	cat > "${T}"/pip.conf <<-EOF || die
+		[install]
+		no-index = yes
+		no-dependencies = yes
+	EOF
+}
+
+src_configure() {
+	filter-lto # TODO: cleanup after bug #893658
+
+	local cargoargs=(
+		$(usev debug '--profile dev')
+		--no-default-features
+		# like release.yml + native-tls for better platform support than rustls
+		--features full,password-storage$(usev ssl ,native-tls)
+	)
+
+	export MATURIN_SETUP_ARGS=${cargoargs[*]} # --no-default-features if empty
+	export OPENSSL_NO_VENDOR=1
+}
+
+python_compile_all() {
+	use !doc || mdbook build -d html guide || die
+
+	if ! tc-is-cross-compiler; then
+		local maturin=target/$(usex debug{,} release)/maturin
+		${maturin} completions bash > "${T}"/${PN} || die
+		${maturin} completions fish > "${T}"/${PN}.fish || die
+		${maturin} completions zsh > "${T}"/_${PN} || die
+	else
+		ewarn "shell completion files were skipped due to cross-compilation"
+	fi
+}
+
+python_test() {
+	local -x MATURIN_TEST_PYTHON=${EPYTHON}
+	local -x PIP_CONFIG_FILE=${T}/pip.conf
+	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
+
+	local skip=(
+		--skip locked_doesnt_build_without_cargo_lock
+		# relies on 80-chars terminal output but ignores exported COLUMNS=80
+		--skip cli_tests
+		# avoid need for wasm over a single hello world test
+		--skip integration_wasm_hello_world
+		# fragile depending on rust version, also wants libpypy*-c.so for pypy
+		--skip pyo3_no_extension_module
+	)
+
+	edo cargo test $(usev !debug --release) ${MATURIN_SETUP_ARGS} -- "${skip[@]}"
+}
+
+python_install_all() {
+	dodoc Changelog.md README.md
+	use doc && dodoc -r guide/html
+
+	if ! tc-is-cross-compiler; then
+		dobashcomp "${T}"/${PN}
+
+		insinto /usr/share/fish/vendor_completions.d
+		doins "${T}"/${PN}.fish
+
+		insinto /usr/share/zsh/site-functions
+		doins "${T}"/_${PN}
+	fi
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 3f7683f95648..c3a52f5a7406 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,5 +1,4 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
-DIST patch-6.1.11.xz 717696 BLAKE2B 57033764612efc0a173f501036ccd6cc4fb1ddb452f40d3d81cfea7c3d918174a6b242490fbb8b0c66eb91c4e6503b820b0e77ba12c3beeea95b492b662f3466 SHA512 3ea57aa49805a2ed9521b11237e70e2df68cff5c3215e5e047ec292daaa1caace6747219fbec6cdef84b099d607bc59ac7f9a7e72189fc269945586ee16ab899
+DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
diff --git a/dev-util/perf/perf-6.1.11.ebuild b/dev-util/perf/perf-6.2.ebuild
similarity index 100%
rename from dev-util/perf/perf-6.1.11.ebuild
rename to dev-util/perf/perf-6.2.ebuild
diff --git a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index 1595ef6c3f88..2ec0b2d88ab7 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/pkgconf/pkgconf-1.8.1.ebuild b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
index 4d628f134398..45bdb62e1692 100644
--- a/dev-util/pkgconf/pkgconf-1.8.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/pkgconf/pkgconf-1.9.4.ebuild b/dev-util/pkgconf/pkgconf-1.9.4.ebuild
index d8b5b2b9e2ae..1a62309a9c0d 100644
--- a/dev-util/pkgconf/pkgconf-1.9.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.9.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
 	# Per release notes, 1.9.x is a testing/development release.
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index d8b5b2b9e2ae..1a62309a9c0d 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
 	# Per release notes, 1.9.x is a testing/development release.
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index c084ea7cc63a..2e1adfb5a2fb 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -1,41 +1,32 @@
+DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
+DIST LibCST-80e4c1399f95e5beb532fdd1e209ad2dbb470438.gh.tar.gz 726513 BLAKE2B 2df71bc003ddd66a45da4529b2beb213fb28f39ea9f0a4016b9be43c4b38740bb0be0c154818e22b81680b1c1229e07c20a96dd0a29579c3d98bf19026aec087 SHA512 f2d5d07b4039046271a2edabfc0cdd244cf5637db44fb3bafe56b6b8966913f199d1483e2e04b993b14aa81330e748db6400510411f8f4543df2d6b867f474ff
 DIST LibCST-f2f0b7a487a8725d161fe8b3ed73a6758b21e177.gh.tar.gz 726087 BLAKE2B 417f707cbc87ec30fff0ec6a78a480a5a76a24ad3f129ccddf53e55ae311d8cf036b63170196a445500b5f9a45e864ee7f713be677433d4d0abbd8d9479418f7 SHA512 ad69c317b2d7efcd3bde56a2777ade7c71da02542f14e7ee930b9e12cad2b0b4f7ce287ac03769f4df21f3edc7fe36aed11a82c949257b90acfaac4b17aa51a9
-DIST RustPython-61b48f108982d865524f86624a9d5bc2ae3bccef.gh.tar.gz 10345891 BLAKE2B f626531f3172309535f20de0e2ec9642fe49abc38130f76e34e5e129c064f746fc821d17b9b2376e917448f032f69ca711c534c584d2c98fc6fcb867830b388b SHA512 5f5e7ca2df72eaa3dfb82efcc0f8a76d2bb695aa5c9ca57bd6879b69a17516d61057781596e0f1d3f92fa62c4b921b7ed6b903af18a8d0ecf78a45fad2e84ee8
+DIST RustPython-c4b67896662b16b5699a779c0e52aa0ca2587fec.gh.tar.gz 10388502 BLAKE2B c4417bf4a2e173864d103e3a46ef167062bd1e154671263234e2fd317c1e0b808205ad1f6d033fb7d0a48c129666737091c9caaf5248d45ea38fc658d8e7bc2d SHA512 1f33fb87a13c607f31bff18283736b2774f30990ade6a13087ecccc3df8f1d8f85d943df7eed4b4fe7d06c780e7ca7841ed361f3cd54687664d1340423892340
 DIST RustPython-edf5995a1e4c366976304ca05432dd27c913054e.gh.tar.gz 10387859 BLAKE2B e9b3abf79642155b67074a03cd64fcbd53482285b1f64cc9d0e17c76cf301a78daa08c8ac576cd7494146f9a6053dd057570f1959fb359c5eda313bbe3b1e95a SHA512 90be15b2fb31b91b7fae56e4c3f9be58e2098592a7efedde953aa6fa4f05c78fb028318ebcfd0d55150e09877ade62ff3380d646c6950d9ae4de57bc7e1bc963
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6 SHA512 ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5
-DIST alloc-no-stdlib-2.0.4.crate 10105 BLAKE2B afa0bfeb7df1d742edb412dca4c22957fc21c2a1be21c64c58503d4b943c06e3163d0f3c90525b25323b8dc38e6c64136ec4f9608758c5c6f3bd07c2c033ee74 SHA512 6518856fa524ee0fe8e04cf133c11028efcf2f6a28f3a70e401566a4eb343c954dba34aec2a02c0d0359757dfb5dcf48279610646215eea190d699708d838904
-DIST alloc-stdlib-0.2.2.crate 6693 BLAKE2B a22faf3482e416664f2e104f5f45c4e6d116a42b890216b80102e266f7a3a3accd2933aeca71650a4c4626e3d9da76b6488ffc9ea2ae4229cdfbf1ce9ca6c7cf SHA512 9c4169052ad460af2be6f2a128056661b2f26da0122877f13fcd4f4f3e2e9537783cb2b2bec47af43569629639aa8ad507ab010833982e5d942f5b26cfd46c14
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61 SHA512 f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29
 DIST annotate-snippets-0.6.1.crate 21894 BLAKE2B 4684eb9c7aaaf7e34808338d05c523482709de2c79245df30e1d1148b79de77fc4bff88adefdb85d0675799749c9ed8bd1a14be0d75f68c2c7664ea5db13ec16 SHA512 3354bc87d4ff32f73db98546a6e434f3ecfe6d290f08df5ebaf6afec15dfbe105e6b4e91133f442246a7c2e534730550010ef18ff075f1f7d6267799962e2b23
 DIST annotate-snippets-0.9.1.crate 31829 BLAKE2B 6919f78127653f9f022667b0ee7cb80bd2ef95220698e033031c6f4d3ff3341ed260e8baf776d032291538503e26577fc8fa82e99bcdc032985fb297351586a3 SHA512 e1e8b262a6681730ad068c29d7e0f3879acf0c7138721f606851228bd5d90292f24ac2c225fe49f26264e7d35de5ed3904850e522da8cd2c44a67f7db36f2d8e
-DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.69.crate 43576 BLAKE2B deb44b3110aee1314dd599b730df8c2f03b7d13c0d945d4ef00a0e30ca74257269e43107be19868adfea331a8c730e0aec2dff3abea704e56bc6a35b9581fe14 SHA512 d65e5c9404a70b1e0af90dd66af157f8c31ad0858f703765d5fc6c828f1fc8db690b17451c4108e3a52a7da2d6c2366e745d7b4bd7d19e6dba3485f7c3a43071
 DIST ascii-1.1.0.crate 36075 BLAKE2B 7e68e7b3d5e6aef132c52db8c078fdf2e70462d9238b637015d7964312737fc09b35719143ce1fbd3e5b8072c21717f33e5061adf4da1913a9b9f11ac9c453ec SHA512 d74982ad87796f0d745bfd654450dc74174fdc6aa2a0047e5d250f76dd6079189dc0f05d02a73a85b1d3a86c163524d1f43f5d014de0153cd69fad4de26cf0ec
 DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44 SHA512 216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
 DIST assert_cmd-2.0.8.crate 24347 BLAKE2B b69beb301a11e893ee1c7b59a08ac7860c16a598dc404d7bfd38b2554790898cfb82d1e602750e9b720b4122154e4da140c7b077645786f0a788796d5dafe272 SHA512 886d789af9fe7f8155d393e2742c7982d5c0bb8d44a09f66e5552faed2effcedd000d567f9f00e08ad6d7c17fac9374d7a234ba001f38c9cf444ee41dbe07428
-DIST async-compression-0.3.15.crate 58241 BLAKE2B 823fdd3a5f091d75a4c7f51d03435ef58cb51f480c2db1b65d8c76436fbc1bf22daef26b88273c84bf082648e408f3b9b75aa91bcced8bdbf956385454c8cc03 SHA512 8d7f8f35e71cd89048732c451c3935401d1ac415a5a7169b5f52fa19e4a83f6a4448b37bf915f738cd8be639252e317ae44ec28ea2c7ba38bc436ccc7aea80e0
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
-DIST base64-0.20.0.crate 68293 BLAKE2B 1d887aeb00d6a7cd8172a0677fdccfc601b6588cbcdb9f5e5c86c4fc4b68c60fea375eab22705f65ef8fde46aed0a0ba10a5aad0b4d08067f10539d2466abe98 SHA512 4c66d4ed56ee7f3bffacfb665ec209253e35c10fed448d9d1dc2c85cfcdb15db230e92e2a7daaa130ba4cfb75331b0a9a8b4a54f63b5e341d91da7325b097eca
-DIST base64-0.21.0.crate 72180 BLAKE2B c7aeaf671bdeac67703f9c4ee1be003eb8d6f46fbaa0adf61a4da304458742938db04291d5f626115e3fcc901eb3abb3f9baf8247f6344b4d49f60a200fc6fd2 SHA512 60bcc157c6449a2160e083611e6d53e07bbff7db8cd550d9056cb804e99e990d4a20092ba4347306a3c6b6c42474a06d92cb3895125c50cef9b74cd3cbd83a2f
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bisection-0.1.0.crate 7094 BLAKE2B b5df210f1b90c876ccbcbee8af9782dfe0c746ceca9c645a99101d74742aee18679298e76515774116ca835066bea8bd637fad599c7723402b473576218a4844 SHA512 07362faf62fb57424689321273360d355f698658cb7caed656d06c826bb75bf3536704f8b8bc6088a6ddf09540f566f78f0c187521e6742c37b270baca2ca13b
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
-DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5fd1610e7e28731bd5cc44c9513f2c7eb52fa1be0b4eed65bffe130ddc98c95dfeba2f9de28ada4091396e5695d SHA512 4848d7ec592642913c7bd06cd3a0da49d3bb14291866cd22ead8e9a6b2939a787035d5cded87be3d2d3491283e31ea2cfb105885df4114720da98beb82990ee6
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f
-DIST brotli-3.3.4.crate 1369026 BLAKE2B b46085e324a6fb90ef4f6198154e2f45d58b91302f07b0e7ec3394183e1981d8e25c2d617425bb656756988cac57fdee15d6de3510e6e0b3ea1fe450ff06b8df SHA512 e312842abd713b5dd750ae92dbac297136291bef22b95572b52141c7d991f9d8bc84dc605f30c062a9cdd42d610ba5eb2f8e1ce3a8489f4ba816fca5eca7e5d8
-DIST brotli-decompressor-2.3.4.crate 192085 BLAKE2B 8ae8a47410215cbae102bbf19aa87f05e8739d6fe31e8eaff25948b1b4138ffed36e699947be30faf0b48891a010c10aafa835065cbd9a31f0c2628564a02359 SHA512 2698f1d9fc33ae37efc4587a448255320c864d1bba498ead93c5e28167ef696bcb5ddec9d4292b5fde93c3acddb7e99b453d6507780d0034e325bd20e5222c62
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bstr-1.2.0.crate 340985 BLAKE2B a032f74c4681407704fe6b49cadb19bece51270abe85c3fab9268f5cb0fd27bd12c179beb88c932b1a5ea745af476249ad66465ec88ceefa433d4b6cca9d3b93 SHA512 df849487d35299abe116ef5e32857cb8736a5a89bb3b785a3563a5a0b43e412935eb21a639add210b6d5808fce135afbdb548f86f8572d4b105a065901b5a543
+DIST bstr-1.3.0.crate 340998 BLAKE2B cb965b9fc3f2e6906308eac7a99f1920423646fdce3221df0d532167239c4195a7b8f4451c34914c4a8ea99a79f847b6c8d0bf1f392044120ee27e02fd3418a1 SHA512 bacb9d8ef907853810bfa67efb670a98f76116af74161664ef11fc875f0b9f5f80423ee8af7db6a483f2c7cf70c13be3a36cbc1354698ea55405c684e9604253
 DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
-DIST bytemuck-1.13.0.crate 41703 BLAKE2B f24b786d2209921f2de16209d3b397fa1d62f637efd8f0a92c6d7d3734fa447ae3f1c5499e85a16e30e39bd132c00c59517ae0886d1fab8da4aaf2150a3fc0d2 SHA512 e2e8164c9b14d8ec44879f3efb91f3ac3918e092d22d73152166b926c8b85e854c7b925b53feb173b572e9260100d9c584dbb80a377944b2415d485dd1d20876
-DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
-DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000
 DIST cachedir-0.3.0.crate 7125 BLAKE2B 7f01201abf82b49b198970fada3385adf33df4e1fd717b4676965da04bb382291f75a258f295441ec5af49ea07fa3e9ec00940737b41bd76e8080c42586a0ea9 SHA512 7494e32f4537483fb1e23505a15f2d6296008e147b28f8ec800ca2198579f35578ad3f64e8d9b082f3c094849b7b92bd5adc6ea39a4a2b9d6ed175bc48abc8c1
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
@@ -48,14 +39,15 @@ DIST ciborium-ll-0.2.0.crate 10740 BLAKE2B f2ab6870bf68d238d51617e17a6a50fb7894d
 DIST clap-3.2.23.crate 219435 BLAKE2B e99a928ef61a7f9f6d7df2c38acd480fc86bfa3885d8b875007aa5bc855396641ca6772387de2eadc1d545dd201434037ea9e7fd138395831e4755ae5a917a7d SHA512 1f1f2ad07a0f8fbe8672f4252edf260ffb5e024a20d6673fb846d59e245a226a43675539ccd3cb252571766b1f6511c68c5cb0f2351c8086955d49c37f87338a
 DIST clap-4.1.6.crate 207177 BLAKE2B 0931ac4fb47d51cd9688397a47bdd19d78bcd56c7e2ac2fc871192ab3ef36caa63ebf6d85d0480c6931a877d44d850d3efaba7d49913e592612d39f24929a408 SHA512 739b1e3521762aa3f661489d448cce0e0856dad9ac392d4402c2f9051c5ea2db2660b0cfab73f04374fed854804f80cbba45e2d1a0e70ca0f0527c5ae12565a0
 DIST clap_complete-4.1.1.crate 32707 BLAKE2B 4c58c427b55d85dd83f75b01e5517b1721a5453d21409872b63a43f29b272b1c8a288cdb69fd073bf3240e5bcade40637272a66098209f3d0f8e8c52d8a45297 SHA512 1f6b6b2b40b4faba48ea7188275423c5e3cf0967dc8a0e51d79af3de0baf84d92dcd5a14bd230a0dd2be2cea48dc4cc238501bc7f4bece6505f331be733a876a
+DIST clap_complete-4.1.2.crate 32868 BLAKE2B bee06a5d4a2dd71298076128c6830eec5af6b5e1e56ccd4b966bd102fdc9d9b07685828530c8c308c20020437a6b5ca37a44a978ae927e2e0f55e2d1c6620092 SHA512 e07f44ee23d62e5f6cea800dd15bdde3ff5fb7303078b3aa08acfbd6b888381e06903b8dc504e02e488ab3ff5e1fa7078f36897e59b1df006b1ba8dd3c73ef00
 DIST clap_complete_command-0.4.0.crate 6293 BLAKE2B 505349a6aec99b43d4c714c9f2a9b9394cb942f856a642753650896dbdc9d7cce3c076e363587a1a50e5f22ae04c11e0796b2f76d17bc2e1e9cbf18294541e45 SHA512 5cf4b609444c0353091516f5119a21525c483ff22d814371524c08a7f72f2ad42a10efd34be60aa715931505827ea4ddf1cbb477ac41d2060f67e40dde209d51
 DIST clap_complete_fig-4.1.0.crate 10970 BLAKE2B 9bbebdc3472e33a8a37b036d7bc5abd03385e56eb17dba8575d9759ee80efca335bdf15fc9680613fa02dce86e51186db95dd3f3854d4f8db71e63a6c79e0b1e SHA512 49402173718b3a90d4a78961d5dd2f506de8b79713dca99abb448c98f8b772759c324a004db5b288afc2f8fb5f69bd0b89e83d4f66188d4574940e75aa8a5002
+DIST clap_complete_fig-4.1.1.crate 11024 BLAKE2B 37023cd3745308a57815667c063a91ae76ca854c9ceb5d05a319bb308116af62e3a11f7aab4ab65e964e22addd3e37a3f5387eebd8d3efe5b9da6d56d2ed063a SHA512 4b4f382f72f696c0421816231f363e3eaa2c8f81103556ac043c6889c1208d47b2c28e3fb7a8e867d77b1326bb097081d79ea58719a0d6672d18eb2d4265aea7
 DIST clap_derive-4.1.0.crate 27897 BLAKE2B e886be1db739d6a14ee5b049f3e991dad62ea884b1f885a357fa436916fc00d51315f7453b85ec7a18384d564f70380c58dfd2fdb862a20b510613b57173cd51 SHA512 dc191ccd0b596395d029e9ded5d1cb2cb86c8392a4de52ddb877b59dafe85369287b6ec2749d01f33372fcd4cb6a4e12a9cb02b394f50d65ebdc4693af062807
 DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clap_lex-0.3.1.crate 9653 BLAKE2B ec1261ed4f402c713c6324dda105d8e9eff95150c50b966096ca71f1c534f73e8bd3ba7ed9afe818ace8501aa35f505d21f040fff578565421710229321599b9 SHA512 2619ba0fb961d8ee86e42864b56511378ef837674aab6b1a21defee20f321e4f29b3b3fead0665b4385b0675d7bc63a7dd7df00dde51dee7ee99c7add6828b89
 DIST clearscreen-2.0.0.crate 151832 BLAKE2B 6657c9a69806c5f53f6eaf186602e18bb643eec031955663c1c7d0512d0371a0a778c8d2bc856527161e0ee7a54ea1e0b6f18a303376094d870deae7fe531133 SHA512 cab2ea6f86f508f3b665d9891cd41384de6f9b28f9a45fe6eb41235dfd191eaa209b395b822b258a76a2464aed4b6adbbb9c57b45999bb408361b7bad1a7f580
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
-DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
 DIST colored-2.0.0.crate 21619 BLAKE2B 5abcc05a95cd74a106c4e4f3c9b1722a7a9493c7d16c2d73f2a116d1d0d20f93d00c414a19871930e6286aa60cdcb0f4f4411ae059e7e76b7632cfca3a55ebe9 SHA512 c9ee830c1e8a32372ab8c7ce569701deaa6533fa369fc1b4c04bed57b1e686ed775fc76c3d9815ad21ee69cfc7c30d645abcbacad39081c7e37ff83ebb6d9e8a
 DIST configparser-3.0.2.crate 22545 BLAKE2B f03f85d109c6d7781340f4514667740c664feb38fb597262d2531f978a04c53f284de7c5671243c77c9db8d7202429f56030a67d76382406ee07e44fbf15b5e3 SHA512 ffa9055a736a93dd062b92ab1345a29565804021268787ab6dd314c00ccec4d2dd94562b1576ac356692011ae67ddc86ae8965e217b1607b680f0669eb4ea9ec
 DIST console-0.15.5.crate 34788 BLAKE2B 915818e2a5cc6776a3d40f51ac85ba178e738f5cf40e5e3c1450aa731a04d73a617341dead606e043fcf66d0701f625ccdb5c787978d784c3f22f9ec0524e89a SHA512 54dc15a0c0d7e1a96a368e5866e1e5ea9d11b0b7eafd0e086376085efd3f656bcf5ec86f4eb387b42dd8cd4258f9162c401914d519a175331d0c1873794f8d43
@@ -73,9 +65,14 @@ DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b7376
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST cxx-1.0.90.crate 682612 BLAKE2B 11c3b8b6dd69000721c8b0ab3f57884b7683660cafa7c0376955516ba92ab759c7526b7931da10c5634e9ec3c5cb8380a7bc813f2dc781049b68a40a433a6802 SHA512 943dc336d5d9ef083a9f109fac3da16c2a82df6baa875866962da318a6aa0b94ca5524281b21de4eb509217a6b576ead64219324e02c6bc5f2c68a2efbb11fad
+DIST cxx-1.0.91.crate 195757 BLAKE2B 9e426cd0c04eb585fe40ece4bdb6a90615f1a81730e09e6b3e3f5f4ed4debf4f5dd0093f779bfe08e95580dc3c4c9ec095624ce5f40f5937a07c9d2c19b82844 SHA512 14fed0543dd81ecd5f07e20e159cd8694cda2f7ccb5fcecfd8b6ca1dada05d6f1f2b504bb3b6a1ef01cc15adf48187b08e032e668fb298e3f099cb4d49c1a3b5
 DIST cxx-build-1.0.90.crate 84432 BLAKE2B 4fd93046a2af2fb6414b9fd0b32f12ef902929574c32c4e55d359959ba8a2700bb2bdc0ca9f97c7bb5b0447a9197230a0b34710f65e2429eaedf392fcbe1f572 SHA512 4dc29a6f9bc99625822aeb0b58c565f2b4efc0cc42ff6984c7e132bbb6a5010f3bbc8f134b12400478dedf622cc6e41380062439b08216978e5fd988abf3378c
+DIST cxx-build-1.0.91.crate 84433 BLAKE2B e66221929e433ac190cfae5e30ce5bfcab8ad807c183182efa001beb1a418ba39c2ccdfad09bd52aba99fce2cfc714e8878c374ddb59f040d5628a9d94b67852 SHA512 2bbc4aa8250a50887d62faafa391da366e5453ecbf0d93dd9b6769e09e996ebf00819b7631959285527cf8bc68f294a44cae35f91ac308a911f7cfaf78bcd5ca
 DIST cxxbridge-flags-1.0.90.crate 5253 BLAKE2B 42ac970f74462f26f291097815db802e375dabfd4e6c29959020806706feed895e028ae153fe4cdcad789c79ab9db0f14f698522c9d7feaa28210f8fe0ab36cf SHA512 df61014c50cb8f82b02b0b9e6bd14b349b4dd71255b2327395a74f92aeeac426c887e87f233c3c7701a8dbf588572e8de3568f95026d6baf4c9e404992ffdec6
+DIST cxxbridge-flags-1.0.91.crate 5250 BLAKE2B a60a2210c411b042c8ca79c1a7cb93b0f46ad720907fb4d7958e37c092f41fd3effc404037d968c59e1ae95bdd5c6586a221590dc634d2df35be0871b0d287c4 SHA512 8f704be8ff3306d0e222dee4e3e43b78b5be40222a294004aaf02e80b27b194c0a5449c13b667a5dc4239e67600279086a08c1f081bbcb39c7e44f6ecbdb2e0f
 DIST cxxbridge-macro-1.0.90.crate 59532 BLAKE2B aceea80ca114ef75c6acc15dcc07cb1f9afbd3466b5b159cad728a12c69d6e951b661bde8f65478a321157514d2bae111b12977127619766a6269c42afed585e SHA512 968485b7af837e2852f60c81e7162a8b45b217750f171bada8577c2af3c2f4d5a456f4f5b9b8a84e7100182673d5840d6b0b57b70f5f99a6d53fdc269534de8c
+DIST cxxbridge-macro-1.0.91.crate 59525 BLAKE2B f6d9956c1dc8fdacbefcda5aa35fd617bfbc267c68543460b3cda5bdcda26cc6194fa2ba86912da50a9640ed0f3bb9d4758e7081a6b1584e6f94a671635321f8 SHA512 820f6cdce0743d8e929f98e5b825e32b9913768c67db5c60cdbd94e681a1ed25b628abd9f3c02075753e7c4a3cce7e905e962b6bd71e392bd96dd00e6dd86aa0
+DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST digest-0.10.6.crate 19527 BLAKE2B 402009105a6ac055be062769dd4f162aabb977b9afe29f451eeb3e6b5dd1a579c371c5ec996b9c1bdba3b4ded83830ed2e1934a0505480bffba1e0d16775a8f7 SHA512 21d3c1dc64e640300c51e8a009af464d6e3cd2b10aa67c87a038165c11409d6e5faad1967236724a9a4cab8fdd88826cac1db4798245fd53ac2ff1a9b2b68b76
@@ -89,73 +86,51 @@ DIST dyn-clone-1.0.10.crate 11946 BLAKE2B 389522e3d55241a6519d7bd3121da003aaf545
 DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
 DIST ena-0.14.0.crate 23052 BLAKE2B ac9a4141d831bd16cfd260a162572b43e9389b5cee4319cc22a23b550b25370cf49856c320fd4489633171a4fca91cf7091e974418ddbb1649fec8730c9cd2c9 SHA512 bcf842f8f5da8a7e9b8e51df50bdf3f00234534f1d59d96bb1e45b0ee4fa74847eb8b9b5ca615a66d84d23c629d7386f28294a5c64d22efdf2903bc89faab2d4
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
-DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a
-DIST env_proxy-0.4.1.crate 11256 BLAKE2B a8e3e4f8366a9a578da09903c1b1e9ba2c4e37700ec5600814c8a1dbff740a20dd6147bc1fbeed385137ce734477c734ba370fd6a824c64d571da374554370e5 SHA512 333232b0217eab986b4616061b1419e24fa95b55d6f58cbd3e6a8a280b1f8b6587ce5ae30cfad570e7cebb2327352c18b6a8ab27007dd870073308127d2cfe00
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST exr-1.5.3.crate 241996 BLAKE2B eedc489004e751e4f4aff1be42f2875c132526a5734f1050ebb91638c85b6970bc07af5f1cbe6cfe1e69d0d8b8b96a0cbbcfd8f4ab01486c60686e79bc5ffdb4 SHA512 f43766506fe13067217eeb52375d4779a726de5168d3cdd082b793b8e44d1e5ded333ad5e03f44d2a9daab494e2ccea62a102e56107eeb24997ac87ca7789225
-DIST fancy-regex-0.7.1.crate 78178 BLAKE2B c5887ef60d0427b5964cb296696749c5dff6877c0348c646c97c318739e9f1c0f517b01229de11656cc50ef702240526248ffb67e9aad91d892a39ebaec5035c SHA512 533cd4eb50a1a9665f42dfb0c6f4e8c7bbf4f45eb50abe023e44f0dee66a9e40ff82784b10dc9e1f4aebd652efebe3472fd3ba92996dec0932465cd2cfc932c5
 DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
 DIST fern-0.6.1.crate 300402 BLAKE2B 70ddb9f8cf605471594d961fd8dafa20100a7eb9b58bfd17caba63b60fef35d5c96e642c03c5b302c314361b695d4f3b4cc10f6f5cc78e6ee13e97eb94f6b73a SHA512 f33d3e03c8f4248b046bc84c83d0de9be77b895e79ebc1ab943c50d7ebae021477749376daa14763709aaafa69d414a8ea774bb009a10737d1de57c7cb6d7fbc
 DIST filetime-0.2.20.crate 15027 BLAKE2B 393bf9696992ebd17a8319f23d660a8c841b536109d8216103ba163ef50c78dafe35f640c8996a707a43fc523d24becf38ced2cada9cf072445b13bc3138ae38 SHA512 71b2705acb0aed833b8c5da8f07384aeb0e290be78c68f4bfc044bcb7e8285740186b74b0e37c619d93bc05b9022a83cb0edb75c688b106cdc844f843d0e8a0d
 DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
 DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7
-DIST flume-0.10.14.crate 65389 BLAKE2B c88deea78a5713728a6b6a94a4aaef570f6eee1af85fc489534d7b336a9ec9cfdd76890929a456a689ac196bef24cee68efadb30e06ad585063c5bb77fb2699f SHA512 ad31351031683453b77d85a89812304d63a12cce8bbd31dfaa508091cec52bc511739d4d13a085aa8bf9f2438fc1876a99f2e4ab2602bdbfe0d2ebb1df4eab0f
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
-DIST futures-channel-0.3.26.crate 32283 BLAKE2B f963366ec1a8127fb4be28104bf9c871d51951be9036cfe52d4ca66b0ba9e94f37a9b24c11e620da035be1b9a1ad0844737f7a755516f465ff03675f8c99a7d6 SHA512 c270276fa0ba9ebfdf5b575c8b2c31c21efe0c55310738aaf548126e1db004134141639c7486f8b3d5edf2ef7d712df45ca505f0150c2ad7fbadbef07b75044c
-DIST futures-core-0.3.26.crate 14708 BLAKE2B d9bbd208b274efd44add6b49a3dd5344d9462e4340e646586d59adc5c33949f9d7582fb8fbb609a79546bc66258718b26615e94555f3534ed787c2f0151b6362 SHA512 0362f98019f745d2eb3bc19e504813b262342a511c403d4bfc89ff750d7488d48da476a49183c2ddc9862850c5bedcd29ff82ffdd2033d971ece68984cededcb
-DIST futures-io-0.3.26.crate 8913 BLAKE2B 68f0fa5197b006b353700f0e92c26008fbce0c0732f3c6a1b0e642f9d7c19d0b261ea80992eb33138b4d6ae3aaffacc47a70ceeca5300e8ad0a222620645550e SHA512 e3334e6ba43bf21b82ff79bd042efcc7b8004c965d3de5df1c60e98a6891c67b0b22fc82b692fb3eda0c8d6caa388ad64ecc90b1c2b58940d787f827069d7b4e
-DIST futures-sink-0.3.26.crate 7853 BLAKE2B 8bd044ee7bf46417b8b52be3cd688776ddb2469e4459a5f202da224a173dac6eb95dab3b93399f0b4451f1c747d9be58b7759f7c820ec6873880913b23467e69 SHA512 cf7d926ffd47abedff3b9ef9dc0a1b6e2bea9fbf435a009e48d2d453b8ddbeafd770300f009c379e88550acae1e1dd71a680e459a98be1dc21e439fe7572a0e7
-DIST futures-task-0.3.26.crate 11855 BLAKE2B 1d03a9f838308948e7703a20f9e123fc49f64b31419c6d617d0e23b0f8c635d0dca4840e8e50892bcfa3560a5029fa96f971ef3e0645a624742e4c026964d136 SHA512 82ea13f96b039d0c0c209cb728c055dc81622f5f2a0a670e9e1ea409124d3c7f0e9a4eac2cf23c4e6875ee6f3a917dfd37f90326c217df136c79d8eae058e9f4
-DIST futures-util-0.3.26.crate 156709 BLAKE2B 6fa7db7676869b9d68ae6349d7cbf70062442fb8333177b6829b1d290b426ab9efeedd9dc49a6783c3f6511b6a3efcc9479ed9b5a10c4d28b7ff57daf280f006 SHA512 7e00e4221f3864cb8d66017258e0ce284ce730c49713aa37bff4f317934fddf1def70c47c8f120a5469766004d1a774e969d99631954a813461cf41c9e2c6d13
 DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20
-DIST gethostname-0.4.1.crate 8997 BLAKE2B 90f61a3580c44ace4b71e40fbe1c778317e7f85d25d938fdffa513bea3fa70894ebdaf868b38d3d14f04b77a18dbbd27488128ef09d5c88e26a052d2d76a0fe8 SHA512 b7c50c01f2bea622d1d2a0393e6d5167f1b1aaeb9907698cda056b780c92eda6d8966e8619b04433457ecd9049411edabf7ad2aa8c20e2866e5a203ec49adecd
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
-DIST gif-0.11.4.crate 634244 BLAKE2B 537a21ed947889acde0c9b8a42a7d0308f2d9017e59145924e735aa046cc494b60b97cdf3b24d62d24159a47bd4b6bd2aa009f2871c0b4f6fecec020f8041398 SHA512 3de0534b35bd783b54715e7f8a92f2d8a22934949627716cc3ade3c8036489d2b9604292eeeeced820b149865bc44a5de9d05700ebace073b48737759b5296b9
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST globset-0.4.10.crate 22923 BLAKE2B 10bb8db9ceae039143e36c2f1c3cef92848277ae7b4bff6669f1c25aeb3ae1d322da7d88ec13cf9b0ba5edc0e27a52843a5672a8dac225d3c37bc1785c04e6fe SHA512 85a1213fd3ec55ffd87fde25f4cdbd2e8ed4056132d3c516eb117f107a744d733e1ad8fa06f296a60084a23ee968c3c0899399fd3ab9bbf72e217638a5cf165e
-DIST h2-0.3.15.crate 162238 BLAKE2B 67f4ec2210e83e16d8a931e4c83c21b3404d826278262174da6cd034de588b944fd6f8c2a416930870b7c8c9200ee9f2b0cfbdb42a94ae2b83f29b3e50455776 SHA512 54e006a0e70448386a8a8ce57434e75352e09e2a6f4457035fad47dc793b5ed69ef9cfb31dbc91b7d0d9a58ab5c2dd18e78190410356f871c14165186d40e6c8
 DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
-DIST half-2.2.1.crate 47021 BLAKE2B b7e4890c3db85f5adbc79241aab8a5501a66cc4c1856d883cab771192b42173623abe670b85e092111f31e118d7316cb29733efe5b9cb09e2594909059c5ad2f SHA512 6a2aa43a2a2f5c981305cbac46fe9dbfd3644912f6a8ae17e0ccd09aad5bbcceaf095b91d51d12c55963c88c208510f9bd94b472446d23752e3c0d3b41531a48
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
 DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9
 DIST hexf-parse-0.2.1.crate 4662 BLAKE2B e1b6bfef243b07305d7a8f08c8dbdafb67dc50c284ae70ee7032ee8bdc4e72928b6f45344613db63bbaea49d883f0f54e1c09235fb951c1a65755946c557ff55 SHA512 76e64d95121b0c3cd534a0005df0933bf6430f50969ba7a72f6a8261c9b7830c00a65b9286315cf78dca4a23c02bddf75488004630ca9839cc371c43efc8cade
-DIST http-0.2.8.crate 105591 BLAKE2B 254dff38c4d7dff28e4ddee0769a2f5e2e9e4abc6aab38e965cb7efa4069d1b59d422f30fdc73b5db5bb6c3fd02633dbfdbefd59bfd6ba352c3e5c9241d39d97 SHA512 8e8d01803552299807b07a9fddb45d92af089e43344eecacf2bee07b0e745f33558d26a5cde987ac0dd50f939fdac2de6855c8b44f7362e86d05efdde8a7d956
-DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5
-DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
-DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd
-DIST hyper-0.14.24.crate 186392 BLAKE2B a68f2eae7da3445c795662d239ba7010ae70cbf725fc1909d49feafa0129dfc473be05dded91e80982cd86fcb56621ddae45a97090a36a26726d4bbf82a73b8e SHA512 666f181badd8e1d440b1e650dddc7e370eca2baf628b89f5f579702b3d8f60b5e5e9b2e03f36cd64de67a6acc3567d1b1e629a82206fb31870d5d50238fbd18a
 DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb
 DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
 DIST ignore-0.4.20.crate 53551 BLAKE2B 9c2b8d729ac7952e84fad82935183face8f6397f925dbea37b83b438fb327534c64c565e2f5cdb98d0820413f5c50062173887f1cce93a50805ec5e2df43a807 SHA512 e90c5c356252fa1c573bb92971477f2805e4167c3e7878e7da6756ae14463cca328a6614d448cf9a3a28abc5bf0f7c62313a8cb8103a04bb1c3bac0d0924f658
-DIST image-0.24.5.crate 270381 BLAKE2B 239022ae8f5cb6ae187fa886f531b3eda2134f3ca31501902a13aec104efa86dfc717aeaaad329a22ccfdd2d8ff3eb222d2acd83f01854333199611aa95c77a0 SHA512 710647226e060cc75550e6bf852a5d78f94628b44bfc5a9d20fcf60dbe10efb1b28d192e91d5a9ac8aa57e975ecc88b0f9b19d08e732694f1037d8c235b48fc9
 DIST imperative-1.0.4.crate 8268 BLAKE2B 5cc9c799d4f0dd0692137c632318896a29e0f0df66b222683245629033276d6dc62acf1e0e03cddda1bf355527ca0c75c989622a0948311e5f11377608f89ba2 SHA512 283b7eff9eee7ab4a4e0cc78321e0d0eb0bd15e66037ce8dbf86a41847ac1973693ddbbebc6a0aeab6c1cca6a4697cee2f52f631630618bc935c2bb755f33419
 DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST insta-1.26.0.crate 540203 BLAKE2B 8e700fc39b44ff5ef8467efc5b609481fe5ae5e3cf5f1705d4a0305c4a8c0299b05fed0f7c95d70d3000d5c0a826c0111f563d3fd1ff2efafbb386a794e95842 SHA512 7c992885bda2ca72919abe16415c8906b1d823ae8981ba1e40ab0ae5ca7f09829c9a3d79d22997aa744ff79acf5300eaa15eaa8416c09472092725e3b6d9f5c5
+DIST insta-1.28.0.crate 543398 BLAKE2B aafcc57523247f617b7267428d62b8a401098acc082dd77732e7f6741b220a6cf4fe612b78bd98f6c69f9e7d960d32dca1c259bfa9f5fb438ce4a99f6dbe8a33 SHA512 0195f32e4e47c03ec1c56951f671a5f16c72e1c2c847d39e4c3bfa90139209b1c1f5b7acb7966cf36fa66e4691cfab344ce7cd02443e8521b5c3d2bc77c703ba
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-1.0.5.crate 35939 BLAKE2B e52a66b90464bc799889c5fe32d8269fa125d5eddec709e2daeb9a0b5db20c5fa5b5f51dcca2b130b75b1980e42e2aa5e892e6133b9d7f8f0b3172856e6808f8 SHA512 73b884426e26c19e65e25bb44c6255f1c46178d946306d39088350151253c2b96760ac9df84a01609f50bbfc79680a58e9a2490a14f2bef2ca7d4c11f4faba2a
-DIST ipnet-2.7.1.crate 26989 BLAKE2B 9f581d9e849e332af2c70eca34e85e6d40bcc46ccda3b420058aac315cdfadb90abd08dc926195cd0c4e01027c4d35868b15e4ed1f5aa9579ead012cbb81c232 SHA512 c6ee9002f0500dc1a4820d3f135018694798808354bd4f89f983fe495a27f4d14c538c95c7d8b5e4d17ae6ea1cef3f424e87d80f83f6ea6dad92039e1a3166b4
+DIST is-macro-0.2.2.crate 5247 BLAKE2B f3b5ad468bd8d5f4b62e12d1474c139245057a455485cd4587f3bde86a2a9cd71e329b94e20899e7edd261ce251af8ff5a2711c5812d093f760ef6cca3afa5ce SHA512 bd51b9183cdb9151d71d0d4dd066c36252a2e2800d8b58dfbc81e481c119f526824876b079861cceb077aa62c6c6f59a594ef16e9e305dc3a21aef9a120aeed8
 DIST is-terminal-0.4.3.crate 7701 BLAKE2B cce8c2da2cc6b405d7682291688583b4a6122572c2fb4ce1e2c6a6e63dbdaffb89d6c0076530faf0a7f1862e8a5739fd6d6311e27cf318bc43dedffab2d9f521 SHA512 cf304ab2e0710cd326353f9ffd726fe1c4a3f261571e188073a378157c72a9228c272ce24251d7e1f641e31d3ff7656433742ad4dea8f88a4d2172cda49d5f0e
-DIST is_executable-1.0.1.crate 9550 BLAKE2B 64fbfd2805b9e7a2498a59bd1ff924f84a42c5f1061ba59e7d3cd72cbecb394272c3f9af101f838c7a6a636746d8ed3b7f698c5720857675c58127cec9846d81 SHA512 677980983db2c8ed72e87a2f2df3bac328dc6ba6dba6c3e8c4e4eaa7b8fee160ef4e81d105f65ed718fb7263137ffdb21d86b148f614f04fb9e24201417c8a29
+DIST is-terminal-0.4.4.crate 7744 BLAKE2B 051334469f476582dc6443b432bd476e497dcf26ee9d6ed9bd8ab4521ef87184615a5acd2d912ad8ff0cb552ba31c27a706d009c32b62cece180414ddfe27c9a SHA512 7b5906277f65876a6ef66b25b0ad44358a8823c1f69e4700b31418b78ed37398d37bd3e074e82d9fb4dc18863bc316064dbab70b542849fe3c5a079a7334c9c5
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.5.crate 10622 BLAKE2B 0d08db487ee791a252389e40e08e47a649d9eb90faad16bfbdfdfde46366082d2e3561fb8a62da80b122e7771052c50a0483e9618260d094820e20748d99882e SHA512 b90841e3a016a9a68cb090e4bf78959bbadecb3391cba71e0deeb5ac2723379ccd3251ec18a0bd055fba7cb6e71608ab1d7db990ad4d03cf2fd1289bd5834540
 DIST joinery-2.1.0.crate 14163 BLAKE2B 0a51050953baabac243f747ba6f4395c52688657567e1ee58ae639a141b069ca75de8fc664f857d058341d0be1f111c7d301e20bb0afd66c1c603387a8fc9347 SHA512 13b510a6f9f3369ffb1b9bd32b2ee1b66d9cfae064e919e40b2308e03df801a6e33c999ed3c37beee2fb8140156655008dde83063515781ec12f78fab997493d
-DIST jpeg-decoder-0.3.0.crate 742671 BLAKE2B ea2226b1475a488c9c1d767145d021de87feabe993eef5b6534c91ec35176eda74881af667b2833d0610db04f4bed0456d803af92d4fab6d472db606633e3f2c SHA512 68611f52ce1b9999736711daf17d9fac8286179e5f937f04f90d79f1a4d9f7cfd9cfbba9ba2bc52b107392939d57f4a37e8ebc409878d7e9838d5fbddd8bf5bd
 DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16
 DIST kqueue-1.0.7.crate 12554 BLAKE2B 2302bb9a6aae077c1b69e4892614e87fd86187fc4608cea08cd510a46ddc3a06b27027bcf6a865550187c983f3f80a9c7dcd6d8a6ca891e2cb6fb2d1a5d17396 SHA512 03a1eac44bab42b683312c7f541fc235ead3ec89e7e0b6991acff431f85086df9dd8a9ee1b80f784c9c5452d3e497170b734883ed0fd117ef033079d72f6c1c1
 DIST kqueue-sys-1.0.3.crate 6673 BLAKE2B 79254d667b4cf1fa556f1773db23b00ac431bdea6c8ecf914e3c0837fe4e25a45c9b6fb76259d628e4c76a20f749df3fc285b54ea63ce3b52d21529358e81c3f SHA512 76023295abaa4415c1d7b37c844432ece522b762f78983cdf58106f65ca553ee96193bd8c93f3fd0af029d266d8414f2ba4d1b8835bcdc180acc7defa6269731
 DIST lalrpop-0.19.8.crate 228864 BLAKE2B c280697f25a333f02f646055f748fe96801d7c8793e66b0c41a3861c45e8368996cd6d3284d4b3c8120f1a5e717ef2c688350b3ca7329898b57f1c61b281d726 SHA512 62af845f2b0087a08b98fd55a2b07bfceb84ebf63a38b53cac23ee4c1043ff4f8e5f84194b314b25a0dcfba3ecc10b050be63d638a991d1ea90fb73707567d9f
 DIST lalrpop-util-0.19.8.crate 10216 BLAKE2B f3331d3eb8eb9615daca080c9df0ed6e6558d839002e69f6eac3d73d81687fe8800b3073422075010c48a7f299f54618416eaf97909f504d39be29fdf9379d09 SHA512 4b32f2055c10b7210c39c47c0599ce724464692512ff8ca682693e8e3c0ea191bfb3f2dc6fac55780627af22b7b21816940b6a3f4c60d0690e64cf5d204bb3e4
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lebe-0.5.2.crate 8422 BLAKE2B afa49a1945d623b34139e31406f4780a5ab7b3d34648caf5f73b1504dbec4c4c02fc3aad3fdcdf85509eb8ba733a131a96478d6b9494cc9f69048f9ae28eb880 SHA512 ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae
 DIST lexical-parse-float-0.8.5.crate 180161 BLAKE2B 881e4db32a21c26a1919fd1373aef1ea16a6fca3d799edb18ff0c9e4a79d481f8ade7a93f9ded2a660ad10cf815eb757f6eec7887945f8203c467e700af7a9a3 SHA512 ef012cbf18f2e306724dd700ac259aaa73b44f6c4531377deb9979c80d31ae66fc1a8b2671bd677e0ebfad8f77e9a5cf25707c67a1c5b1f554953c036cb39d46
 DIST lexical-parse-integer-0.8.6.crate 33647 BLAKE2B a0ebd7a51c271a163796b0f55bb85e16830bf06e26e3f10d9b13dc5b65af590c77f47fb64360a8738c5ad4be6e6932d58e83e1594a80c067859645c35b907c53 SHA512 e9a814d2928bf5bb2d9dce53e26c65356191c9e21c3aa0e674d58ed879aa52293272f3897f64372d996a3f8c471b0f59348ad48f15a21c2f35ed15f522ac2daa
 DIST lexical-util-0.8.5.crate 85152 BLAKE2B 42a968c6f9d20cb4cb10906399d37d6581b425eadb31439fec4a71395819133249c4fb75b1d962100e77ba35b6f6b4cd428d5b5c161b405b22333ee390e671a6 SHA512 449c7f2a22c109cd179937c36e14d91c742e1a837a85fcf4fb58c21f05317511d1281b564d216a34760ae54a0df2d0ff5caf49da4aa9d43a8d87fcec0033cc39
@@ -167,16 +142,13 @@ DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST lz4_flex-0.9.5.crate 38497 BLAKE2B bdc506c15dec7ef4a701b2ee6357c0a699183b5fc212a4ca44154d3a4d9204a2a78e5146598253e3ee0beae3d227ee94a00678f0497b15692b207040766bc8e1 SHA512 5607b603a2a5ab966cae2c7ecb19e1a0e56d667ceceb7b72ef6f5e31b6a903b6e6427dcee632cedca4bdae9afa248fda32af02a4aae1117570a7fc2d8018c008
-DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346fe864395be44f99d40ff0fbaeb45b6f2fafb2e7822d1ca72f1cbeaee4c5f9bc3e2485cfef2b8de2a4183ec04 SHA512 2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d
-DIST mdcat-1.0.0.crate 333924 BLAKE2B f8fe56f22056fafea6fe393501ab595c58574c5878c36f12267785eef9cebc20a55cdb077f55ad8adbc79e4e79de625c0607890bfcbcc9a52ed1bf2bdcf11f0a SHA512 c6521cb53bb793e096044944dd325b8a190c2821d830f68c6750aa8082fe1bda2db69653c8e7ea367d0ebfe673987edc17a4f5152d8d1b648c6b0c3dbda44248
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
 DIST mimalloc-0.1.34.crate 5012 BLAKE2B 48d2c58637f435df7ef322e0150f03dc27a7f7c5892ea2c80b1b1ad20a3c71e77aaf8980fb36008fed58ae92e675df02a13d2ed0b94cd605f756f192019db705 SHA512 bc25f0f40baf4530c17e0ade84e84e113af0f2c4dbbb6ae531a64a66588d1d799e6486c7b6e94eeb08b5ac641e7d72a1c641f468c18fbbc95db77a5ca38154cf
-DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST mio-0.8.5.crate 93993 BLAKE2B 6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc SHA512 e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede
-DIST nanorand-0.7.0.crate 18437 BLAKE2B f4aaf18b7cf32b385d97842cee234f0781bc2e55ca5662031204b999293d417e0ab2726eacff084dc6681ea5e46ce01335a1a5cfaa5e8bc6e602aacb1fd25252 SHA512 3ac650451d629852236eeb45dfee808acbea616036025676b47310100982d7e8317df647fe8649e7753dd0f57c501dcb3f7401c3d804af52ff2a2f50ace8cc69
+DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203 SHA512 45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e
 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nextest-workspace-hack-0.1.0.crate 1040 BLAKE2B d1633a4499b9cc1dbb81201aa429da110ce31e566ca1213ce0a166e9c33d017a8e373acaf05b25ecda84102c5c9d19caf6576554d9e527d29277f0b8cf79fa00 SHA512 896d4e70b783d6ec4512fe6a264c0060d2ba383354955487cfac73a83757552247d3e71194c2e96032a32281f2b7fdbecef45d9270660ea6816019b6ba7fd27d
@@ -185,19 +157,19 @@ DIST nohash-hasher-0.2.0.crate 8051 BLAKE2B 5f307e2bd15580f398d53d499b9013a6c62b
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST nom8-0.2.0.crate 162020 BLAKE2B e196fb349cdbb263d4fc754f922cd3b819f85bd323672f2f23ad465eea5352fdd631a7e411381f19447ff3b1f2780186fbb738d6f04fff33d97ca060ab94c2c2 SHA512 0d4cca8f13978e9101cc2eb9fb65ad879929a5361353c9a04e9850061e788e942948a6ea064c6986440a2576c10ce84daa8aa21d75214f322691da5f63668454
 DIST notify-5.1.0.crate 37269 BLAKE2B a11937c11bf32aa9b872e78009a5b92f04f326ef1d0c5037611a89974c0011c9656475864aba794d7b1b30635ccd01c475d250ddd1a8aa0f4adbf46f2e86ec1b SHA512 b04055d124aaac30eca9bf56d910ce2b6350967061b42cc83d2852ee6c8e99fb687dbe0569daf0aa98b1b7397b9b8970aeaef31a34cec84108f6de9fd6a88b52
-DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043
 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
 DIST num-complex-0.4.3.crate 29523 BLAKE2B 7f6af07ca78b00ba21f04931c473b2b725c61c78bb74b3bcef7b10a0fb00353c06283da02c056fa8cd4f9949476392054dda56ddacd330abc2d1aea3317e9ebe SHA512 64f1e6ee49f162a190b9aaccdebdf5d4f1712645eebda7877437f58859c5d8d4cfd10b67a39098dc964f9c842909b10e222aa8a2159575a7bb19352f753d3d99
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
-DIST num-rational-0.4.1.crate 27889 BLAKE2B c6db5b2165eb341268cc8b81df44caf25a18242d0ff1cc0959444ed9a51ba9985c1238d6d79433c3927267ceb181da6d491bf282560db6bafd7768b79ec65842 SHA512 a7547ca663543e9da9e18dd079762cde371b85d55874a54d6b343ba775a9373392c85cebad511c53b5af5db298bd5d57ccef6161c1c28587a6c9fa2c5962a0bd
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
+DIST num_enum-0.5.10.crate 14895 BLAKE2B bdb744f8ab42c778f568bd3359b577075d276e95a0631273078e83a89b18deb8534109c7bb54937da71825ebef884dff2a8dc6d948dc1b677521109e57b7f38e SHA512 ff5742d9c7214dcb6526ef32b255bb23b7d524a231cfa70f135bab539799ae520b327598716d5f5e07ad374e90290b959b56206ed2242fe2bc3c5b6468056c3c
 DIST num_enum-0.5.9.crate 15016 BLAKE2B 4ff68ba3614219710e751f3a50fee4455acdc6de86e885b66524a3bb15103d8a1ca74a2fdac37d133a5ad4ed7eba8f9d6d0f128710e8c97a0c8350ccc0c0ae99 SHA512 33f97fa6b310a4f5448237e6ece3e9003347a0f2867ab5351ecd84d41b8d0fcb9b2f99ec3be714cff3a6b4a6d444b024b6998214bf2f2331e76117c389cd7e73
+DIST num_enum_derive-0.5.10.crate 14274 BLAKE2B 4fd250827ca82b1a34ca1444dc9bbb19a624f847f68ff2908014fdfe3803fe1c63811eca76795091d4071d6cbfb136eaabd8e315d42ac3f0172ffddd02f159fd SHA512 9948e28a532e1d3b333017aa49e275a97876fb181498419033d5e0c3ced53f270d337cf515c244b2c46319f3e8dce8782d71fa356a87b4c739fb3e0f1bf4e6c6
 DIST num_enum_derive-0.5.9.crate 14222 BLAKE2B 43c1ae48d2713243cfaf9f50e1de3c90cf454306bb78943cc492a4db7da1a82e670c82385ece610bfafbff8b792e361a9ad0266eaafcd8fc9d26c0146feb06d8 SHA512 8934ac4f8150a7aa6b77860521283db36d3c4aba85a26ce132c202796dbe61937f72979ff683bd8b0c3b347a067c4657c61679808261f91eaa5c5f0e69aa4ffd
 DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46
+DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e409b10a99284c7b669304c0cd701a3d20e690350018f5d7de8c6c7d38521f3413ac81d08067dc26f76b7c0e5b056b SHA512 2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43
-DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
 DIST paste-1.0.11.crate 18349 BLAKE2B 02e3168fd03a4036bff486cd01bb7f7fa2c355cb6087c4b92c091e9e16d6d098fca1f142cf29fd0428fae9fc32bf96e84a0fd59ddb5f6bbbe155dcbfd1d41558 SHA512 136f7e840a20d18b6706929b0c440ea2d546d0931da91236e3b401e0dbaa74aea95510277620fbcba401f2ca7f56a315049a77ee16a4b228dcaf63f90bd2c9a8
@@ -218,14 +190,11 @@ DIST phf_generator-0.11.1.crate 11075 BLAKE2B fc8fb9d06ea933ddabef555b01be6d72c1
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 DIST phf_shared-0.11.1.crate 10320 BLAKE2B 9a511bdaf3c74c48da231effcf7e65935e7b0ceb9271a3d66f5b15fe13e801b8a7eb10ad5fe1a07913294cd070ee9f9ef942843ddc1a29f51c76e7baa62f8eda SHA512 0e6968aded0535c3430474c49378420fe64809ad436cd39e331c8dcfb1759605df12a9fe78db75bf0761bfbe8beacae4faad2209923327cb41f015f048fd74d1
 DIST pico-args-0.4.2.crate 11565 BLAKE2B 2dd0dd6679d418fba0f6bab93a8216cbb9182431dd7e0819e382db2fa1632bb5ed17cfc2bd7da90df41024066d26cc82188dd4693e6b4f7eeec44d440edfb12d SHA512 a6e46bc8d086091a37a0edf418d5414eaa5ef57a508aa81c352c66281cc2c88c97611b7eedd4f5f18c7a8169f48aa3bfdc7a5eb7b3cb570cbf871eed5e867ea1
-DIST pin-project-1.0.12.crate 56972 BLAKE2B 1f6b106cd55b9692bb1d671bfd51011d9f89cfe8bbbe030c64e7ea57b6efb0765838b03812708a7aa38c197d3b43328a9d88fdf93abb51f4d1a3061301b74414 SHA512 434ce0a0e16441c7aa6f12dc98584a0e7986e9491eb08d5143e3f64e1f73dfa4db9d0fb2098f16e5a36f3653201aff735437d2d1d366c11160c09534c75fbfe7
-DIST pin-project-internal-1.0.12.crate 27956 BLAKE2B ac5cf33b5981e32ecf802a9de1576f696006ffc035b33173b1606a1d12c7b12c53a217f5723e8ebd622a121345f440b200ab3972410a2f161a5ed83fa8769ed6 SHA512 f3f4839c5fa7e3232a323283ad9636cd03e1bab79b439cc2d2ea954d60a3dfd417aa4680b7a34a3baa48d7e02266cf16e56b719a905f04157c708c90c02e45a9
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
-DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST plotters-0.3.4.crate 143219 BLAKE2B 3121caf7d2a62d3dd337d887ea2343981d23b26ab742fa192456d58a73ebd07d384ad6e1de58671b5c06344c2efea8e32168d830051d425a63299d15746f3a73 SHA512 04d490ad1b822195259a661dbc605ec2f8e190a5bbbbf549741b286aa888b26a2c7468d226cee7718bd69b77e026283944367504db98c0293b3db4ce45103534
 DIST plotters-backend-0.3.4.crate 13416 BLAKE2B 2b7090fb98ab9c28fd8525e1b3b4ca3410dafdb80563f52b545af70db638899123455254861e95973fb9c9e178e83cccd941c7305977de033091ed957291c28d SHA512 4784da70eda90a48aab38192619cfa7df733519cadc3b9aecd339dc735a9237e03144eee4f22f5f03ca214a732e8807d179d455032dd255a8125092ea489228b
 DIST plotters-svg-0.3.3.crate 6916 BLAKE2B 74c2c71afefe1148c82f8695ca3ae5283bad5b084e542325f3b6d587eac23f9fc087b64033043ff52ebcd661d40bb91c33ccd0de3c424ac0916baaa3a69c63b6 SHA512 1233eece4ab91ec690f93c7134ae8e6405183aaf500b2dce6973b6e212058334b7335aa80915e40363b9d2057398028c57d0b3aa974b88bb42c4e0e4726e7a92
-DIST png-0.17.7.crate 80979 BLAKE2B 37628fa2282c7195f983a95939eda1c73745f89d772904173775d7e1906b71615e45de8f59489d6842450ed6f7c7b809b28881c84d5a3399da38013fc3062c79 SHA512 f8009925a6948d8b9c82007f31eefd18d2173274816c0329673e48ef725aec52ca3aab2b91e8fc4f776c8f7f17475a3e065835e578a632445e1bd70794b18270
+DIST pmutil-0.5.3.crate 11031 BLAKE2B 258bce55df929d0e62c13edd71076e2ca5e2a73c6f18a8550f96c0c772c3133109b9eadd2411a9b1bc308969893ecf9798636234eac907c9e8f396ace2461622 SHA512 eceacc281e61b6444b0bcdc27cd2a980dd723f638a612bdb9969124f48177ddbbcf0e8ba8029b298597d8b6de0b7fe9b173cd2bc408003955e21a8997f980bdf
 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST predicates-2.1.5.crate 24165 BLAKE2B a0eb1aa0f26d51140155b8b5e7141a253e298ac2197e59c7023ecc693d68cba01d645792c57467741ee074891438fba2f1439c79a4cef27f3d02eaec8f1d0b10 SHA512 d4b555d7f57ccec5788a957d4a3e130f5549a9333a47654baaef098bb284c64bd5c662677ba7e659b4563b3d0146914f1235e0caa2274af8787d9777141f4dd4
@@ -235,7 +204,6 @@ DIST proc-macro-crate-1.3.0.crate 9672 BLAKE2B 9c814e7d2e5a76408722951e636bc7d9e
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
-DIST pulldown-cmark-0.9.2.crate 115824 BLAKE2B cc8b8cac890b333a864ecb1444128b1aa187392b296c54ccb0c3048d79d17aa7f53bd0ac31f0c6492544ea78636deefaf3ad44804a1c79008e17b27fe1e61fad SHA512 2268a3284da5def75b906373a3c70927bc68ecde7b641231d96ff9437785732134568abaf0b6f81c582dc56498da4e677a7b2e2f1914cd42b345db0a06d75c60
 DIST quick-junit-0.3.2.crate 11044 BLAKE2B 55726b5aa60212f3664fc867c40f0b4715312b87e046617cfbfe90da03ea74c31e9e54bd55f529e12bf509170a46a47038f61cc8154eb774c8bdfeab7dc7c07d SHA512 80354281bb02c0be1a82bffed35744ff63b30ee86b5ca48bb93101c6a265601774b2c84175ecb22d7b18e660828ba315324505590276387e4caec6983f687083
 DIST quick-xml-0.26.0.crate 116260 BLAKE2B 791eacda72e95b7a16009e6ffe0d4ca6a9ad64ac6be5e3a44f793b16d3bd752b5c58795af559617f55c9f516cb439ec2127f255ff9c99f98825cd646cf66835b SHA512 357bf6a70fd822accdaa1a9d86402234da1725c7e9392c64b9dfe92f1f26f39a5b1302462b7ba14bd39a54f7c8e6baa65bbe30aa147e240f8e82997b97a2ce56
 DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
@@ -251,10 +219,11 @@ DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST reqwest-0.11.14.crate 145216 BLAKE2B e7ae6b489acc2b8a8eff2f6d34db7817ac811998bc6c6c565f93b99746b3e03e823ae55c8867cf39844c4e6ec412c9248bcca9725bdeae91928d37f670177cd6 SHA512 b853212d8495e98295e861b900e73ce80be1135ec9904b57dd75de2102fc465c3e3dee93c70c07dc46ac67b56affbc0f88a7b65c706521564a7c1ac5f6e62115
+DIST result-like-0.4.6.crate 4311 BLAKE2B 612ad606f331449907b9c0c99b525aedd53b46b5143b21472eb34d38ac64026498712de7c774183c358531b8296952eb39067c0bc5da07fee5483c28d78de37b SHA512 81b202903a90058a993315253099748c69b9caa42e62121f3fdd63b7d4f22878c81133d0b09f28f3366f180615241cfadf3e055ac86fb9662b9c982e5cc06a91
+DIST result-like-derive-0.4.6.crate 5814 BLAKE2B 2598173bb8920e6b8143e034a77eeab17dea379f947098c35054c928db567513da4043d0830a8dbc40d3660e1257b90b18309f36cd83ac03e018921ae48343da SHA512 1097cfd81fe99472c0c308df7ba64ebd20497b0f855b66839c2a81ce8a179a305d04e7eb4d17be9d1dcc3e90f5fec7d59cf6d3093924354a6e02aa4ac2bfcbb5
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
-DIST ruff-0.0.247.gh.tar.gz 1039897 BLAKE2B 410a85aac15a9f05576e98fbae544d9d5a129f0c865720696a2337b2f7a4f3dec539fd0c008d9971170dc10e0c25904275656ff2475d52a0d2740710d4065ae2 SHA512 865f5c31fe5239ef6e534a93f5b963fb7c249017e8912080c4247c95f3e3583062db647d8e96a83704426fc0f5e634370fc6813f61c53c027a9c85e9692d80f4
 DIST ruff-0.0.252.gh.tar.gz 1067753 BLAKE2B 5656c83ea0351609a37c0f14faa66aa8240a42d06bd0129d7bbdb637247c71bcdc72d12142eb4ff54403491a35be3af92f96508d509c0ccfde29a599a1307cf2 SHA512 0eba88d85fde6cd56602376eb5ba9410c73ecc536eb8c6ae6c41cb673a2804e0bc210789d519c4caaab653a7ac41a6ff31469373236229be162636e23fbdfdce
+DIST ruff-0.0.253.gh.tar.gz 1083613 BLAKE2B 54c82a3e4938698ad1eb29020b2402d60318ea99e3de4eaffb5001f8da1bec95f5a6d6de2ebcf7f09fdeb7c0eb19001b09fb5de56a2c14bd936c32220e915591 SHA512 af51c387c166dc97a26d51b8e716e16f07e610a9408177e3577a76deb549fe5d9c62c49280a76bf4b9337f4468d8f5f7999fb73b6efa87c0008184570763fc8d
 DIST rust-stemmers-1.2.0.crate 2351301 BLAKE2B d633c0d7091fd05e55a521670104831bed89deef7a2fb7c1eed3528246e65b67a97888fed48b134b10c477e7b95c034e8bbad70500c779b1ff7b0c334de0b37b SHA512 b9453a0984d41e5a692e5ea1a8a7bc6142de30f7b345a269489b8d4ebe3b3d442e7fe5f338c72a790521dea7a2ad9605c0ca8218a6b76d8bc5e19ae02cf711d7
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustix-0.36.8.crate 290808 BLAKE2B 62da252100523d282d6d8d2bf141f6e59f0dafcebb0a1025b6bddb78c2a100643d63edcaea4cf64ce68696219ef52706f6b49f6a7b22f99c544866643952f98b SHA512 6fd6ca326feac93145ddbf6eba65c8eff731c9a9e7ff3a6724c19e5c8bbb05236f526df27c4c916e855e7e75e65914470af2d9c98e1571692991a7bd811b5bb0
@@ -265,7 +234,6 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST schemars-0.8.11.crate 54624 BLAKE2B e3b7bf6641fba17fcf9c026cbdf01f139536c9fea9b0acd3dcb35fe56c9ad32ce931881120f4b0f83b2311e58dd4abb5e129f9e8387e1ba4c702e84e023d0726 SHA512 2725389cebc8fe25367a8b94832ad5f9e70f6aa718ab771a074bf302fca5ef96e5c8c12f4a52f9571f0e399ad3c7cb485017c254b129b20809a3c2f48f7a6e2a
 DIST schemars_derive-0.8.11.crate 18314 BLAKE2B 6be02d4152ae0fca5385fcbec7e04f560927f8638c11dee424cb4920d8330c3274c5e3388b3388506282d801c27078df95a343d0fbd3f48ff91f4bf072d9eb29 SHA512 90443c9922394989a50e3ee798c2a762b514b85ff17559b843e909ba45611f5bb57f3bf84d92769a27a36cf24289fa69eae871f0234acdb79e86b745d877f52d
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
-DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scratch-1.0.3.crate 8198 BLAKE2B 804af80d09da85a88221c7aed7740a25a327bece99eeda0d7adceb3e5111917b70fb4a4e4e39c83b041d57baad2e3582e877356d58386e05ccd65e0a5334f86d SHA512 8fb3c0d36adbcd915e3adad108e35665ddd6e5622b252833349f89448a620bac6eaf1c212ffc172ec015e5af46e5637901c3442083b17ed29a2bdd9c0c48d595
 DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
@@ -277,31 +245,24 @@ DIST serde_derive_internals-0.26.0.crate 25382 BLAKE2B 7829d9f7efe64b057efea96d6
 DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
 DIST serde_spanned-0.6.1.crate 7828 BLAKE2B 78d39bca0850b78f0835167ca7786c0bf356d668389aaaf3ace946e91d9a7db8dcba895e833d87e88502b2ba969cac9aad6c1a053c5ecb37f845ebb3b0bb5b32 SHA512 6271aa2af243021002a10cdbd16cb081bf10ab53a61cace104182eb4f28e0c0d7c447b7dcedb350ce78debf5ed6ce6502cb823ae9177d98c5288310094eb22d9
 DIST serde_test-1.0.152.crate 19915 BLAKE2B abb5ff736f020bef10eb746d052592661fc1a1b6d817bb5983a07fd107cc1ba675245469afa83a83629e496b2d23972d1ee8d0a047a5d80166acd8c5ae012083 SHA512 4f9d2a5e88c27efd22ab4d8716f6f28ac34826f8d1534cc5a65a36367b0dd4818ddec567ff90f58ecdd24082c506894de40f22163e6a4618cc747885d5915f59
-DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
-DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
-DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
 DIST shellexpand-3.0.0.crate 22856 BLAKE2B e5f278592576f41fbc035d0da9377f07758f29078d41dc8a9cfd5c1f731000fea8f6fea4e9c2d58883d57e7957aa0aea919bc8a21f27851270adcf5a6270a0d5 SHA512 19a921bc34dc251b63b71fa0edfe9508a6dc96f7fd68ad1efb8b3931ebb61709c0ec925e7ee3c20e74d001a4d1f7cd290d325a7af8044c92e097e00edaa5d479
-DIST simd-adler32-0.3.4.crate 12076 BLAKE2B 79da162561157ffc09de0309c05612b84ca6bea8ccd0acae7f6460e20c3db831bc3f71c2a3f7aca11740f084888f204ca4cd065621a99b355633ef69ceb3e780 SHA512 1411201116b4dbad5f7bdc64a3d669bd733a966061a29ec86e8565b282195a28cbf7ae4a69a766798f94acf8c208b0392ec7f62f71e75dcc98738b95cca157af
 DIST similar-2.2.1.crate 51147 BLAKE2B c86005ff69a14980db2cb90b13ed908448a711f09d1ee20a109d1dab2cc5bd839274f3803082721f1d81003c9011efdadcd190f4cb46eb09b26e338107546f45 SHA512 9a353bfbe495bab83e401314bb97c6605fa6283af06e03bad50bc429388c7abf44bb9cc68db781ef2b786840eb444907f35b70b17343b2cb993800536b4e36a2
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
-DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
-DIST socket2-0.4.7.crate 44619 BLAKE2B 9bf2560812db2c91498d12274e02d17c279efe5817d882faabc465de71b1cb8045f6eab3c8e6031f6fd18e0e77913f42daab07f01e8d83bfa5ea44cc6966466f SHA512 44487f2de30cd327cad1af31ad36aaaa0bf10c33b5c23b024ada8d7e41d064fb2adbc9edb14aa8aa1eba679d8530c373c7187fc68d9709ae736a5c1a2cf37088
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
-DIST spin-0.9.5.crate 33732 BLAKE2B ffe9f983fd8cd3b6b5f446509bf8bdc051febd3195c200841ce999cedd5399e0bf654a8e6569de107bd34400e7a98e9598882e0ef5a7524ae99f76e555fbefb7 SHA512 59b239c509a176640eeeb12524232a11516fb58bb3802aade56087959ae25ab085ccb0647956e2baa70541c74d653c68f6ad7457ddba2bb1d089bcc7ba17281b
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST string_cache-0.8.4.crate 16380 BLAKE2B 235973fff64a66175b563bc512137bba98f84bc00fdffa771a9925950903f3ee91a9f1025786aa68b796a55782e4d5bb26756e1134db96dc6f4cf69974c18774 SHA512 dff6d359226fd2c4ea5934a3d5ea73324d548ec235cd9aac8c233f2d9e67ba9b045ee598a34063839eb5b906d344a70fe3be65abcbe106cb9ff79cbc40b833e3
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strum-0.24.1.crate 5636 BLAKE2B 81959b4ed8b78313bcd370eca0de10dd86b63c27eeacab66afb6e0c620bf1a13b66ee4a06ff90ce09b46dfd29d8ce32218414900a077ddcdbd8debfb05de243c SHA512 d842464b762790f4b785e494f72f7bae47b5a068cd06ddaad7a491d1abff53fa9cde280b06bbbb6b39a3a8f350a2384080ec4b3e4f16226cb076b1df153e6197
 DIST strum_macros-0.24.3.crate 20696 BLAKE2B fa86022cd1f701d8755fbf3e6356a38d46f4f168a1abd19d1d8fa63cbecf41746165791955c8cf1fba86cadf85ddb427ffd17bb360567187b55dfb9a899503c1 SHA512 8276343808afe71d68d7984d5a223a4fc630df0adb5a547cbcc6912fbffcf7e4ad38f115888a2dd3a8443d6fa7b9c7726318d4f5d1ab43f463dd97ec20df9134
 DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
-DIST syntect-5.0.0.crate 809452 BLAKE2B d76194d2234c77decac13d1bd2036862231718ce0ee050469fbbff094a11bc8f4ae2669077f6433d59a113d058c449f6e4d091cf520a985a9ef92dcab058f136 SHA512 b444424ad5f2ff9897707d6c2d0a39cf4e48a8d9a838286fc9f7bd9db6f1b4228bd2a5c985f5f88c014e75a7ee94bffdfee1cca45bd68e6db52e624e71923dc9
+DIST syn-1.0.108.crate 237607 BLAKE2B c9943d7d286faae9f9916f330b59f9473411296d56d8d7598827bddc3556d3e16cd189e752da726ce9853c4e21bbe4561cb3e15e46af41a3189cfbb5b0dd5df4 SHA512 db3f5f732b231e8cb7e50ae2cfa469507429c3400e6e80a7e402e23dde6a942c0fe383c046e83c166849b85caeec1ac2f903fab2e88a7c64a4a85fa92d0e271e
+DIST syn-ext-0.4.0.crate 10535 BLAKE2B 9cefd4ca290704a809182b4b391b918fd46c546a3e0ac5828391d85e63384402fdc72d450307101ce18e3ab96d6ca347d8e41f6e1395f34b7cfe333ac63b6bb4 SHA512 f285166f4315334461cd9c2d9e386309730fa0ed38934b0f9c16684cb46e9f241d97ee31e36c3989974d6bab3d94bc4cda85c8be0d2ae71b0afc4a5352c945d3
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
-DIST terminal_size-0.2.3.crate 9361 BLAKE2B 38862ed4d98442f755a841b3eb44b397645c6e2ad25793dc96b089df3549c07ff353e18515b83686b34f002e7a557404502f847ceb6f5f673b96830286553d44 SHA512 f390c5e8ce53e0387db7c30619a107e484fa80ba4e046fb797b6006966be446d5aee5bd2179734b0684e206762fe7b19e8fe00d75853069a4bc7b9ae14f74c23
 DIST terminfo-0.7.5.crate 46243 BLAKE2B 6e953dd5009747a8e7cb421deb1b100b9a4c90a793a828a7831365406234c44d6ae40c0a30c41e6966c66d4511c7620a0b86a29dbed0133a1793ae57a05a7510 SHA512 2a763411edacf5ec55ae6193a31386647402d4fdb39fa58c9e2bc5a28eb3f14fce316ed5ab3481f6a36c35fdd7ca468449f0cc22fb75262a2db6cda47a75f398
 DIST termtree-0.4.0.crate 4449 BLAKE2B 28f19620d7fb190c6eadf9bf6c313d1cfc1d6e1395fa2f235e7c54e44a73bd0633bdb2c7eb24ef2e763aee4eb3f10c943028a349be30b0c85d4178d7811a9ad8 SHA512 d1b5fca80dd15f506804e565816417ce03cd37e7b0f5bb5b2e21b5baaa66dee0196a3dd820eb392620403d28b018ca15404219399b5a975d80614979d710f2d0
 DIST test-case-2.2.2.crate 7593 BLAKE2B d45f9918c5cad0ce7d1e371456383e6dceef8a859b3fa094c9c41e40dffb388371d4806e8ce9b03c3c85f0c371415181aa85a5c3c42ee780f13670724cefb70a SHA512 505a417877f5e94e79ae14cce7ad003e1d10873d25fe71296110b6ad971a8f604cb5bea69109f0ddf641f7ca7ffb40203bb491b29d3d5e656c66f46dff470f41
@@ -310,8 +271,6 @@ DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e3
 DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
 DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba
 DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31
-DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
-DIST tiff-0.8.1.crate 1417977 BLAKE2B 4beeb5c46cb598311cfbe486d54a99d99ee2bef5aeb040796c30663dc724e9ba2df82530004e933d82564bc8b1ae89af60799725d8df2647003b9618f5537943 SHA512 8a71882990b07d77ba81a4aef6c8614659ba3a37de845123fe4f4c3c5840a1d2929b4d79133b32e641cd23a856251bec46cdf6eb5e0be72a568761fc4f8ea77d
 DIST tikv-jemalloc-sys-0.5.3+5.3.0-patched.crate 884399 BLAKE2B 4596f5392e32970ed8e0c37b5111da2d160b6140a84c2188a38cb2445160496574b457556195e88ea254f2f98ed89f4da1367a20747d843741c633c5c18c91f5 SHA512 bd57fb8e7d4f050246b37262115edf8cecf798f2aa2ab23794673091f1b566c65227f815819b0a72ff526b8dadbecf28d91240d3668077535b3a2b4f1b14eed4
 DIST tikv-jemallocator-0.5.0.crate 9382 BLAKE2B e241742cb04b07164c08b4bd3a044dc7c473a2119e96a492c8b3eec04adfc3f728ece98c95e1e944af3fedec75da72b03f5aab56c8e7e97d54e0f8e5df6ab88f SHA512 13773bf6d5468e16ffac2bb8824f968ecc5240d89ce63c18cf454c54d9b2e20f25eab84786029fb333f70833f5c99a01eb17182615b5e2dd1e54ee97899abf55
 DIST time-0.1.45.crate 28911 BLAKE2B d43e2431752881f6885d572017f461b304d07ee5ef0d8b4898e62b47c8154268839c3bf69b141159090cfc0d90bd0113d6084fe99ea1f2b1e20668528ce21112 SHA512 e643fb8649f3efdaa1b0b6abc6a140d55ac550a55cad99d0cce9415dc51e155fb1ea240953eeaba5dc47ec73c49ab7f2962af79c693436289de0eb3ff60985ee
@@ -320,18 +279,11 @@ DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST titlecase-2.2.1.crate 7840 BLAKE2B 65738ca6d7b7c29e139190282c54d32f06f8794c5d6b702adbd85b9902e18856ded426675aca34ea81e11186e1fcb13b2fd2287c56c64dbe6fa9d80364bec210 SHA512 c421bb39fdb10d0eb2b81274413ebc46975bdee14fae94fa22dc9db608862080c8b1e62af64d89c1dd3809e1fae083d700f1d984edb268e4c4a6054dac070b93
-DIST tokio-1.25.0.crate 626886 BLAKE2B 8b6465d8af495c04000dd593927c841a75a9d98082cce771f4b546460c42092f33b85be745839aeb68b91fc58c3d39f3b34c6376c68f95034e25639e45f09041 SHA512 ff53b5688a6b275ac02b0797eb3967e7ec6764f13373717e4b25623b4ddd8ca964fb2e30827bfe85de20a5d7a19b0408a6a5565d9199cedb6e00fa83c21b7f6c
-DIST tokio-util-0.7.7.crate 100405 BLAKE2B 97b701985cce390acf3fcfdf4bb761901e8e64ba29fa285a822b97668b4f9a56e13dde3085f7b63025ff58f9ed3726c29a0f8dc412100fa76d7ac5ba75ff24b6 SHA512 d33edfc594dff40a7f76ce84a740eb8901eaa95aa6cb6e2308aaf23b4543dae2ce7f7c8df5f027292777b65aa8b00618ef45dddb34b53b1981ccf1650c01609e
 DIST toml-0.6.0.crate 47246 BLAKE2B 8074f8bc4399e30d31b67eda9b8e7afd2139c35edd1990bce856ab9942e9b76041aa448fc372b58ea78396b549a962b53ec8b9a36c43fd7422728d7673f8b055 SHA512 660a4e838ca7377ce44abaa2a180a2205cb5aaaef468a779fd0715587bf459b9ebcda3623b0d2323154546dbed6ee8af42374fdf2a30d3e3d52fa74b0f59b89b
 DIST toml_datetime-0.5.1.crate 10593 BLAKE2B aa714d7e5bb93f656774d403488cd8fe177e39b960aa66092736c12e8a730b6dd2579f1a0cf6ed12213571645a959f45834f7e5bf5ae6ea6cb4fc4181edc499e SHA512 9d50b6b1d120c6a5bc8029510ed4c5c3d787a4c8d55d989e449f5cfe8092b2c8ea7ef61217360acbc9880430621bf1fbd413d8b1d9f2337a6a13f23f23c00b06
 DIST toml_edit-0.18.1.crate 102542 BLAKE2B 6b1a3a5955f8f22b4b01e4696e0f90c8ba0fb8d6cba27915d16db0236e7f026fef87816a8fedd15bfa6841002e2a0ff5fc25bae9caf2b464d4dafad28402f2bf SHA512 0a6d5bba0679c302e101e2dc88361b21f89de9e73e18356e0abc30ad7728bf7815ad61d36de1db932850d4211d8b2db83f2e4ee292f19c84d38353c368f34f8c
-DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
 DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
-DIST tracing-attributes-0.1.23.crate 30450 BLAKE2B fa21c4074eefbc1110268cfc79291c909503428b26560cf68cf04640a6387d04c29e22b8f86fd48cc1b8c0fd4bb67fca428c9f8009b3c99879352b9d9f68c5ea SHA512 55e92b4e0410805f8cf9eb8ee50cabcf08d1f6c6b4b38c5a51c70f59d06c82096af1f3b9b7dd4267945cf631fa8d99f78ae9b3d0760f9c7ed4d6da6e5e6ff3cb
 DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65
-DIST tracing-log-0.1.3.crate 20549 BLAKE2B 1e2b5f1d96983b0dcf3e61f71132536e21dc19af0d532dcff7cc91db45e60cbdc1f8b5b7a7b2c13214dda4e3becd4f3d62262def1b608a99fa330ccf1d716323 SHA512 440cb8ddd5823cd0d86b68bbbf29f6886d5800f95d0aaa9477f98f188013fd009c2b9bc982b17efd08abd071bc70ca511f988b9db8c21d8e3d323fb67614d289
-DIST tracing-subscriber-0.3.16.crate 193572 BLAKE2B 55e582a5989b68ba9fd44defda52a8ec6e85322cb6d629b35c20e75b0852252f97bd21ea5d7587a1712b02e795e534948549e867277caef28592d0e6a50e9aed SHA512 e7e2c00c027cf36e3e97a6779a2ce97bc8b094eed608e940fa0b994188103632c75e565c76944d5f6ddfa2fc6e3b44049c10d35d9e3f3a639eb5249d675e4c45
-DIST try-lock-0.2.4.crate 4467 BLAKE2B 7afbe36d02ccf31351c7c7ca4415578383bb4d0fbf89ba2c5c7835dbf410326fb0f6cb302baf7c1edccc4b193a2ab8079545fd67f26a74457d116204f3c6e745 SHA512 fbd989589eb0a1fb226de65537d51eceab632603e69710b37708d6109ed09c07333189675d5e560e35cc836e5cd211c726d8ce247186b5ea4529328d46c22632
 DIST twox-hash-1.6.3.crate 21842 BLAKE2B 67c261b2b0a93293717a4e2e07dc11df2abde09da6fe713b9d04917ace73de1b59b8d4fd9449ab46cb7cf496fad1e440effdfa1fae6f5cae4ca78af8cd019c42 SHA512 f7ce63e6e5ca79ce9330caf40b32578a5d2088c5d8ed371604268760d6e212d447d9e3a95378378a283024155bccdaea47597902c488a94c5d5f79770baec8fc
 DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2
 DIST ucd-trie-0.1.5.crate 45391 BLAKE2B 1b5bbeb63ee88f4481168f12e94004a4074c0269ea4a58a406da147834c25c23efff4273bd1945b181950d2119c6d83fb32acf42c658346e85a272bab4dd687b SHA512 67272b54b6f404eaf32d83697b0d4e22205ec8f24df40a0feb005a218ff6f74b001c4cdb1c471582b1f3ae53eee71ff89b3d0b9e06a9133cf3e6c21e144ebec6
@@ -342,7 +294,6 @@ DIST unic-emoji-char-0.9.0.crate 5667 BLAKE2B 987766a63dc54847543798f805ca823165
 DIST unic-ucd-category-0.9.0.crate 25480 BLAKE2B 0d7f16ebeb847893ed9b5a9ecbde0c5eae8845cb769ac8162e1cfa4adbdc7f3884e7fe731b0ee1389619d842f5c97fd59df4aa6d9c4d77218d7670c51bc05ea9 SHA512 24ca8b05b5d7d445076b95f0e994d4dc3f47757fcc73f8ece5812359cec3bd510dcddfc47657b7e90b51c0ba3f37d16d3b4417c11a1c6e0f167ca683fd71f6bf
 DIST unic-ucd-ident-0.9.0.crate 16128 BLAKE2B f06da48584ac6fbf254c104404918839b519890a7d17a8916c3f9fb611457a721ea5799912251f9686ee1644f17ed9c82d72dd9b0046b636ce4ad1e681ad290d SHA512 9e485ae18723b1af7310388e8a91d26e2aebc5398643e076444aa4d3b6a1c557557c358405d5327a77192e0a03c68e0f6032a262baed16659884e0adb39df7e5
 DIST unic-ucd-version-0.9.0.crate 2246 BLAKE2B c546ee182387db997e6cd699a25bc201fc943306d8e87f96edc1a3dc1cd5ab8ad96f34e8275721a5604765aa6fb6f81e3d8d9eae690d04e5ba71325a769b065b SHA512 153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b
-DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.10.crate 43530 BLAKE2B 2bd5ffea133793ed7588ea95b0848adea16e79fc3ce9a159c33c73929a1af90e0578c44980fe114aeec1d6424d294552bcbf4089e3c196c2ed3d0751d992c216 SHA512 70f81dcf3fb3ada1eb503cfda548e083cae6e7001dc445c0a481b8f467025f17dc26ac14e487edcdc2aba8b67f94a35eb4b5083a62d5b954dafca7b734edd3e3
 DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
 DIST unicode-linebreak-0.1.4.crate 74962 BLAKE2B 2b6b1f262da1100a06552ae24588a6a1f6d34cd9cf398ff182da48116644807cdfbd703770659d70a375102f9526c77ea3e7fc80e7fe5405ccf93bd8153af518 SHA512 4c4a1cb4d8d9563740a6a5bc8ea5db8bab88b1cfbd751fdf33dbdb3923478a4bb716e3ce7441aca0d84426894834959cbc845f3cc2bc1379c5935019dc3f703d
@@ -354,12 +305,10 @@ DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa028
 DIST ureq-2.6.2.crate 105924 BLAKE2B b055cf00473a6d67d181fe6ffc9d960ee9c1ef4bc346f30466e9d8c129b82abc908344fe61957e6840b1d1cf302df12c94b0c74b49daf0e978173e36899f3c4f SHA512 712922b21d321932b6e4d8602903d92fac93549200cd10d66052f404e7734a5aab2ebfe78e14cc443df3320530454a6585aa8005fc39471cb1aa95e54dcb951c
 DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
 DIST uuid-1.3.0.crate 53736 BLAKE2B 1618c1f43db7673019d804b7419390a4acb62fd234dfe2a36d22cbc33f526f3a7e213e3c98160fb35a713f15e146b0ef89eac9e4e397532073c01229026cce12 SHA512 0914998dc2d516c215b1309a2527af557cecfbbd57f793d416d7ce6520b75dac60951d7e0951d10f251e8bb66733615e502c946acdaa503aba2fc0e3d4a874da
-DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST volatile-0.3.0.crate 3095 BLAKE2B 8da56000c363fcea9c4e82a3daadea9b8a5d985a51a55653ceb813d5cc45dadfb496af9468f425df8f74821bdb5e8e40605f60aaaec3fc3f5a1e86d58279ea79 SHA512 8d97bba2bdc3462321cec5428dccab65f78e73d63b9fb45327430830f7523f5a082a8e1f21c5a5b9f93b2b5aab83e46cddc8e387eb82e665ed985cdbc484df0a
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
-DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d
@@ -373,14 +322,12 @@ DIST wasm-bindgen-test-macro-0.3.34.crate 6331 BLAKE2B 25a03d8419dbfedbee5e89f2a
 DIST web-sys-0.3.61.crate 706333 BLAKE2B f57cb14032e2ea01b5e0ffcef0988ee3e8227c1da7d27ef8799583f64cddb4bcfbbb145f5ea1889006fc9ff61d42b1c02d4b278d67371c9d914827113f5e4128 SHA512 dd8c93a92295a9cd94a4a4cac4a81d9fa41c2c0bc885c1861eae5cc317a0d55e1a9d34b97b91999bf617a071f7f8acc39bb0d4a684b40543519f0cad6b82a25c
 DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
 DIST webpki-roots-0.22.6.crate 242386 BLAKE2B b7c4ca7b372effa1cab48d890e468a272e0bfb7109900c4077906d088e85448c058a6be420eca24ed42bc9c0a0f1922c08c5ae6b0cfd85aa71662a5f7157791a SHA512 00413a8354e2277f50c29851ed49a97f76bacb2017d61b10333981d15bcee13eceef8711e87d2aef1ed4f8a85763c6b1e7e21d61a57e7f689fe4aa6e67f4c140
-DIST weezl-0.1.7.crate 42166 BLAKE2B a3a2a48dbb444b2bd910e1470507209f3d0acc75d88e22bcb42b5ca7ab8edbc41fc9e49cb6a2e18cf5e470d7bd26f4e4d9e30ea01c3eb543f171289a86927fdf SHA512 3fd8cb01dde494371df57001c97be90418b642ba88b0945cd98f973a4498743b83d383bcdfc8884db1da75271aeef4ce3b418e425f23690f12a5cc645c418e90
 DIST which-4.4.0.crate 10889 BLAKE2B 3118f923319f260d6574ee0fd28d641f858a1885c3082090f079ca64acd2a3dd996aafd84803f0f2ae2e58b87d5cadf63059d75e72ff836dbf3ebcf4cee82602 SHA512 8380e5ea79f7768c8b1479c2fbb6e6c8b232f3a8d43b6554b78a370f302fb396d53842678d760ce9fc720fe607cfb9da3e0da4180e4a6ecfef48119105555fd7
 DIST widestring-0.5.1.crate 41338 BLAKE2B 4d202d15df38056a004ebdc721bbe5d0fd6ab28f957dff269f0b90ab3dd08d7521dd94d00b1b21c5cba438592462989e9d360f4b566faf075fbb091982dd344c SHA512 ef39fc053cd98c070e502d0c53acf27965a06583805fb6d8b1228f76063ed343382500917ae33231470c5af3d2223070d36f394758bd6faf4e298cb981cbe3bb
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-0.43.0.crate 11492640 BLAKE2B 793aa1a7f5ba07b864ee318d529f0003a979c3c5b588860cc317dd6abb499db73ae7ba98e2c18765f7539ffa3eb2af80fdd10d12238b5e0cfa1fbcf535a0ea9e SHA512 810a1a08ea65dad929ebacef8a2c2f13837f09680d97d1e9db7349b00b54a06ebc5fa1c7e9bb5ecf4a2d0cda54d4acd6b89e3eaeb9e7e1ac888ce105cfbcc139
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
 DIST windows-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a
@@ -391,7 +338,5 @@ DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360
 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0acbc744ced2952f120b4abfa0c42f6513089e34deaff1a453f3a26f9fb78442f016baa9524ccac9b21e4a7ed6ad6 SHA512 ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
-DIST zune-inflate-0.2.50.crate 37058 BLAKE2B 6e6686708ce4f83dc753cf93af7304e177568fe77dbef5b1feec6b38731da7ff077a2b1e02c24e270e013066c240c2a936b8a25a5a0a79f9f242831c1b46a810 SHA512 02fa9bbc4a30e145f034581212333788a24ad9756b1d2efef3a8b6967389fcb4258fe5c71936eb16b75238965021ae796525a754a94ff96d2d45f4e0509f74c0
diff --git a/dev-util/ruff/ruff-0.0.247.ebuild b/dev-util/ruff/ruff-0.0.247.ebuild
deleted file mode 100644
index 32fbe3478955..000000000000
--- a/dev-util/ruff/ruff-0.0.247.ebuild
+++ /dev/null
@@ -1,486 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	ahash-0.7.6
-	aho-corasick-0.7.20
-	alloc-no-stdlib-2.0.4
-	alloc-stdlib-0.2.2
-	android_system_properties-0.1.5
-	anes-0.1.6
-	annotate-snippets-0.6.1
-	annotate-snippets-0.9.1
-	ansi_term-0.12.1
-	anyhow-1.0.69
-	ascii-1.1.0
-	ascii-canvas-3.0.0
-	assert_cmd-2.0.8
-	async-compression-0.3.15
-	atty-0.2.14
-	autocfg-1.1.0
-	base64-0.13.1
-	base64-0.20.0
-	base64-0.21.0
-	bincode-1.3.3
-	bisection-0.1.0
-	bit-set-0.5.3
-	bit-vec-0.6.3
-	bit_field-0.10.1
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	brotli-3.3.4
-	brotli-decompressor-2.3.4
-	bstr-0.2.17
-	bstr-1.2.0
-	bumpalo-3.12.0
-	bytemuck-1.13.0
-	byteorder-1.4.3
-	bytes-1.4.0
-	cachedir-0.3.0
-	cast-0.3.0
-	cc-1.0.79
-	cfg-if-1.0.0
-	chic-1.2.2
-	chrono-0.4.23
-	ciborium-0.2.0
-	ciborium-io-0.2.0
-	ciborium-ll-0.2.0
-	clap-3.2.23
-	clap-4.1.6
-	clap_complete-4.1.1
-	clap_complete_command-0.4.0
-	clap_complete_fig-4.1.0
-	clap_derive-4.1.0
-	clap_lex-0.2.4
-	clap_lex-0.3.1
-	clearscreen-2.0.0
-	codespan-reporting-0.11.1
-	color_quant-1.1.0
-	colored-2.0.0
-	configparser-3.0.2
-	console-0.15.5
-	console_error_panic_hook-0.1.7
-	console_log-0.2.0
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	criterion-0.4.0
-	criterion-plot-0.5.0
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.13
-	crossbeam-utils-0.8.14
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	cxx-1.0.90
-	cxx-build-1.0.90
-	cxxbridge-flags-1.0.90
-	cxxbridge-macro-1.0.90
-	diff-0.1.13
-	difflib-0.4.0
-	digest-0.10.6
-	dirs-4.0.0
-	dirs-next-2.0.0
-	dirs-sys-0.3.7
-	dirs-sys-next-0.1.2
-	doc-comment-0.3.3
-	drop_bomb-0.1.5
-	dyn-clone-1.0.10
-	either-1.8.1
-	ena-0.14.0
-	encode_unicode-0.3.6
-	encoding_rs-0.8.32
-	env_proxy-0.4.1
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	exr-1.5.3
-	fancy-regex-0.7.1
-	fastrand-1.9.0
-	fern-0.6.1
-	filetime-0.2.20
-	fixedbitset-0.4.2
-	flate2-1.0.25
-	flume-0.10.14
-	fnv-1.0.7
-	form_urlencoded-1.1.0
-	fsevent-sys-4.1.0
-	futures-channel-0.3.26
-	futures-core-0.3.26
-	futures-io-0.3.26
-	futures-sink-0.3.26
-	futures-task-0.3.26
-	futures-util-0.3.26
-	generic-array-0.14.6
-	gethostname-0.4.1
-	getrandom-0.2.8
-	gif-0.11.4
-	glob-0.3.1
-	globset-0.4.10
-	h2-0.3.15
-	half-1.8.2
-	half-2.2.1
-	hashbrown-0.12.3
-	heck-0.4.1
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hermit-abi-0.3.1
-	hexf-parse-0.2.1
-	http-0.2.8
-	http-body-0.4.5
-	httparse-1.8.0
-	httpdate-1.0.2
-	hyper-0.14.24
-	iana-time-zone-0.1.53
-	iana-time-zone-haiku-0.1.1
-	idna-0.3.0
-	ignore-0.4.20
-	image-0.24.5
-	imperative-1.0.4
-	indexmap-1.9.2
-	inotify-0.9.6
-	inotify-sys-0.1.5
-	insta-1.26.0
-	instant-0.1.12
-	io-lifetimes-1.0.5
-	ipnet-2.7.1
-	is-terminal-0.4.3
-	is_executable-1.0.1
-	itertools-0.10.5
-	itoa-1.0.5
-	joinery-2.1.0
-	jpeg-decoder-0.3.0
-	js-sys-0.3.61
-	kqueue-1.0.7
-	kqueue-sys-1.0.3
-	lalrpop-0.19.8
-	lalrpop-util-0.19.8
-	lazy_static-1.4.0
-	lebe-0.5.2
-	lexical-parse-float-0.8.5
-	lexical-parse-integer-0.8.6
-	lexical-util-0.8.5
-	libc-0.2.139
-	libmimalloc-sys-0.1.30
-	link-cplusplus-1.0.8
-	linked-hash-map-0.5.6
-	linux-raw-sys-0.1.4
-	lock_api-0.4.9
-	log-0.4.17
-	lz4_flex-0.9.5
-	matchers-0.1.0
-	matches-0.1.10
-	mdcat-1.0.0
-	memchr-2.5.0
-	memoffset-0.7.1
-	mimalloc-0.1.34
-	mime-0.3.16
-	miniz_oxide-0.6.2
-	mio-0.8.5
-	nanorand-0.7.0
-	natord-1.0.9
-	new_debug_unreachable-1.0.4
-	nextest-workspace-hack-0.1.0
-	nix-0.26.2
-	nohash-hasher-0.2.0
-	nom-5.1.2
-	nom8-0.2.0
-	notify-5.1.0
-	nu-ansi-term-0.46.0
-	num-bigint-0.4.3
-	num-complex-0.4.3
-	num-integer-0.1.45
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	num_enum-0.5.9
-	num_enum_derive-0.5.9
-	once_cell-1.17.0
-	oorandom-11.1.3
-	os_str_bytes-6.4.1
-	overload-0.1.1
-	parking_lot-0.12.1
-	parking_lot_core-0.9.7
-	paste-1.0.11
-	path-absolutize-3.0.14
-	path-dedot-3.0.18
-	peg-0.8.1
-	peg-macros-0.8.1
-	peg-runtime-0.8.1
-	percent-encoding-2.2.0
-	pest-2.5.5
-	pest_derive-2.5.5
-	pest_generator-2.5.5
-	pest_meta-2.5.5
-	petgraph-0.6.3
-	phf-0.11.1
-	phf_codegen-0.11.1
-	phf_generator-0.11.1
-	phf_shared-0.10.0
-	phf_shared-0.11.1
-	pico-args-0.4.2
-	pin-project-1.0.12
-	pin-project-internal-1.0.12
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	plotters-0.3.4
-	plotters-backend-0.3.4
-	plotters-svg-0.3.3
-	png-0.17.7
-	ppv-lite86-0.2.17
-	precomputed-hash-0.1.1
-	predicates-2.1.5
-	predicates-core-1.0.5
-	predicates-tree-1.0.7
-	proc-macro-crate-1.3.0
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.51
-	pulldown-cmark-0.9.2
-	quick-junit-0.3.2
-	quick-xml-0.26.0
-	quote-1.0.23
-	radium-0.7.0
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rayon-1.6.1
-	rayon-core-1.10.2
-	redox_syscall-0.2.16
-	redox_users-0.4.3
-	regex-1.7.1
-	regex-automata-0.1.10
-	regex-syntax-0.6.28
-	remove_dir_all-0.5.3
-	reqwest-0.11.14
-	ring-0.16.20
-	rust-stemmers-1.2.0
-	rustc-hash-1.1.0
-	rustix-0.36.8
-	rustls-0.20.8
-	rustversion-1.0.11
-	ryu-1.0.12
-	same-file-1.0.6
-	schemars-0.8.11
-	schemars_derive-0.8.11
-	scoped-tls-1.0.1
-	scoped_threadpool-0.1.9
-	scopeguard-1.1.0
-	scratch-1.0.3
-	sct-0.7.0
-	semver-1.0.16
-	serde-1.0.152
-	serde-wasm-bindgen-0.4.5
-	serde_derive-1.0.152
-	serde_derive_internals-0.26.0
-	serde_json-1.0.93
-	serde_spanned-0.6.1
-	serde_test-1.0.152
-	serde_urlencoded-0.7.1
-	sha2-0.10.6
-	sharded-slab-0.1.4
-	shell-words-1.1.0
-	shellexpand-3.0.0
-	simd-adler32-0.3.4
-	similar-2.2.1
-	siphasher-0.3.10
-	slab-0.4.7
-	smallvec-1.10.0
-	smawk-0.3.1
-	socket2-0.4.7
-	spin-0.5.2
-	spin-0.9.5
-	static_assertions-1.1.0
-	string_cache-0.8.4
-	strsim-0.10.0
-	strum-0.24.1
-	strum_macros-0.24.3
-	syn-1.0.107
-	syntect-5.0.0
-	tempfile-3.3.0
-	term-0.7.0
-	termcolor-1.2.0
-	terminal_size-0.2.3
-	terminfo-0.7.5
-	termtree-0.4.0
-	test-case-2.2.2
-	test-case-macros-2.2.2
-	textwrap-0.16.0
-	thiserror-1.0.38
-	thiserror-impl-1.0.38
-	thread_local-1.1.7
-	threadpool-1.8.1
-	tiff-0.8.1
-	tikv-jemalloc-sys-0.5.3+5.3.0-patched
-	tikv-jemallocator-0.5.0
-	time-0.1.45
-	tiny-keccak-2.0.2
-	tinytemplate-1.2.1
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.1
-	titlecase-2.2.1
-	tokio-1.25.0
-	tokio-util-0.7.7
-	toml-0.6.0
-	toml_datetime-0.5.1
-	toml_edit-0.18.1
-	tower-service-0.3.2
-	tracing-0.1.37
-	tracing-attributes-0.1.23
-	tracing-core-0.1.30
-	tracing-log-0.1.3
-	tracing-subscriber-0.3.16
-	try-lock-0.2.4
-	twox-hash-1.6.3
-	typenum-1.16.0
-	ucd-trie-0.1.5
-	unic-char-property-0.9.0
-	unic-char-range-0.9.0
-	unic-common-0.9.0
-	unic-emoji-char-0.9.0
-	unic-ucd-category-0.9.0
-	unic-ucd-ident-0.9.0
-	unic-ucd-version-0.9.0
-	unicase-2.6.0
-	unicode-bidi-0.3.10
-	unicode-ident-1.0.6
-	unicode-linebreak-0.1.4
-	unicode-normalization-0.1.22
-	unicode-width-0.1.10
-	unicode-xid-0.2.4
-	unicode_names2-0.5.1
-	untrusted-0.7.1
-	ureq-2.6.2
-	url-2.3.1
-	uuid-1.3.0
-	valuable-0.1.0
-	version_check-0.9.4
-	volatile-0.3.0
-	wait-timeout-0.2.0
-	walkdir-2.3.2
-	want-0.3.0
-	wasi-0.10.0+wasi-snapshot-preview1
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-futures-0.4.34
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	wasm-bindgen-test-0.3.34
-	wasm-bindgen-test-macro-0.3.34
-	web-sys-0.3.61
-	webpki-0.22.0
-	webpki-roots-0.22.6
-	weezl-0.1.7
-	which-4.4.0
-	widestring-0.5.1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-0.43.0
-	windows-sys-0.42.0
-	windows-sys-0.45.0
-	windows-targets-0.42.1
-	windows_aarch64_gnullvm-0.42.1
-	windows_aarch64_msvc-0.42.1
-	windows_i686_gnu-0.42.1
-	windows_i686_msvc-0.42.1
-	windows_x86_64_gnu-0.42.1
-	windows_x86_64_gnullvm-0.42.1
-	windows_x86_64_msvc-0.42.1
-	winreg-0.10.1
-	yaml-rust-0.4.5
-	yansi-term-0.1.2
-	zune-inflate-0.2.50
-"
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=maturin
-
-LIBCST_COMMIT="f2f0b7a487a8725d161fe8b3ed73a6758b21e177"
-RUSTPYTHON_COMMIT="61b48f108982d865524f86624a9d5bc2ae3bccef"
-declare -A GIT_CRATES=(
-	[libcst]="https://github.com/charliermarsh/LibCST;${LIBCST_COMMIT};LibCST-%commit%/native/libcst"
-	[libcst_derive]="https://github.com/charliermarsh/LibCST;${LIBCST_COMMIT};LibCST-%commit%/native/libcst_derive"
-	[rustpython-ast]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/compiler/ast"
-	[rustpython-common]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/common"
-	[rustpython-compiler-core]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/compiler/core"
-	[rustpython-parser]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/compiler/parser"
-)
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="An extremely fast Python linter, written in Rust"
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/charliermarsh/ruff"
-
-SRC_URI="
-	$(cargo_crate_uris)
-	https://github.com/charliermarsh/ruff/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-util/patchelf
-"
-
-# rust does not use *FLAGS from make.conf, silence portage warning
-# update with proper path to binaries this crate installs, omit leading /
-QA_FLAGS_IGNORED="usr/bin/ruff usr/lib*/libruff.so"
-
-# haven't been able to figure out how to get tests working yet
-RESTRICT=test
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-)
-
-src_prepare() {
-	sed -r 's:(strip[[:space:]]*=[[:space:]]*)true:\1false:' \
-		-i pyproject.toml || die
-
-	eapply_user
-}
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	cargo_src_compile
-
-	python_copy_sources
-	distutils-r1_src_configure
-	distutils-r1_src_compile
-
-	if [[ -f target/release/libruff.so ]]; then
-		patchelf --set-soname libruff.so target/release/libruff.so || die
-	fi
-}
-
-src_test() {
-	cargo_src_test
-	distutils-r1_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	dobin target/release/ruff
-	dolib.so target/release/libruff.so
-	dodoc "${DOCS[@]}"
-}
diff --git a/dev-util/ruff/ruff-0.0.253.ebuild b/dev-util/ruff/ruff-0.0.253.ebuild
new file mode 100644
index 000000000000..396d528ee8d1
--- /dev/null
+++ b/dev-util/ruff/ruff-0.0.253.ebuild
@@ -0,0 +1,417 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	Inflector-0.11.4
+	adler-1.0.2
+	ahash-0.7.6
+	aho-corasick-0.7.20
+	android_system_properties-0.1.5
+	anes-0.1.6
+	annotate-snippets-0.6.1
+	annotate-snippets-0.9.1
+	anyhow-1.0.69
+	ascii-1.1.0
+	ascii-canvas-3.0.0
+	assert_cmd-2.0.8
+	atty-0.2.14
+	autocfg-1.1.0
+	base64-0.13.1
+	bincode-1.3.3
+	bisection-0.1.0
+	bit-set-0.5.3
+	bit-vec-0.6.3
+	bitflags-1.3.2
+	block-buffer-0.10.3
+	bstr-0.2.17
+	bstr-1.3.0
+	bumpalo-3.12.0
+	cachedir-0.3.0
+	cast-0.3.0
+	cc-1.0.79
+	cfg-if-1.0.0
+	chic-1.2.2
+	chrono-0.4.23
+	ciborium-0.2.0
+	ciborium-io-0.2.0
+	ciborium-ll-0.2.0
+	clap-3.2.23
+	clap-4.1.6
+	clap_complete-4.1.2
+	clap_complete_command-0.4.0
+	clap_complete_fig-4.1.1
+	clap_derive-4.1.0
+	clap_lex-0.2.4
+	clap_lex-0.3.1
+	clearscreen-2.0.0
+	codespan-reporting-0.11.1
+	colored-2.0.0
+	configparser-3.0.2
+	console-0.15.5
+	console_error_panic_hook-0.1.7
+	console_log-0.2.0
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.5
+	crc32fast-1.3.2
+	criterion-0.4.0
+	criterion-plot-0.5.0
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.13
+	crossbeam-utils-0.8.14
+	crunchy-0.2.2
+	crypto-common-0.1.6
+	cxx-1.0.91
+	cxx-build-1.0.91
+	cxxbridge-flags-1.0.91
+	cxxbridge-macro-1.0.91
+	derivative-2.2.0
+	diff-0.1.13
+	difflib-0.4.0
+	digest-0.10.6
+	dirs-4.0.0
+	dirs-next-2.0.0
+	dirs-sys-0.3.7
+	dirs-sys-next-0.1.2
+	doc-comment-0.3.3
+	drop_bomb-0.1.5
+	dyn-clone-1.0.10
+	either-1.8.1
+	ena-0.14.0
+	encode_unicode-0.3.6
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fastrand-1.9.0
+	fern-0.6.1
+	filetime-0.2.20
+	fixedbitset-0.4.2
+	flate2-1.0.25
+	fnv-1.0.7
+	form_urlencoded-1.1.0
+	fsevent-sys-4.1.0
+	generic-array-0.14.6
+	getrandom-0.2.8
+	glob-0.3.1
+	globset-0.4.10
+	half-1.8.2
+	hashbrown-0.12.3
+	heck-0.4.1
+	hermit-abi-0.1.19
+	hermit-abi-0.2.6
+	hermit-abi-0.3.1
+	hexf-parse-0.2.1
+	iana-time-zone-0.1.53
+	iana-time-zone-haiku-0.1.1
+	idna-0.3.0
+	ignore-0.4.20
+	imperative-1.0.4
+	indexmap-1.9.2
+	inotify-0.9.6
+	inotify-sys-0.1.5
+	insta-1.28.0
+	instant-0.1.12
+	io-lifetimes-1.0.5
+	is-macro-0.2.2
+	is-terminal-0.4.4
+	itertools-0.10.5
+	itoa-1.0.5
+	joinery-2.1.0
+	js-sys-0.3.61
+	kqueue-1.0.7
+	kqueue-sys-1.0.3
+	lalrpop-0.19.8
+	lalrpop-util-0.19.8
+	lazy_static-1.4.0
+	lexical-parse-float-0.8.5
+	lexical-parse-integer-0.8.6
+	lexical-util-0.8.5
+	libc-0.2.139
+	libmimalloc-sys-0.1.30
+	link-cplusplus-1.0.8
+	linked-hash-map-0.5.6
+	linux-raw-sys-0.1.4
+	lock_api-0.4.9
+	log-0.4.17
+	lz4_flex-0.9.5
+	matches-0.1.10
+	memchr-2.5.0
+	memoffset-0.7.1
+	mimalloc-0.1.34
+	miniz_oxide-0.6.2
+	mio-0.8.6
+	natord-1.0.9
+	new_debug_unreachable-1.0.4
+	nextest-workspace-hack-0.1.0
+	nix-0.26.2
+	nohash-hasher-0.2.0
+	nom-5.1.2
+	nom8-0.2.0
+	notify-5.1.0
+	num-bigint-0.4.3
+	num-complex-0.4.3
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.15.0
+	num_enum-0.5.10
+	num_enum_derive-0.5.10
+	once_cell-1.17.1
+	oorandom-11.1.3
+	os_str_bytes-6.4.1
+	parking_lot-0.12.1
+	parking_lot_core-0.9.7
+	paste-1.0.11
+	path-absolutize-3.0.14
+	path-dedot-3.0.18
+	peg-0.8.1
+	peg-macros-0.8.1
+	peg-runtime-0.8.1
+	percent-encoding-2.2.0
+	pest-2.5.5
+	pest_derive-2.5.5
+	pest_generator-2.5.5
+	pest_meta-2.5.5
+	petgraph-0.6.3
+	phf-0.11.1
+	phf_codegen-0.11.1
+	phf_generator-0.11.1
+	phf_shared-0.10.0
+	phf_shared-0.11.1
+	pico-args-0.4.2
+	pin-project-lite-0.2.9
+	plotters-0.3.4
+	plotters-backend-0.3.4
+	plotters-svg-0.3.3
+	pmutil-0.5.3
+	ppv-lite86-0.2.17
+	precomputed-hash-0.1.1
+	predicates-2.1.5
+	predicates-core-1.0.5
+	predicates-tree-1.0.7
+	proc-macro-crate-1.3.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.51
+	quick-junit-0.3.2
+	quick-xml-0.26.0
+	quote-1.0.23
+	radium-0.7.0
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	rayon-1.6.1
+	rayon-core-1.10.2
+	redox_syscall-0.2.16
+	redox_users-0.4.3
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.28
+	remove_dir_all-0.5.3
+	result-like-0.4.6
+	result-like-derive-0.4.6
+	ring-0.16.20
+	rust-stemmers-1.2.0
+	rustc-hash-1.1.0
+	rustix-0.36.8
+	rustls-0.20.8
+	rustversion-1.0.11
+	ryu-1.0.12
+	same-file-1.0.6
+	schemars-0.8.11
+	schemars_derive-0.8.11
+	scoped-tls-1.0.1
+	scopeguard-1.1.0
+	scratch-1.0.3
+	sct-0.7.0
+	semver-1.0.16
+	serde-1.0.152
+	serde-wasm-bindgen-0.4.5
+	serde_derive-1.0.152
+	serde_derive_internals-0.26.0
+	serde_json-1.0.93
+	serde_spanned-0.6.1
+	serde_test-1.0.152
+	sha2-0.10.6
+	shellexpand-3.0.0
+	similar-2.2.1
+	siphasher-0.3.10
+	smallvec-1.10.0
+	smawk-0.3.1
+	spin-0.5.2
+	static_assertions-1.1.0
+	string_cache-0.8.4
+	strsim-0.10.0
+	strum-0.24.1
+	strum_macros-0.24.3
+	syn-1.0.108
+	syn-ext-0.4.0
+	tempfile-3.3.0
+	term-0.7.0
+	termcolor-1.2.0
+	terminfo-0.7.5
+	termtree-0.4.0
+	test-case-2.2.2
+	test-case-macros-2.2.2
+	textwrap-0.16.0
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	thread_local-1.1.7
+	tikv-jemalloc-sys-0.5.3+5.3.0-patched
+	tikv-jemallocator-0.5.0
+	time-0.1.45
+	tiny-keccak-2.0.2
+	tinytemplate-1.2.1
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.1
+	titlecase-2.2.1
+	toml-0.6.0
+	toml_datetime-0.5.1
+	toml_edit-0.18.1
+	tracing-0.1.37
+	tracing-core-0.1.30
+	twox-hash-1.6.3
+	typenum-1.16.0
+	ucd-trie-0.1.5
+	unic-char-property-0.9.0
+	unic-char-range-0.9.0
+	unic-common-0.9.0
+	unic-emoji-char-0.9.0
+	unic-ucd-category-0.9.0
+	unic-ucd-ident-0.9.0
+	unic-ucd-version-0.9.0
+	unicode-bidi-0.3.10
+	unicode-ident-1.0.6
+	unicode-linebreak-0.1.4
+	unicode-normalization-0.1.22
+	unicode-width-0.1.10
+	unicode-xid-0.2.4
+	unicode_names2-0.5.1
+	untrusted-0.7.1
+	ureq-2.6.2
+	url-2.3.1
+	uuid-1.3.0
+	version_check-0.9.4
+	volatile-0.3.0
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.84
+	wasm-bindgen-backend-0.2.84
+	wasm-bindgen-futures-0.4.34
+	wasm-bindgen-macro-0.2.84
+	wasm-bindgen-macro-support-0.2.84
+	wasm-bindgen-shared-0.2.84
+	wasm-bindgen-test-0.3.34
+	wasm-bindgen-test-macro-0.3.34
+	web-sys-0.3.61
+	webpki-0.22.0
+	webpki-roots-0.22.6
+	which-4.4.0
+	widestring-0.5.1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.42.0
+	windows-sys-0.45.0
+	windows-targets-0.42.1
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	yaml-rust-0.4.5
+	yansi-term-0.1.2
+"
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=maturin
+
+LIBCST_COMMIT="80e4c1399f95e5beb532fdd1e209ad2dbb470438"
+RUSTPYTHON_COMMIT="c4b67896662b16b5699a779c0e52aa0ca2587fec"
+declare -A GIT_CRATES=(
+	[libcst]="https://github.com/charliermarsh/LibCST;${LIBCST_COMMIT};LibCST-%commit%/native/libcst"
+	[libcst_derive]="https://github.com/charliermarsh/LibCST;${LIBCST_COMMIT};LibCST-%commit%/native/libcst_derive"
+	[rustpython-ast]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/compiler/ast"
+	[rustpython-common]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/common"
+	[rustpython-compiler-core]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/compiler/core"
+	[rustpython-parser]="https://github.com/RustPython/RustPython;${RUSTPYTHON_COMMIT};RustPython-%commit%/compiler/parser"
+)
+
+inherit distutils-r1 cargo
+
+DESCRIPTION="An extremely fast Python linter, written in Rust"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/charliermarsh/ruff"
+
+SRC_URI="
+	$(cargo_crate_uris)
+	https://github.com/charliermarsh/ruff/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-util/patchelf
+"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/ruff usr/lib.*/libruff.so"
+
+# haven't been able to figure out how to get tests working yet
+RESTRICT=test
+
+DOCS=(
+	BREAKING_CHANGES.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+)
+
+src_prepare() {
+	sed -r 's:(strip[[:space:]]*=[[:space:]]*)true:\1false:' \
+		-i pyproject.toml || die
+
+	eapply_user
+}
+
+src_configure() {
+	export RUSTFLAGS="${RUSTFLAGS}"
+	cargo_src_configure
+}
+
+src_compile() {
+	cargo_src_compile
+
+	python_copy_sources
+	distutils-r1_src_configure
+	distutils-r1_src_compile
+
+	patchelf --set-soname libruff.so target/$(usex 'debug' 'debug' 'release')/libruff.so || die
+}
+
+src_test() {
+	cargo_src_test
+	distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	local releasedir=target/$(usex 'debug' 'debug' 'release')
+
+	dobin ${releasedir}/ruff
+	dolib.so ${releasedir}/libruff.so
+
+	dodoc "${DOCS[@]}"
+}
diff --git a/dev-util/src-cli/Manifest b/dev-util/src-cli/Manifest
index 3f4e193674ed..c32b27019c1b 100644
--- a/dev-util/src-cli/Manifest
+++ b/dev-util/src-cli/Manifest
@@ -1,6 +1,6 @@
-DIST src-cli-4.0.0-deps.tar.xz 100901464 BLAKE2B 8de8300007e46d56831b3d297ea2a875777090419a10067adbaccf7a8257324a91ec8179b2375fe6ce5353993c9cca7f52f949582da65ffd4d7abef6ca10d1ec SHA512 cf40dfc3a6096b75bae70600b07cca4ade717e041dba9bca696df1631b081cb1b9f79a7a9ea9e58da6629268d21ebbe6ef150762dfbd7b9fa5c8264b054b20cb
-DIST src-cli-4.0.0.tar.gz 238721 BLAKE2B d02ee7a8967b7e2774d6a7f5771f805b48df892a7c8144f386405cc9d9d18ba1766d47698607740585ae16400051d1e9b10176811e4f16f60c2bd57a5e7c7a11 SHA512 2780bbdf43c321fb3c28af73ab7e50f4f2ea2122fe065f45aa82a9adbe9effb15af66041f4bb5191cbcf7570bd0cdb69ae429d3a460f6d2807ef4e262ed6218f
 DIST src-cli-4.3.0-deps.tar.xz 141941984 BLAKE2B 59c0beb3e458eacec4451ec19e9b4fadef1dc160e58f04637e6c565b99e5f76ae3ea55ef9fdde0b9be3528f2c0bf0c52b750f0c5814f46b23ddef13467010a67 SHA512 f9a9cb7fe183a01a72fca10a0837171b1cba7b95cc659bd0e83c77183183206da71ecc1b2096dc6e7965e9109dbbf9df569cbfb8b545b0376215a71206f577a0
 DIST src-cli-4.3.0.tar.gz 258039 BLAKE2B 31abf15af1861693babf0be7ae5ba86715d46328e637b2b43411e1f16f611f364e1da66523e8bc1eff07fc6ede4ec1b8b2a85422e77f23da618038d102493f5f SHA512 cc4a072dac402b1ddaadce595ca96d05c24596ee4999f52edc85dd7662c1f95ca3390a7ad4e30b983343b58e52b349404736c76cb1e94b073779587c4d544a8b
 DIST src-cli-4.4.0-deps.tar.xz 141948812 BLAKE2B df5323e899d509a7f3da8c05718643701519cbdf4ccaf9f370e7aaf3da2d171acdd630cc8a078e15432c2c8c155ec1e48428e47a1c55d45bcaedec3b92329fed SHA512 4549b591d3c5d9976fe5b70010030b5cadf20853b99b595b6a602c2052736ace841d262019d3d54961e7940b590027145de55e590c0395b6e4711127525601c0
 DIST src-cli-4.4.0.tar.gz 258505 BLAKE2B c5f152e8843928f4cc10d8bcc11ebaf4e1e78d2b69b74b98612c74a93d12fab5daaebb9f3a949e31169f2a234a6e229b988b055020e966c8aa1f27e12a37cef4 SHA512 9dd4e5a681d5f4d846f24b0c0dd27ca8d15998486545a5a332f4fcfe2fdc443c1cdd9a74259c2397b914f5e19f10aa325dae7f7c428ca69871e6f1790a2d8421
+DIST src-cli-4.5.0-deps.tar.xz 153966948 BLAKE2B 2479d99e7a7dae09e1eeaf5a7202047dac271feecd6903b6f3cf72ebe790eb837a057fb6424e066c3729afe4f94d604ff8b08ca8fe62039453e10a742a46ea2a SHA512 c882db26c9504e11bbda565f527918ec4280ff8e0120a87b604c756223fffe3634723d8a7e1845d8f73fa49a581bb60df84d15e1344d06bd8c61fa19bb35e0a7
+DIST src-cli-4.5.0.tar.gz 267190 BLAKE2B 8fe1e93f3a4d1515801b8b0e85b7054c4bcc97fbe59b7e844c5424d91bb611068238cc372e960437be20d0154fadbba56a2f99733e05939780b8f90a61c7639f SHA512 1767397549f343c1a33add05de787d8823ad12ee74096b424d7e584dca32e966a724a28c237ff8718c4ed4a14b91a0b8cd769170db1e22c4bc62e8e88a3f24bb
diff --git a/dev-util/src-cli/src-cli-4.0.0.ebuild b/dev-util/src-cli/src-cli-4.0.0.ebuild
deleted file mode 100644
index f513f28c6c25..000000000000
--- a/dev-util/src-cli/src-cli-4.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="command line interface for the Sourcegraph code search tool"
-HOMEPAGE="https://sourcegraph.com https://docs.sourcegraph.com/cli"
-SRC_URI="https://github.com/sourcegraph/src-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	ego build ./cmd/src
-}
-
-src_install() {
-	dobin src
-	dodoc AUTH_PROXY.md CHANGELOG.md
-}
diff --git a/dev-util/src-cli/src-cli-4.3.0.ebuild b/dev-util/src-cli/src-cli-4.3.0.ebuild
index 96cf6ad246e2..2195b750f9c3 100644
--- a/dev-util/src-cli/src-cli-4.3.0.ebuild
+++ b/dev-util/src-cli/src-cli-4.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	ego build ./cmd/src
diff --git a/dev-util/src-cli/src-cli-4.4.0.ebuild b/dev-util/src-cli/src-cli-4.4.0.ebuild
index 96cf6ad246e2..2195b750f9c3 100644
--- a/dev-util/src-cli/src-cli-4.4.0.ebuild
+++ b/dev-util/src-cli/src-cli-4.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	ego build ./cmd/src
diff --git a/dev-util/src-cli/src-cli-4.5.0.ebuild b/dev-util/src-cli/src-cli-4.5.0.ebuild
new file mode 100644
index 000000000000..2195b750f9c3
--- /dev/null
+++ b/dev-util/src-cli/src-cli-4.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="command line interface for the Sourcegraph code search tool"
+HOMEPAGE="https://sourcegraph.com https://docs.sourcegraph.com/cli"
+SRC_URI="https://github.com/sourcegraph/src-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+src_compile() {
+	ego build ./cmd/src
+}
+
+src_install() {
+	dobin src
+	dodoc AUTH_PROXY.md CHANGELOG.md
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 354ed8147e66..4ce7d382a6e2 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,3 +3,4 @@ DIST strace-5.18.tar.xz 2307412 BLAKE2B 658d17d2137344550ea3c2ece54708387c3b7802
 DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2ae7b1cc728241baa1c7d2d5d4d9410622763eb1247b415cad9afdd9f61552d2545388cadf5a33b568ed09af2 SHA512 1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963
 DIST strace-6.0.tar.xz 2367144 BLAKE2B ab9cb1f81b01068de5af5125ec2901b57a2f2b24fc01f4f68a284d74eb9fc0f4d583510a353554327845e7c157ea71ca4042ce3c27b3d2b0469d65a13aabfab1 SHA512 2f5aa18949b9f64769eee4e7720e41bf4a61e3b552acad693ff7baed2e662407a7b5e8bfba94ac49bb71639d21cd54084de902fb4337904f48480b25b8e72b54
 DIST strace-6.1.tar.xz 2351272 BLAKE2B f11bdddcc23d9bbe7196a102165ac40d3f39e0dec8b9c727e226d99ae0b6f22865bd0582d4e9c15fdce87dd405e0e9c68b60041bd2b90bc8480557f82ca6dcb8 SHA512 3f0678d74c5c3e6b30c4dc4ed7ee4cb0829d3b7142dc014fcd887db3a68133bf7fedc623bae381dfe4305bd6cd15d4ca6776c6491009c2a053bb8c6ca1ae8e12
+DIST strace-6.2.tar.xz 2364280 BLAKE2B 8e51cb3e426e9b99d598b4fcece21ba7873e81468cddae04c2f0b1a48dc40643c626acadd226389c33dbef5350b502817d3459d445fc17cce149f7e501c15ae2 SHA512 56708faa3f73c0673c98a5b8b8fe35289ecf2870f4f775bcb7a6be59451ef84685564c0129aca15b576d851f8efa1ff760e27658b914d1f31adf4de3b1ad721f
diff --git a/dev-util/strace/strace-6.2.ebuild b/dev-util/strace/strace-6.2.ebuild
new file mode 100644
index 000000000000..24526a0eb263
--- /dev/null
+++ b/dev-util/strace/strace-6.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		edo ./bootstrap
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	eautoreconf
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+
+	dodoc CREDITS
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 53e40d1ce436..24c8de4ed97d 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/git-2.39.2.ebuild b/dev-vcs/git/git-2.39.2.ebuild
index cfd810890a26..64a55f3350b6 100644
--- a/dev-vcs/git/git-2.39.2.ebuild
+++ b/dev-vcs/git/git-2.39.2.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 fi
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c1e1b6fd9023..769e855abf17 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index abac18ca03f8..a1589b025617 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2022 Gentoo Authors
+# Copyright 2004-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-simple.eclass
@@ -417,6 +417,7 @@ java-pkg-simple_src_compile() {
 	# package
 	local jar_args
 	if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
+		sed '/Created-By: /Id' -i ${classes}/META-INF/MANIFEST.MF
 		jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF"
 	else
 		jar_args="cf ${JAVA_JAR_FILENAME}"
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 80ec269eaf8b..d34ce47706ad 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-utils.eclass
@@ -33,10 +33,10 @@ if [[ ! ${_RUBY_UTILS} ]]; then
 # provide for a better first installation experience.
 
 # All stable RUBY_TARGETS
-RUBY_TARGETS_PREFERENCE="ruby27 "
+RUBY_TARGETS_PREFERENCE="ruby30 ruby27 "
 
 # All other active ruby targets
-RUBY_TARGETS_PREFERENCE+="ruby30 ruby31"
+RUBY_TARGETS_PREFERENCE+="ruby31 ruby32"
 
 
 _ruby_implementation_depend() {
@@ -92,6 +92,10 @@ _ruby_implementation_depend() {
 			rubypn="dev-lang/ruby"
 			rubyslot=":3.1"
 			;;
+		ruby32)
+			rubypn="dev-lang/ruby"
+			rubyslot=":3.2"
+			;;
 		ree18)
 			rubypn="dev-lang/ruby-enterprise"
 			rubyslot=":1.8"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index e99fef7766ef..fe2cb23bd896 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild
index e3d86250f0f4..9b6eb4bfb0f3 100644
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit desktop
+inherit desktop xdg
 
 MY_P="KoboDeluxe-${PV/_/}"
 DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 6eaa54082e00..28eb7626a492 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/bsnes-jg/Manifest b/games-emulation/bsnes-jg/Manifest
index 15755cbefba4..e31fa8485c2e 100644
--- a/games-emulation/bsnes-jg/Manifest
+++ b/games-emulation/bsnes-jg/Manifest
@@ -1 +1 @@
-DIST bsnes-1.1.0.tar.bz2 4181355 BLAKE2B c60181208455f14c722073f7aa43b6b988aa46d8614cc8eae6e6b47acf1c5b30a94aa04410f873531e73637d3f11e25297dccc80b5c15c9fa4d4cc207083cef9 SHA512 39ee7e04dbeb021ac041ca3d189b86cf76f1994561c4bd1fd77a532e87ef4c135b177700b62f6e4f07018953c34f8602b5c4a43cd22d51dcd047df71e77e0412
+DIST bsnes-1.1.1.tar.bz2 4182487 BLAKE2B dfcad14019ae8f6bee6a12f4e35b0cfc5338215d41028655c230faa7a481eb0ef09428192f244471887a3f7326d3fbf9ea713c642aab97989caa391ad41aa4ac SHA512 e1c24d9154ef8285ab2c9d0b03860cb8e7396fffe1f575d25239816e6ec8183ab05ec2adc31c2c4e09c5a3ff8a439909860f704174c132f9ff343dbbf55ca034
diff --git a/games-emulation/bsnes-jg/bsnes-jg-1.1.0.ebuild b/games-emulation/bsnes-jg/bsnes-jg-1.1.0.ebuild
deleted file mode 100644
index 24d855263f55..000000000000
--- a/games-emulation/bsnes-jg/bsnes-jg-1.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_PN=${PN%-*}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Jolly Good Fork of bsnes"
-HOMEPAGE="https://gitlab.com/jgemu/bsnes"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/jgemu/${MY_PN}.git"
-else
-	SRC_URI="https://gitlab.com/jgemu/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="ISC GPL-3+ LGPL-2.1+ MIT ZLIB"
-SLOT="1"
-
-DEPEND="
-	media-libs/jg:1=
-	media-libs/libsamplerate
-"
-RDEPEND="
-	${DEPEND}
-	games-emulation/jgrf
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
diff --git a/games-emulation/bsnes-jg/bsnes-jg-1.1.1.ebuild b/games-emulation/bsnes-jg/bsnes-jg-1.1.1.ebuild
new file mode 100644
index 000000000000..2745d2cfd5e9
--- /dev/null
+++ b/games-emulation/bsnes-jg/bsnes-jg-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=${PN%-*}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Jolly Good Fork of bsnes"
+HOMEPAGE="https://gitlab.com/jgemu/bsnes"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/jgemu/${MY_PN}.git"
+else
+	SRC_URI="https://gitlab.com/jgemu/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="ISC GPL-3+ LGPL-2.1+ MIT ZLIB"
+SLOT="1"
+
+DEPEND="
+	media-libs/jg:1=
+	media-libs/libsamplerate
+"
+RDEPEND="
+	${DEPEND}
+	games-emulation/jgrf
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
diff --git a/games-emulation/bsnes-jg/bsnes-jg-9999.ebuild b/games-emulation/bsnes-jg/bsnes-jg-9999.ebuild
index 24d855263f55..2745d2cfd5e9 100644
--- a/games-emulation/bsnes-jg/bsnes-jg-9999.ebuild
+++ b/games-emulation/bsnes-jg/bsnes-jg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/games-emulation/jgrf/Manifest b/games-emulation/jgrf/Manifest
index 32df49564d4a..c4a622fb2354 100644
--- a/games-emulation/jgrf/Manifest
+++ b/games-emulation/jgrf/Manifest
@@ -1 +1 @@
-DIST jgrf-1.0.0.tar.bz2 297212 BLAKE2B 4e7056f2638fabd8aed7df29edb630e74258600a15cc3de8c120feea8c935036ac051afb56d83b243fa89a7ecddb16297dea3cd1f5c7a6e71589e6f9abb4ca7a SHA512 33103acc6caac40ff23a0977d031b310c11e4390d6cdbb9bdf4f3d67c1702e2d8b86e801cf762ba8ab3779a7388309667d86d3f574fa387a7bdce9525276fa25
+DIST jgrf-1.0.1.tar.bz2 297355 BLAKE2B 5ebc37a6701df0d227fb513d793e16404f982dce211168de24d92b28c9ee239205cfed569a80e8d602088b14b58248c0e48c78b13359056837bdbba544195561 SHA512 c0c9f149b5e06d9ef1b97e4c390ca0f0ff5251c179b770f46e8fe89521a4d9423895b9f3835fb3b41af76292126f58cea6229d55e092503c69ad03964148c7d5
diff --git a/games-emulation/jgrf/jgrf-1.0.0.ebuild b/games-emulation/jgrf/jgrf-1.0.0.ebuild
deleted file mode 100644
index 4c7c4f9abb39..000000000000
--- a/games-emulation/jgrf/jgrf-1.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="The Jolly Good Reference Frontend"
-HOMEPAGE="https://jgemu.gitlab.io/jgrf.html"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/jgemu/${PN}.git"
-else
-	SRC_URI="https://gitlab.com/jgemu/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD CC0-1.0 MIT ZLIB"
-SLOT="1"
-
-DEPEND="
-	dev-libs/miniz
-	dev-libs/openssl:0=[-bindist(-)]
-	media-libs/jg:1=
-	media-libs/libepoxy[egl]
-	media-libs/libsdl2[opengl,sound,video]
-	media-libs/speexdsp
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		PREFIX="${EPREFIX}"/usr \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		USE_EXTERNAL_MD5=1 \
-		USE_EXTERNAL_MINIZ=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		USE_EXTERNAL_MD5=1 \
-		USE_EXTERNAL_MINIZ=1
-}
diff --git a/games-emulation/jgrf/jgrf-1.0.1.ebuild b/games-emulation/jgrf/jgrf-1.0.1.ebuild
new file mode 100644
index 000000000000..b52af23a4df0
--- /dev/null
+++ b/games-emulation/jgrf/jgrf-1.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="The Jolly Good Reference Frontend"
+HOMEPAGE="https://jgemu.gitlab.io/jgrf.html"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/jgemu/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/jgemu/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD CC0-1.0 MIT ZLIB"
+SLOT="1"
+
+DEPEND="
+	dev-libs/miniz
+	dev-libs/openssl:0=[-bindist(-)]
+	media-libs/jg:1=
+	media-libs/libepoxy[egl]
+	media-libs/libsdl2[opengl,sound,video]
+	media-libs/speexdsp
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		PREFIX="${EPREFIX}"/usr \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		USE_EXTERNAL_MD5=1 \
+		USE_EXTERNAL_MINIZ=1
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		USE_EXTERNAL_MD5=1 \
+		USE_EXTERNAL_MINIZ=1
+}
diff --git a/games-emulation/jgrf/jgrf-9999.ebuild b/games-emulation/jgrf/jgrf-9999.ebuild
index 4c7c4f9abb39..b52af23a4df0 100644
--- a/games-emulation/jgrf/jgrf-9999.ebuild
+++ b/games-emulation/jgrf/jgrf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/games-emulation/prosystem-jg/Manifest b/games-emulation/prosystem-jg/Manifest
index bb5f61f21f58..375afa48650d 100644
--- a/games-emulation/prosystem-jg/Manifest
+++ b/games-emulation/prosystem-jg/Manifest
@@ -1 +1 @@
-DIST prosystem-1.5.1.tar.bz2 49454 BLAKE2B 40c392805de577d2275c4810e36b6489a1457920484631bc63a54bef7c6120f5bef114bc52e17b65a43ccfc7c13b84694ea40376845217bae306a19940991a56 SHA512 daa3f40bc490299cdfb93393e95f411be7225dfe5271b2767ca7f5ef422ed053c3255b952de041ef44b7a196cb780b292f37a12104aef299c15ac564b77d281f
+DIST prosystem-1.5.2.tar.bz2 49674 BLAKE2B 700924f3d749a551337289a634c3f36801c9a57ac6a68c1940e65f1a6dfb1a8fef0fcf9b3227509656965bcff9e27112b6e847d11593400f22e0cf3706b12b05 SHA512 9e59d0c8e4edaf081e0ba0574a11fd3d24f12375345cbcba483f5d9a4be376fc5dcab3145e9f4deb117ebcdc69ae8da68643c27adfc9b7a42d79903ef7c15d11
diff --git a/games-emulation/prosystem-jg/prosystem-jg-1.5.1.ebuild b/games-emulation/prosystem-jg/prosystem-jg-1.5.1.ebuild
deleted file mode 100644
index 212b4dd7a4b3..000000000000
--- a/games-emulation/prosystem-jg/prosystem-jg-1.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_PN=${PN%-*}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Jolly Good Fork of ProSystem"
-HOMEPAGE="https://gitlab.com/jgemu/prosystem"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/jgemu/${MY_PN}.git"
-else
-	SRC_URI="https://gitlab.com/jgemu/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD GPL-2+"
-SLOT="1"
-
-DEPEND="
-	media-libs/jg:1=
-"
-RDEPEND="
-	${DEPEND}
-	games-emulation/jgrf
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_compile() {
-	emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}"/usr \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
diff --git a/games-emulation/prosystem-jg/prosystem-jg-1.5.2.ebuild b/games-emulation/prosystem-jg/prosystem-jg-1.5.2.ebuild
new file mode 100644
index 000000000000..2f0bf3126b37
--- /dev/null
+++ b/games-emulation/prosystem-jg/prosystem-jg-1.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=${PN%-*}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Jolly Good Fork of ProSystem"
+HOMEPAGE="https://gitlab.com/jgemu/prosystem"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/jgemu/${MY_PN}.git"
+else
+	SRC_URI="https://gitlab.com/jgemu/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD GPL-2+"
+SLOT="1"
+
+DEPEND="
+	media-libs/jg:1=
+"
+RDEPEND="
+	${DEPEND}
+	games-emulation/jgrf
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
diff --git a/games-emulation/prosystem-jg/prosystem-jg-9999.ebuild b/games-emulation/prosystem-jg/prosystem-jg-9999.ebuild
index 212b4dd7a4b3..2f0bf3126b37 100644
--- a/games-emulation/prosystem-jg/prosystem-jg-9999.ebuild
+++ b/games-emulation/prosystem-jg/prosystem-jg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 51623597a097..0df0ef18e56e 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
deleted file mode 100644
index de8df9b31cbb..000000000000
--- a/games-rpg/adonthell/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST adonthell-src-0.3.8.tar.gz 889244 BLAKE2B 43b685feaa9ae616fea0eaa7687c72455ef916c9eeaf0dd07724fbaae5e33fb36130252c3c493cff34889cbc6146d76cc9ba2a1ec4e4f20b3b16c188c837d51a SHA512 7a047ec4d01d677c616dcc1f8efff2fecc95c1636172fd6709736de79f485711f169057af5797db85243592b5622f25f69e3393469321d7989c054bb41e17cf3
diff --git a/games-rpg/adonthell/adonthell-0.3.8.ebuild b/games-rpg/adonthell/adonthell-0.3.8.ebuild
deleted file mode 100644
index 908c5468e7d9..000000000000
--- a/games-rpg/adonthell/adonthell-0.3.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Roleplaying game engine"
-HOMEPAGE="http://adonthell.nongnu.org/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freetype
-	media-libs/libogg
-	media-libs/libsdl2[X,video,sound]
-	media-libs/libvorbis
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-ttf
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS NEWBIE NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ar.patch
-	"${FILESDIR}"/${P}-python3.10.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--program-transform-name="s:${PN}-$(ver_cut 1-2):${PN}:" \
-		--disable-py-debug \
-		--with-python=${EPYTHON} \
-		$(use_enable nls) \
-		$(use_enable doc)
-}
diff --git a/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch b/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch
deleted file mode 100644
index 2b2e34d62c7d..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r b3fec744fc29 configure.ac
---- a/configure.ac	Sat Oct 17 22:39:45 2020 +0000
-+++ b/configure.ac	Sat Oct 17 22:40:17 2020 +0000
-@@ -26,6 +26,7 @@
- AC_PROG_CXXCPP
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
-+AM_PROG_AR
- 
- dnl ****
- dnl i18n
diff --git a/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch b/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch
deleted file mode 100644
index 21bba839a271..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-node.h was removed in python3.10 but this does not actually use it
---- a/src/python_class.h
-+++ b/src/python_class.h
-@@ -38,3 +38,2 @@
- #include "eval.h"
--#include "node.h"
- #include "fileops.h"
diff --git a/games-rpg/adonthell/metadata.xml b/games-rpg/adonthell/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-rpg/adonthell/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest
deleted file mode 100644
index 790a719f4ca3..000000000000
--- a/games-rpg/wastesedge/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wastesedge-src-0.3.8.tar.gz 20779629 BLAKE2B 40a63298ea9b704407fcac244f22a3e26190fec37cb0dae0e18e55478d866a215a6be6e1bd08ef2d303894aca2edd09e7b299ae9c2da21d999f47c6d799fde83 SHA512 410e01d803b6ff72c4c0d8f035c5e3228c2311bc200359ecb748be63474ae0afb8609cc9daed940670d02190fa3c047ea2a2cd116b7680398cdcc7523a64c386
diff --git a/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch b/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch
deleted file mode 100644
index 33f3eedad1e5..000000000000
--- a/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b3987b74cc6ff89187b95c692a4aacc13db98564 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Wed, 9 Sep 2020 20:01:41 +0300
-Subject: [PATCH] Rework adonthell version handling
-
----
- configure.ac | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 76d87bd..fff8268 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,15 +46,10 @@ fi
- 
- dnl Checking for the proper version
- AC_MSG_CHECKING(for Adonthell's version)
--$adonthell_binary -v &> adonthell.ver
- 
--changequote(<<, >>)
--adonthell_major_ver=`sed 's/\([0-9]*\)\.[0-9]*\.[0-9]*/\1/p; d' adonthell.ver`
--adonthell_minor_ver=`sed 's/[0-9]*\.\([0-9]*\)\.[0-9]*/\1/p; d' adonthell.ver`
--adonthell_micro_ver=`sed 's/[0-9]*\.[0-9]*\.\([0-9]*\)/\1/p; d' adonthell.ver` 
--changequote([, ])
--
--rm -f adonthell.ver
-+adonthell_major_ver=$($adonthell_binary -v | cut -d'.' -f1)
-+adonthell_minor_ver=$($adonthell_binary -v | cut -d'.' -f2)
-+adonthell_micro_ver=$($adonthell_binary -v | cut -d'.' -f3)
- 
- adonthellver="$adonthell_major_ver.$adonthell_minor_ver.$adonthell_micro_ver"
- 
--- 
-2.26.2
-
diff --git a/games-rpg/wastesedge/metadata.xml b/games-rpg/wastesedge/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-rpg/wastesedge/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/wastesedge/wastesedge-0.3.8.ebuild b/games-rpg/wastesedge/wastesedge-0.3.8.ebuild
deleted file mode 100644
index fea05fee7eb2..000000000000
--- a/games-rpg/wastesedge/wastesedge-0.3.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools python-single-r1 xdg
-
-DESCRIPTION="Role playing game to showcase the adonthell engine"
-HOMEPAGE="http://adonthell.nongnu.org/download/"
-SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=games-rpg/adonthell-0.3.8[${PYTHON_SINGLE_USEDEP}]
-	nls? ( virtual/libintl )"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}/${P}_version-handling.patch" )
-DOCS=( AUTHORS ChangeLog NEWS PLAYING README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-adonthell-binary=adonthell
-}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 6db3082b2838..89ca6dbfe9df 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index d31150c7a61a..c666e63329c1 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,2 +1,3 @@
 DIST bedrock-server-1.19.51.01.zip 76976732 BLAKE2B 30ed7a0ba1d2d13b91c5400e17a4facf92a540bf96216dd2fd6cce2d67e5576a8dc73e1c534bb7d0c3afff54cfd3a2715b1c10ecbde3129880003a55fd58fa5e SHA512 b4554cb0fe66bc742d80e2c6143faa6ad10412645207a845a84cbd99550888a0e9e80df764419ff50b24abbdd63d1260c2532c79add2dd4e012604e5bff59173
 DIST bedrock-server-1.19.62.01.zip 77824871 BLAKE2B 9b3d875cf798ba0d68e2a95a78ba24ff4635751c910fadb70949bcb395f4f37fef425328a8268045f1ec52f2bc171df461706d549f0e656c46834564feec4c97 SHA512 8ec08145ff7b7ef646084bcb5bd242c762ff3e9ca6e1aedcf04e04f6e6521fb5b52f2cd3c8906af64c23b62b3ab5a0ef422c17428b91b438249870cb0bf15caf
+DIST bedrock-server-1.19.63.01.zip 77829248 BLAKE2B 3df63ef618242afc27245d0cee1b2216722315f268d0be3e2b4f4ca588463603389ec11d97a4b4272327edbd1e7307fa2f42fe0c21cbf00c4a03c72f187e45e9 SHA512 59e52498b2d6e3d97ae588e1910f9adcc0039319738d3ade7539252129d3a4c22014d44aa48ec0feb92776fd611e9b456f6d09e133b23916e84db5899edd8a00
diff --git a/games-server/bedrock-server/bedrock-server-1.19.63.01.ebuild b/games-server/bedrock-server/bedrock-server-1.19.63.01.ebuild
new file mode 100644
index 000000000000..aa93f6d0bc04
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.19.63.01.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	acct-group/bedrock
+	acct-user/bedrock
+	app-misc/dtach
+	dev-libs/openssl:0/1.1
+	sys-libs/zlib
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+DOCS=(
+	"bedrock_server_how_to.html"
+	"release-notes.txt"
+)
+
+QA_PREBUILT="opt/bedrock-server/bedrock_server"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	exeinto /opt/bedrock-server
+	doexe bedrock_server
+
+	insinto /opt/bedrock-server
+	doins {allowlist,permissions}.json server.properties
+	doins -r {behavior,resource}_packs definitions
+
+	dodir /opt/bin
+	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
+
+	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
+	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
+	systemd_newunit "${FILESDIR}"/bedrock-server.service bedrock-server@.service
+
+	einstalldocs
+}
diff --git a/games-server/bedrock-server/files/bedrock-server.service b/games-server/bedrock-server/files/bedrock-server.service
new file mode 100644
index 000000000000..043f2d9e04b1
--- /dev/null
+++ b/games-server/bedrock-server/files/bedrock-server.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Bedrock Server (World: %I)
+After=network.target
+
+[Service]
+User=bedrock
+Group=bedrock
+WorkingDirectory=-/var/lib/bedrock-server/%I
+PIDFile=/run/bedrock-server.%I.pid
+ExecStartPre=!/bin/mkdir -p /var/lib/bedrock-server/%I
+ExecStartPre=!/bin/cp -n /opt/bedrock-server/allowlist.json /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/cp -n /opt/bedrock-server/permissions.json /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/cp -n /opt/bedrock-server/server.properties /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/behavior_packs /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/definitions /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/resource_packs /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/ln -sf /opt/bedrock-server/structures /var/lib/bedrock-server/%I/
+ExecStartPre=!/bin/chown -R bedrock:bedrock /var/lib/bedrock-server/%I
+ExecStart=/bin/sh -c '/usr/bin/dtach -N $(mktemp -u) /opt/bin/bedrock-server'
+
+[Install]
+WantedBy=multi-user.target
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8fd9c1675a41..4f4d6a1c1747 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index 7efdcd6dc0a4..c933e369a8d8 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-extension-appindicator-46.tar.gz 60986 BLAKE2B 3d058aed56c9ba3c931fe50ca2b5cf48f89b32765afbc5adf6c8004f6c68eee874988801a6358ce574a0d3e7f563c81899632e217b8a00a5e1b4ce62e1f31387 SHA512 0616503a9e5a471bbe64b2f2d9fb853ba1d67e902d9b72b464647f70e8e6392ab9135955c87c99e83d96941cb29505f03cab5ad257ffc5a80e77221d4fcd9730
 DIST gnome-shell-extension-appindicator-47.tar.gz 63339 BLAKE2B c5efc80cdaa1b092ad242ae6535042ad695933383d69769501882b70563e9fa1fa58c44262a1e157f8a501b276fe7b2da91c0636bdaf0a35b836959aa89903b9 SHA512 939c0340586141f0f8d6f7722d9d084bef35d598f19c8ac2fbdba3c8174b91a823248ddd56d6361b16ed8404b53633899206d7434d4e9479544589b22e269933
+DIST gnome-shell-extension-appindicator-48.tar.gz 64682 BLAKE2B daaf9ece32e121352602ccee8e99f901246a2ddf4186a96372fa1f15f422f95e6a1328d40e800daaea069aff955f33de8482c05bc073026313ea33926a3b9e26 SHA512 04010d8bfcbb97b54dfa2e529ae1f3f38ecb8a70383b06dc39a0360767505742bc402cc49c9383d52a063c372820e1f02de15ed000715ff7fe6978bf01e1b0d9
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-48.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-48.ebuild
new file mode 100644
index 000000000000..6d843831ebf9
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-48.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Support legacy, AppIndicators and KStatusNotifierItems in Gnome"
+HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
+SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.34
+"
+BDEPEND="
+	app-misc/jq
+"
+
+src_install() {
+	meson_src_install
+	rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+}
+
+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/nm-applet/nm-applet-1.30.0-r2.ebuild b/gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild
new file mode 100644
index 000000000000..f3f80b5aa233
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="NetworkManager connection editor and applet"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="appindicator modemmanager selinux teamd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=app-crypt/libsecret-0.18
+	>=net-libs/libnma-1.10.4-r2
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libgudev-147:=
+	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
+	appindicator? (
+		dev-libs/libayatana-appindicator
+		>=dev-libs/libdbusmenu-16.04.0
+	)
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.7:= )
+
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dappindicator=$(usex appindicator ayatana no)
+		$(meson_use modemmanager wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		-Dmore_asserts=0
+		-Dld_gc=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 6f0e6466f7fb..ba106c5ae95c 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,3 +1,2 @@
 DIST pch-session-42.0.tar.bz2 3610664 BLAKE2B c14529dd7be8854e4d24b4b4c3335c44ebd714b4dcd8ada8bf6e8da6236d962c57fb537b4a651118e8f719b7da87141a8c1512bf6a360c7998f23384ed06b14c SHA512 63a73a753cc95dc8e152a4d535674d420861e87a57a9c47b1063b9bdad410ad4c93e2ed2a5e547fae75f9e76b0f640ffc8d0f3116195afbaa18e6a2fdb9c5ae7
-DIST pch-session-43.1.tar.bz2 3611030 BLAKE2B ca70c8e80421b21f1ad46811abdf2a66fe8f14011c363b7222164b88068a083b4c19c2ba17fac421f8a2b5cdf2433910a0b968918b7ed81f06e3d886a7a34b76 SHA512 1eb63e6a995a139365ad820b61d01c030929daa6930e07b5f61fd1365dbbb150ad6896dd0ee13627ac47b07bd51e519d0579244f8e95443e729e16b59e62e2c1
 DIST pch-session-43.2.tar.bz2 3610733 BLAKE2B b7439af088ce6483ac6a92a9d0ec434d6709496da5bdabb35ac95f7c71d2544866c2fb8e1675b06b6a9274f523c8b763f2de317d7b89a5a4f14e69404f9d273a SHA512 906d0f628eb4435876672e124c110688dc495cc263ef30b8a62661fe38f345fc3e0e262c2dffbb34c7d3adfacc103d4a0c5311cf43df8a7619efc15f99385092
diff --git a/gnome-extra/pch-session/pch-session-42.0-r1.ebuild b/gnome-extra/pch-session/pch-session-42.0-r1.ebuild
new file mode 100644
index 000000000000..1d7b0626e89b
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-42.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
+HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bluetooth qt5 webp"
+
+RDEPEND="
+	>=gnome-base/gnome-shell-42
+	>=gnome-extra/gnome-shell-extensions-42
+	>=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0
+	>=gnome-extra/gnome-shell-extension-appindicator-42
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-40
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-47
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
+	>=gnome-extra/gnome-shell-extension-gsconnect-50
+	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1
+	>=gnome-extra/gnome-tweaks-40.10
+
+	gnome-extra/gnome-clocks
+	>=media-fonts/fonts-meta-2
+
+	bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 )
+	qt5? ( x11-themes/adwaita-qt )
+	webp? ( gui-libs/gdk-pixbuf-loader-webp )
+"
+BDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	default
+	if ! use bluetooth; then
+		sed -i -e \
+			's:"bluetooth-quick-connect@bjarosze.gmail.com",::g' \
+			usr/share/gnome-shell/modes/pch*.json || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_update
+}
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/pch-session/pch-session-42.0.ebuild b/gnome-extra/pch-session/pch-session-42.0.ebuild
deleted file mode 100644
index 029b1ff13167..000000000000
--- a/gnome-extra/pch-session/pch-session-42.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bluetooth qt5 webp"
-
-RDEPEND="
-	>=gnome-base/gnome-shell-42
-	>=gnome-extra/gnome-shell-extensions-42
-	>=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0
-	>=gnome-extra/gnome-shell-extension-appindicator-42
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-40
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-47
-	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
-	>=gnome-extra/gnome-shell-extension-gsconnect-50
-	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1
-	>=gnome-extra/gnome-tweaks-40.10
-
-	gnome-extra/gnome-clocks
-	gnome-extra/seahorse-nautilus
-	>=media-fonts/fonts-meta-2
-
-	bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 )
-	qt5? ( x11-themes/adwaita-qt )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp )
-"
-BDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	default
-	if ! use bluetooth; then
-		sed -i -e \
-			's:"bluetooth-quick-connect@bjarosze.gmail.com",::g' \
-			usr/share/gnome-shell/modes/pch*.json || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-43.1.ebuild b/gnome-extra/pch-session/pch-session-43.1.ebuild
deleted file mode 100644
index 2e8489c90388..000000000000
--- a/gnome-extra/pch-session/pch-session-43.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="bluetooth qt5 webp"
-
-RDEPEND="
-	>=gnome-base/gnome-shell-43
-	>=gnome-extra/gnome-shell-extensions-43
-	>=gnome-extra/gnome-shell-extension-alphabetical-grid-26.0
-	>=gnome-extra/gnome-shell-extension-appindicator-46
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-43
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323-r1
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-52
-	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-47
-	>=gnome-extra/gnome-shell-extension-gsconnect-54
-	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024
-	>=gnome-extra/gnome-tweaks-40.10
-
-	>=gnome-extra/gnome-clocks-43.0
-	>=gnome-extra/seahorse-nautilus-3.11.92_p20220906
-	>=media-fonts/fonts-meta-2
-	x11-themes/papirus-icon-theme
-
-	bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 )
-	qt5? ( x11-themes/adwaita-qt )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp )
-"
-BDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	default
-	if ! use bluetooth; then
-		sed -i -e \
-			's:"bluetooth-quick-connect@bjarosze.gmail.com",::g' \
-			usr/share/gnome-shell/modes/pch*.json || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-43.2-r1.ebuild b/gnome-extra/pch-session/pch-session-43.2-r1.ebuild
new file mode 100644
index 000000000000..56c86753e8e6
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-43.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
+HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="bluetooth qt5 webp"
+
+RDEPEND="
+	>=gnome-base/gnome-shell-43
+	>=gnome-extra/gnome-shell-extensions-43
+	>=gnome-extra/gnome-shell-extension-alphabetical-grid-26.0
+	>=gnome-extra/gnome-shell-extension-appindicator-46
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-44
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-52
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-47
+	>=gnome-extra/gnome-shell-extension-gsconnect-54
+	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024
+	>=gnome-extra/gnome-tweaks-40.10
+
+	>=gnome-extra/gnome-clocks-43.0
+	>=media-fonts/fonts-meta-2
+	x11-themes/papirus-icon-theme
+
+	bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 )
+	qt5? ( x11-themes/adwaita-qt )
+	webp? ( gui-libs/gdk-pixbuf-loader-webp )
+"
+BDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	default
+	if ! use bluetooth; then
+		sed -i -e \
+			's:"bluetooth-quick-connect@bjarosze.gmail.com",::g' \
+			usr/share/gnome-shell/modes/pch*.json || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_update
+}
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/pch-session/pch-session-43.2.ebuild b/gnome-extra/pch-session/pch-session-43.2.ebuild
deleted file mode 100644
index 6bff50e958ca..000000000000
--- a/gnome-extra/pch-session/pch-session-43.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="bluetooth qt5 webp"
-
-RDEPEND="
-	>=gnome-base/gnome-shell-43
-	>=gnome-extra/gnome-shell-extensions-43
-	>=gnome-extra/gnome-shell-extension-alphabetical-grid-26.0
-	>=gnome-extra/gnome-shell-extension-appindicator-46
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-44
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-52
-	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-47
-	>=gnome-extra/gnome-shell-extension-gsconnect-54
-	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024
-	>=gnome-extra/gnome-tweaks-40.10
-
-	>=gnome-extra/gnome-clocks-43.0
-	>=gnome-extra/seahorse-nautilus-3.11.92_p20220906
-	>=media-fonts/fonts-meta-2
-	x11-themes/papirus-icon-theme
-
-	bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 )
-	qt5? ( x11-themes/adwaita-qt )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp )
-"
-BDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	default
-	if ! use bluetooth; then
-		sed -i -e \
-			's:"bluetooth-quick-connect@bjarosze.gmail.com",::g' \
-			usr/share/gnome-shell/modes/pch*.json || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/synapse/synapse-0.2.99.4-r1.ebuild b/gnome-extra/synapse/synapse-0.2.99.4-r1.ebuild
deleted file mode 100644
index 8ae574a4f853..000000000000
--- a/gnome-extra/synapse/synapse-0.2.99.4-r1.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
-
-inherit vala xdg
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator nls plugins"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.0:3
-	dev-libs/json-glib
-	dev-libs/keybinder:3
-	dev-libs/libgee:0.8
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libnotify
-	x11-libs/pango
-	x11-themes/adwaita-icon-theme
-	appindicator? ( dev-libs/libappindicator:3 )
-	nls? ( virtual/libintl )
-	plugins? ( >=net-libs/rest-0.7:0.7 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
-	vala_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable appindicator indicator) \
-		$(use_enable nls) \
-		$(use_enable plugins librest yes) \
-		--disable-zeitgeist
-}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 90304f37390e..2b441d97a13e 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/grim/grim-1.4.0-r3.ebuild b/gui-apps/grim/grim-1.4.0-r3.ebuild
index 512ecb14f61e..11d407ffb990 100644
--- a/gui-apps/grim/grim-1.4.0-r3.ebuild
+++ b/gui-apps/grim/grim-1.4.0-r3.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 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/grim/grim-9999.ebuild b/gui-apps/grim/grim-9999.ebuild
index 512ecb14f61e..11d407ffb990 100644
--- a/gui-apps/grim/grim-9999.ebuild
+++ b/gui-apps/grim/grim-9999.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 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index c5d48c247977..caeab97ab79c 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,3 +1,2 @@
-DIST swaylock-1.6.tar.gz 36439 BLAKE2B 8944bbd5ec0dd719f8dc627dbf878fcf07df3f060b56bce3ab215a2c21fe43debfeac15f6ef7eba43415f3b94a75a335fd692e653ac48407c1cf10b400f8ff67 SHA512 9a472c25e53a41c461af41af31c7fc8b275754628d0b20f4e5085cd7ca514e68361293a6e93fb6fcb7632419a3c73e4578e03294af28fe62d944cc43339f280d
 DIST swaylock-1.7.2.tar.gz 37368 BLAKE2B 146d73255a0d1439cf75ccb2fff528e47929718eaa75dc5a1567feeac59e65ebf674679e559dd634f375b5ca1bd44f6fe195f7362441b1979eaa222ba35812b8 SHA512 0593f7dfb258bd77796cb757e2e52d01829e0746306ce7991313a2982feead698c22753db53b00719ac1c82f6573563bcf5815f68c06680aa8ee6d419cac7549
 DIST swaylock-1.7.tar.gz 37149 BLAKE2B 7675b56a28ce932bd163cd41ce498295b61aff51d204c5323b187ddde9ea17f6ef1ac2777272fd92703e49f44b3f749645b4715a75ed54845590513e7dddd524 SHA512 44c5a4e482674caeb86da78e49d4593128a14adad2d6e46994f984b2b2b893416d6ceeb6b0b5746ad5594892e65c9dab9764bbe4bf617a90d92622a41b791ed0
diff --git a/gui-apps/swaylock/swaylock-1.6-r1.ebuild b/gui-apps/swaylock/swaylock-1.6-r1.ebuild
deleted file mode 100644
index e69b34f25fc3..000000000000
--- a/gui-apps/swaylock/swaylock-1.6-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Screen locker for Wayland"
-HOMEPAGE="https://github.com/swaywm/swaylock"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+gdk-pixbuf +man +pam"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.25
-	>=dev-util/wayland-scanner-1.15
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dpam=$(usex pam enabled disabled)
-		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
-		"-Dfish-completions=true"
-		"-Dzsh-completions=true"
-		"-Dbash-completions=true"
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
-	fi
-}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index fc7df14bb53b..072dd8233892 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kidletime/kidletime-5.102.0.ebuild b/kde-frameworks/kidletime/kidletime-5.102.0.ebuild
deleted file mode 100644
index abe35a8f772c..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.102.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="wayland X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXext
-	)
-	xscreensaver? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		x11-libs/libXScrnSaver
-	)
-"
-DEPEND="${RDEPEND}
-	wayland? (
-		>=dev-libs/plasma-wayland-protocols-1.7.0
-		>=dev-libs/wayland-protocols-1.27:0
-	)
-"
-BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use xscreensaver; then
-		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland Qt5WaylandClient)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index d1a0793f6b3f..730d90864f37 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 1919d7761509..7b470584d0e2 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,2 @@
 DIST bluedevil-5.26.5.tar.xz 318640 BLAKE2B 438e3d838e34b98d097fee3a88062ebbe50f53f451b5d0521dee12c787dad1b028f42a5be88b9b082382b67c8b6277f53bad3295089d7250b47b477a3dff587c SHA512 7bb514056e8329893ec8820441f733e879d09565d724a6e13df1af3daab5f6c976ad8179c58de7e25c4f9082e71b52da31f82ad6510ab78ac02d7afc2e9226ba
-DIST bluedevil-5.27.1.tar.xz 363924 BLAKE2B 23eae27da52074c59a93a1cf48df6415abf2736642adc05838fb656dd8faf6f306389ac117b2882ffecee25c8597da575fa172b9472eee1332f58e642881d29d SHA512 941266e17d2e7e84f4b2faf0be7e03147c9a3ba5475e3bcbe61399b0c69bac710ad0ba265df770885dc0813d5bffe66ea69cd257ada29f791e69568b2a72e7bd
+DIST bluedevil-5.27.2.tar.xz 363956 BLAKE2B 6b9807c7b3ce06b0611aa688757e9664b95de53c6cbf67ac184f2deaf046ebf269a35c3e85a322fcec0aad50a986627795789f745b2a17df7ea5ee17038f07ee SHA512 7c0fc8ac757cd7d48450d11a4f99ee20f1cee5340a7bf7db31cfe69b25e35067c17375828eb9bc83b69543b6660e423b64e6459400b315c4e2cf9b405a3483bd
diff --git a/kde-plasma/bluedevil/bluedevil-5.27.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/bluedevil/bluedevil-5.27.1.ebuild
rename to kde-plasma/bluedevil/bluedevil-5.27.2.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 6a65386a53f2..784a04821490 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-grub-5.26.5.tar.xz 3147476 BLAKE2B 217836c22ea8b207cfc579d770d785ca8b03dd461d768c17af19e3f70312047fc23731b315df76b37e1fee2ffe10bc1aec24c60e5e07157bf06cde4c67e6c2dc SHA512 d57293b6bd92ebf409bee19a73217fe71fb03c0b0fb1071c9ca6c10ee86f7cb8eae9b9851318c677b6e5406aff90a408d2b0ab2ba047b1d36ef4238b595eade6
-DIST breeze-grub-5.27.1.tar.xz 3172440 BLAKE2B d4a68a86926d7351119a7c02a8ae9e55a4aea29f23918d36559eb6a3504eba718d901dce41e89051dc738f0a8587352f32ff554f4de19ab30ff8c0afdc24c7d5 SHA512 1ab63673be7596e10db3dd9843428738e7c1b091a986c5933e5c18255844e414adf753effaf0b756fe6d5a5577d3130e50119d4838203aa4fa96a52499e70fc9
+DIST breeze-grub-5.27.2.tar.xz 3136016 BLAKE2B 781c970d19add5981ef9866503e237793a98ab09856c548fd2696966c174aac820cd841034fc077b381b26cdc8768ddbc8d2f48233f6a720cbaa4a06a420fe13 SHA512 f69da94ac3165cf5ed10b853f40caad14a22c293a440f514bdf082c351a5f9dc103b5b46af5e38f30dadf2bc8afd486fa3fa7a1423a2feaa830c747cb349b093
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.27.1.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/breeze-grub/breeze-grub-5.27.1.ebuild
rename to kde-plasma/breeze-grub/breeze-grub-5.27.2.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 757beeb13bea..189151c42fbd 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-gtk-5.26.5.tar.xz 40312 BLAKE2B aa88c4624c4e8b0aa8211f3023af3a9e44be212a62be9a37ff70c561b00e58254a983bf8eef50b5ebb167a6391476b6b646cd8eea60c8104a7fca896d9f7535c SHA512 ce4ad8900b4147d21765783e5b2ec008734f589701db3dc1323206736d4439db2944b65c86197abe7311500decf6ceb095903bbc7c0f363ee5f46cd753864897
-DIST breeze-gtk-5.27.1.tar.xz 40328 BLAKE2B 247fe955c777fea1826d93bb352ed22206cb5e4fe2502d6f318b06ff79117eaad40202be3d995b4caba0ca9f098575a6ae56afe348194ad2bd89e6096abab05c SHA512 a835340c51b73a3e73950ce14589fb99bcf8f629f062ffc9cc8bf672e612f20771298cddb4fe4b9efdb36204e43e76c00021199b6010cd49745a07ebcf2aa4e7
+DIST breeze-gtk-5.27.2.tar.xz 40340 BLAKE2B 7be2383d87846f7e7906ff6430752ce278efa96ec6e487c090a1db23432a5dfe208cfa0b1b09e494635781dda54153c6a03c49251960a4eb8a6e681c0d549d01 SHA512 f7df86277f23e838d35aca8f7cbc760c14916e4ac8dc0eefeb3da9e97afc921950826cea5a9969e18ab562759f15bd6653c0397b103f95d41aa951a4ebac6e22
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.27.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/breeze-gtk/breeze-gtk-5.27.1.ebuild
rename to kde-plasma/breeze-gtk/breeze-gtk-5.27.2.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index dc05957becda..da6506e13e92 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-plymouth-5.26.5.tar.xz 111268 BLAKE2B 76c1f25aeb1fa7666b4306b8cb80f4e185b1dac0669a1648f5b2616e36f33af0edb0f11bd46124e70afddb4c1e348d4db72abaa8c162a817402e7b278ac33279 SHA512 ec2b990cc3c68a12280aae6c314db7d50764854af69476723b35095bdec063d033ec3439b6ae9d60f24b5a26203bdfa662646af22252f97a76432a3efb225d70
-DIST breeze-plymouth-5.27.1.tar.xz 111244 BLAKE2B b9b55806dda0f32dc4c3c533990805ddf37b1ccd7fc3800e63d91ec819bdcf6a2521faf1e76b8d80758e0138476ad69ae441914cfe01b8ff6a4b08fb44490153 SHA512 a92129934a803d6bfbad5e804fe983c9645a96aed25892e7bdb0954d6b436a89659047747bd95c30163a680c66899c9a755ea01ace456319862365ec50cf068e
+DIST breeze-plymouth-5.27.2.tar.xz 111228 BLAKE2B 3d2c1cc835d85cb512b2bde4eb54a4ea285ce5e3726ae2cb06e68a903e8e68036f7d618d0c5394192a705ddafba6aa1e0ab65b4e75a7b740a3bf6061a8358b43 SHA512 e999adce00ff05a40579314e89edf85790237c9a67cff1d9d36a49628ab03441ce7f77d5bc83033b85d0c161d4849421fff1a8c79aad470086b199ff6c507e14
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.1.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/breeze-plymouth/breeze-plymouth-5.27.1.ebuild
rename to kde-plasma/breeze-plymouth/breeze-plymouth-5.27.2.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index e95d6e481f65..3c79e126bebf 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
 DIST breeze-5.26.5.tar.xz 57809860 BLAKE2B f0ecca35460b13de33baa052d6d4579ec431187777d6f535e7308a67f374fb1c5c58e691e7fde39c37730bf86babbb284f74d1cdfab47c69af41559f15673d91 SHA512 c570ef1f2d1bceef42939eb5178fb8e6c7545b656f8e83f464e1767dd2d98b3cfe414a38923b584ce13b1ffdcd015f97781845956e93737735c83337b362b15f
-DIST breeze-5.27.1.tar.xz 87589736 BLAKE2B f3463b21ff58fd728b7c810a9903eca89584578059f3cae5acf3f5b393b85a89e373f8c23a22ce0537e21c580f2507a37b4dff32c63b463d80599e3fa629b5a8 SHA512 b7c3af65a630324dbe495d92b452d7ecbd6a8d2ac26602111f0fb90a0c87ee96d7f36af734df6241ad642dafa78a1d35b7dd7ce23b7f1771eee4fb089d7126f6
+DIST breeze-5.27.2.tar.xz 87590000 BLAKE2B f1a4972eb1da08e9dd0fc6a47d9b419ceb42affa1f87c7ca07d807c4e2fd36ecd2de2433aa61d65981dbbcb6a2af8320ec5b6fd58ae329c153da9d22ffa43ce4 SHA512 09c2fff16fcc6488fdc57f5bfe496897435c81e17e97e5e2e29b3f75e468cd1b1a053693c71cde1efbed07a7824577f9d6cea3d64360a9ece2bf92214a6fbcd3
diff --git a/kde-plasma/breeze/breeze-5.27.1.ebuild b/kde-plasma/breeze/breeze-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/breeze/breeze-5.27.1.ebuild
rename to kde-plasma/breeze/breeze-5.27.2.ebuild
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 8fbe47bcb8f9..49b022dc0da6 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1,2 @@
 DIST discover-5.26.5.tar.xz 666824 BLAKE2B 427403ae2b4a80b846919716f1eb74fe26b4989d7a2647b176863f02a4b587801eb7907f447f13e2f1f1a463da35cb55924d2f3ace57d7246d3afad641ed257b SHA512 b41381ed97fc38be1b35f3dd34e6ffd4171a55fa81e344bdd47e3a8577a6ba05aff757db20f38b2632ca788180f93ce2ed64777abe1a2d74028df679b6a4b5ea
-DIST discover-5.27.1.tar.xz 854908 BLAKE2B d7c0a0b8ca1e0e37a0669424058357e9bb14a650dc50768eaefbd8677e5e93ad57a9354ccf0f4743e0faf71b98e8f836fa3eb63eb7fcc94e261f75141697dca9 SHA512 4cba6599e636d245a4b2f839bfc6e6f79413e287371ad0a3d383bfb7f11f8994ccf2d975014ac25ce6e4cc2348e813d8ebc12b8f8e790319379b7f168087483f
+DIST discover-5.27.2.tar.xz 857488 BLAKE2B 5a3aa181a3533bc532001736d7632b4cf725365fca07c59be64cc3055e22c32657f84625c587b930ae56f71a9c6053387e8930bdaccda187b08d6d719b38e6d8 SHA512 5c4c33274e37f40c1713dc03d0b0844fc3eb909b526ea4c9324e1e5a23c95b021be41e7916769cf0843b18d9e618c0bdf6c1c08a1158cd2d029cb9f7fa6f37d5
diff --git a/kde-plasma/discover/discover-5.27.1.ebuild b/kde-plasma/discover/discover-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/discover/discover-5.27.1.ebuild
rename to kde-plasma/discover/discover-5.27.2.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 556186d1cd01..3a3357dbe0ef 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,4 +1,4 @@
 DIST drkonqi-5.26.2-revert-add-sentry-support.patch.xz 11784 BLAKE2B b32a24ae4db909753b41770246863f824188330a1ff5581f70fdb9bf5698c8154d140ea9a4281c502375a3cfabacffaac2212a2af68fc9c481755bce92afd0fc SHA512 b9d9e588f60751a0c0fb2b5e6605f42c85e2e1f1669ea83eb50a9c39211f3f9e92b033fdc251a3a2b56e33b1fa7c4cf95e47a4272e85f167abced9f50d2553a9
 DIST drkonqi-5.26.5.tar.xz 507664 BLAKE2B 94a2d9919e7e5d7825de82caf6938afd527ba728484d8e31dcf817fa179d91dd421761fa4ed1f477c224f0ba1ed5b092b7c5e43fd8ccf364f6f59e78fc1a62f9 SHA512 26d20241a2fec0d87927c5037992b3b6fe062fabfa26efcf56a43fe2b69427c5e38a6ff1d1ab4179ab677beb59840e0c7dc6cbc18ccc2de6a208036b10cb66cc
 DIST drkonqi-5.27.1-revert-add-sentry-support.patch.xz 11852 BLAKE2B 79cf8fd5bc07209ed85fd343593157d23f7ed0ca0e64c1d3deef2a11124781de8c5ae3f70e5a472aa0e4385412501b318b8052e07e13966cf96b8c6222163ca1 SHA512 fd4e02cc1f317fb49539794c0645f73805b4e71d414c4a6904a2da7a6b850c5778ed25c3341217ef3d820d8288bba78518045726d150a0ad6e756e4c59768c32
-DIST drkonqi-5.27.1.tar.xz 852852 BLAKE2B b601c963faa6d790949afbd7e129d9174add532346cfc4a0b0e66bf850a224dc592489a46978f6111f1556e2f91ae6b8d7c0b0a135adabb07fd94e41e29941a6 SHA512 f96c97ac981c8fc53fa37ecddcf488182215a5536bb460b8af5caf8572eb441f2fd7252723a3b550228ad02b655a2764cf9e1aad04fa8407b30759420c9bd216
+DIST drkonqi-5.27.2.tar.xz 852992 BLAKE2B afb42ea1a36c468e23ba7d1f9ab7d5d11869e46456f6672c3a09d8702e69f6502be6143d051d7629ca399630a5c7bf45f5bba41ea576cd57f68d427013a70dc7 SHA512 f518d32fcd1d84ea37e18af374148a97c186a24e6f96d7bf56c112981a5b7b90df0584ea33276e20ff747c770f63dcc789a97935d951241730e1bab43b1e8c6f
diff --git a/kde-plasma/drkonqi/drkonqi-5.27.1.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.1.ebuild
deleted file mode 100644
index 8ed6f8d6d322..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.27.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-revert-add-sentry-support.patch.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	|| (
-		sys-devel/gdb
-		dev-util/lldb
-	)
-"
-
-PATCHES=( "${WORKDIR}/${P}-revert-add-sentry-support.patch" ) # bug 871759
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.27.2.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.2.ebuild
new file mode 100644
index 000000000000..aa84a15f2e78
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.27.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.102.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.7
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.1-revert-add-sentry-support.patch.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	|| (
+		sys-devel/gdb
+		dev-util/lldb
+	)
+"
+
+PATCHES=( "${WORKDIR}/${PN}-5.27.1-revert-add-sentry-support.patch" ) # bug 871759
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 7c590fa31ea9..52ababf91d35 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,2 @@
 DIST kactivitymanagerd-5.26.5.tar.xz 109164 BLAKE2B efc79871412db00bfa2b66f3e1766b34c91e028a2e3907ea14a4d14a40fa568d61b70782cc004b618d584f7114969eb7ef9eed5c1937cf44fbfa1a8a62048276 SHA512 952d97497d80098f2f19362e0fb6ebaeb4fbf1ab7cf5b4e1a6b08505d7e3a4069951de357b78571a27234fd20396db929b752cf90d50bfd22f901c3d28b42a46
-DIST kactivitymanagerd-5.27.1.tar.xz 124900 BLAKE2B 9bed5d276a0fa4cae5e90389b0e5a00f59ed3a76ea94dc6db680e78ded812024e8f0294e4a5f80ae8da420f8a8b7dce6c2113c6edc70f7911f9798ca0ed7bca9 SHA512 f5878c0b79a7c052bdf3704f5e5f109c8e6bb25f639fd064583b188651d177fad19c817f300b73adbe9184162b8bdbe804837d18ecf2e92059363c809a53ca6c
+DIST kactivitymanagerd-5.27.2.tar.xz 124880 BLAKE2B 71b831259c8f2b5ef1560b429d47eeddd5a26f7b21f30844af417fdc807cb51661b801ddcaee9d6c2fa78070ea8824d3c169a517aefa33b2368c5dd825d13816 SHA512 0c2b73d17b5a5f63043b50b06c9c60551727c9ad17e81fc52706533b9a55479274adc1e91da0b78963caabc82799cf2f24a410675d30dd2b22fa3b978dc2a0b5
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.1.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.2.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 56c6e85ea378..e5feff686c83 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,2 @@
 DIST kde-cli-tools-5.26.5.tar.xz 630776 BLAKE2B 5ddad1d2833a20d8aa6a99e0a2626f7a7c08c7b7526b608ba6dbba4a20a36e73e0bb168ef29a5b4a794d1e48f1dede39bd0fc98405b4dd0ec3ecc844075f1055 SHA512 59f214c7fdc4ead47635713a98115883c0672a7382c20b32b925b38379de60ff36691460432b23f9d7928d423c487947614ac15076fa907db1a7bfc2227cfa60
-DIST kde-cli-tools-5.27.1.tar.xz 657200 BLAKE2B 0b9c31ce1ac4b5d02e6e7c5e49b83136776241aad46d6dedcc2dc92041ccf698e66366fd11a5235e304853326c15193595ee532734434780f79b7f1a31895b04 SHA512 a9727119fb60a6cdb8565d9e59a39afb70fc72389765af12d2067c008f0ea818d316d9c86364263718649074085749cd2319cd68bf864800d8ca5c49769ec97e
+DIST kde-cli-tools-5.27.2.tar.xz 657280 BLAKE2B 5e5359fbffd25f3b667b9cd17a983b71f08927a7254559747500ef62bf2bb5f0cef6a3f2245e0cc30e9fcc03ea99908f90620452b2af396b77548fc4f735dfa6 SHA512 9aec8b9d0bdeb97c7a686eee5b93cb9a36111f1e664cfe7bb72fdc251805b754b6050cf937504be707d6041dca10c4c297ba8d38612c294b4ec7b709b4068fe4
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kde-cli-tools/kde-cli-tools-5.27.1.ebuild
rename to kde-plasma/kde-cli-tools/kde-cli-tools-5.27.2.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 8ddf0385eeb8..ae0a302bfedb 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,2 @@
 DIST kde-gtk-config-5.26.5.tar.xz 74392 BLAKE2B 5b5e975650d4987358a926abcb3ddeee77e5d4c190fd0ccc1c2dc31c2080056c24680f444512b03a1b5dee9f93e4950f4dc2c8b1526dba488d903f3215ba5fb0 SHA512 dbb9318d282b7f60b481abffc5ba6504f1c89825e0fb825e7f28410f6ceffce2f4fda727cde3b97a1902a7c3f12d01bc4ed482ce68088a1159efbfa57e00e513
-DIST kde-gtk-config-5.27.1.tar.xz 75296 BLAKE2B 3a13f28593d20ff076ebbd9b43ca230961ea8d5c00865cd27f6acfa31cc23ba2971a7675f7aa6f3216e68eb2e594898c14fdbb858bcffd563b0913bc9ae581d7 SHA512 8d7dc33855b45e86c37a93a1bf729f7452ae0b2ed6de58ad3af66b211b0b99254f355f797fc83fc37241b3e8470a701429917748d2a44daa04d1ede6d4e1f9fd
+DIST kde-gtk-config-5.27.2.tar.xz 75320 BLAKE2B 9b0395cb2c371d7621bc0229e3803a804ee888aff5c009d257b72a6d4b4b94d60aa473f30daf60c1bb84f97c83066df96ebd47acf61b4661f7b833ba70e060c5 SHA512 72e92999dbb4b2199374be0be06f058ba9c3c6678f3d2241bcbb27e0da1dbf5453e7328a03970959e81dd26166ec1f94a4097247276edc4c4a876ba62f4063c7
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kde-gtk-config/kde-gtk-config-5.27.1.ebuild
rename to kde-plasma/kde-gtk-config/kde-gtk-config-5.27.2.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index ab77ee537c47..1ff86b3b8095 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,2 @@
 DIST kdecoration-5.26.5.tar.xz 52192 BLAKE2B deda6d7678a3d416371ecf46e09d68882de688b95a0cbc4ad204a611cbbdc6759c914e4c06442b716b3d8fe0af52c7097b9dd64f862ddf93966dc33af02c8ec4 SHA512 ccc5528eafbaec688ffbbad42105e2457723062ce1556a182bd3b0573c20f9d7794ffeeed7cad927437a98648c4a432c00ebb2c013b4c40f8774d4a43a3676a4
-DIST kdecoration-5.27.1.tar.xz 52500 BLAKE2B 4bd9249f6c199a18809d233327aad20dc4f28b7b0e92f04f1758e432cc56a4a330d6bc98a10733528a0c725e5837deda9b707787e419a9245bf73752ecace7cb SHA512 fbf4f066bd9dbce2b22a6525ee1cb2c58b61875090aed33ffff5e12b7f860fadd21924b0bd5874f89544b346216aee336356cce3bc8be01fb0e67b2da53700d7
+DIST kdecoration-5.27.2.tar.xz 52496 BLAKE2B f2599ac37f82d3e979abb17e04d2878e443356b4e9fbdef63f0ed5441881ed15b3e9fe8abf72f031b101d2100156109ab100d262a57d99dc7fbc8d5c863e9b7c SHA512 e4083f2661d5768c4ccef4c115650f58d89eb0397cf012a12459ae150f1944e90f08ce22f161fe9a75f7ffc944dd1a37e67833c672eb5f7b60f6119a46cd7b47
diff --git a/kde-plasma/kdecoration/kdecoration-5.27.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kdecoration/kdecoration-5.27.1.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.27.2.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 09fdc1ad35b0..a6355af45ef9 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,2 @@
 DIST kdeplasma-addons-5.26.5.tar.xz 691088 BLAKE2B af1d7ab8fb88565765855b990d04c024f7b50162a5d661220a4a085843e2fb9a7dba3b05a5d87040d97e789c7d3337cc47455cab77f8f675cedcfd63263c1e72 SHA512 ffe2122f273418d8108f71b4c91ec9e9065705eccefb93b35d8ee18d968ccf53dc96cadb029b7b8ade851f74a01f5afb8cfbef8e83fcf05e56c35997da497178
-DIST kdeplasma-addons-5.27.1.tar.xz 816728 BLAKE2B 642f33cb2b4a4cd552519f7fad99f8572aa5db639c0efc0301118ba8671b31308669f3645a2bde996daf62620ad9688df84dd3c29a86255e88c022dfce35402a SHA512 7014cc5fe173d8d7a992172bfab7479e2d45f4a858280bc5e52cb7a6c0631da0e87ac5967b26695b072c5fbde45aa38588be9931c0a8c76d4eab49c0f048881a
+DIST kdeplasma-addons-5.27.2.tar.xz 817132 BLAKE2B a5d326a7e2d869b51b2cea4f970db41e4aba02f1793e2592e1f1db54b4e3c8a9dc87fd460a282b9953f91471be5aba4ce30f2649f778fb152ddb7dd7ad0b640d SHA512 727943a7236bd96965b84dab8d2a83cf042cf09c2a99784c236a213480495a8cf032f5ab7dcbb11273b32844545c747c9530ef11e0f935c40589b1f61cc99643
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.1.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.2.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 3035369e845f..8e634f52295d 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,2 @@
 DIST kgamma5-5.26.5.tar.xz 87120 BLAKE2B be16f4999fa60e2c5ae469ed118165ad76d364efbab973e1be49894c68bcdac241187b8e5e27b0abff4689f5424ae1ea4d4ff3c0aed024a4e061f1b4c105427b SHA512 acc1caf81b2e87553595829873b3b1d33c2703bc7066f89850f010c9f43a2b37df0d54484c59ada33be54d844c534229a4e672026025919d2f38b75712574fcf
-DIST kgamma5-5.27.1.tar.xz 86684 BLAKE2B e5600bd696326c74593bb9bf2af2cf2d3c1a9a9971288b15fc3aa2cabed0bfd39d9184828f5e0412f7c39d99b22012c140a811c925ef5dfb9441b375ca8217ac SHA512 fcf3bb49d3849e35bd6bed4512d20102ed966baba054d9e4166e9a1f9a42ecbbed8c5fc44c0fe2bfc19ac8e2bd2037731bb64d5dd8ca22fce508ee83ec04fd43
+DIST kgamma5-5.27.2.tar.xz 86732 BLAKE2B ac66456ddc29da08fc68bdb9efaca004840bd845a7fc603cd67d507b582023d0334ab5f5048307f49fa83aaaefc972ee35b4625eba1a332e84310b2c681e6bab SHA512 8fd7396d2bf78c24c3d1b7818f0e10ad918d7057f33ab05524906cc3b4f1d2dc4c2db3272e9c777740d18146272cfdd363057ba5e05caa32f5faf9bf466639c5
diff --git a/kde-plasma/kgamma/kgamma-5.27.1.ebuild b/kde-plasma/kgamma/kgamma-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kgamma/kgamma-5.27.1.ebuild
rename to kde-plasma/kgamma/kgamma-5.27.2.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 6cd58718f746..104c39e847fc 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,2 @@
 DIST khotkeys-5.26.5.tar.xz 1839284 BLAKE2B 8c16cfa8acc5de9838fcdebd6ffbbc11b8aaf919d4ccd61758d782551ea9245b184013da67a8c88c621062a906a9025ff907caeef8228c201ca98e4ca074bbec SHA512 6de9e3432146bc83482d64908d0f54250d4f6a47bb9cb9ccc12b9f016db1a8e4347b8a8a7d197b343c148444ae0e7e3ca47a1f46377cbca2ea758dd593f7007c
-DIST khotkeys-5.27.1.tar.xz 1886288 BLAKE2B cfbc441bda69acec86a0f2d5f68ec46c22999ef905e6bdd3e8255d94eca52012e8734006a5274af3bb2269ddec20b9748e71e7b54b395e64eceb2fa59fe9287d SHA512 7aa461a0ff7c2f02da04ece6378bb6de6a5f031f950facf7963af7c514b34b3ee1806669d6dc0ac07d0c2f573d047d77dcf78588932e1cf68e22431cab7b6485
+DIST khotkeys-5.27.2.tar.xz 1886308 BLAKE2B 3e4acfd43ad1be359773fd036e5e7aa27860ee0f4298a524dadc0f56a5071be596a82425cf9fd3393f76d1a54d61403b957630d87a3472a7d73a4c5a1a7131b5 SHA512 0048d4753d8d2f6872edc337ff6097a84ed7c2d1bc9352a126c86a00243fa9446b6380ff16f654cad6b6cf32a49ced341e98c372022f09566ac098b4d2c32472
diff --git a/kde-plasma/khotkeys/khotkeys-5.27.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/khotkeys/khotkeys-5.27.1.ebuild
rename to kde-plasma/khotkeys/khotkeys-5.27.2.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 9014ba9452bb..cf987aab059c 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,3 @@
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.26.5.tar.xz 736144 BLAKE2B 1e6f6bc3abc78c1cfc6564b48fb9101158965b3aba029bd138d5f885163ebbaafaf6386c3a759ef67d8007844d1cc07a4c7191cc179b175ef99ca3f1e21fa8b1 SHA512 a00f71bbf7436bb5807f83060ab697b53a93b66f0e3a7ca6e791a45da8d468fc1616b991fc50292dd911ff6a66093e73b9216f8f28fe1434388e4d86c873537c
-DIST kinfocenter-5.27.1.tar.xz 1015384 BLAKE2B 25b8a60ccb65a9471d7780b458fb840bedd4187a7aa09ec9b22bb8d9254bbdd21ca303557c7b29c801226a0f4152333d678cd13b416ae42f124e3984152dc4af SHA512 31291ea89f35a1583d33ab38d175367e24b7834ebb49aa08de49bdd32c95b428d9af028dc0eda8689997c87d3f843704922a54769a2fd1ee44559296594d3690
+DIST kinfocenter-5.27.2.tar.xz 1015472 BLAKE2B df5f212897cf0a4389a4170a68712460e4f8fea1067a69820c1f94d9d6ada71204ac02b7246fc5b74f5837649d60840e9efd6055d9b0efbcbe4f372f735690c0 SHA512 b89935c7744a0c1e20b4cc4d25a2a18148afea0b61962129fcc4917f34abb36bcda39fe830c68219be54fedec4af2a9cc160f375271b31d57c6d4b2628c52106
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.27.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kinfocenter/kinfocenter-5.27.1.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-5.27.2.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 1449fb673939..c31f7cf1b634 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,2 @@
 DIST kmenuedit-5.26.5.tar.xz 905724 BLAKE2B 40d4e77b44df603db74b2482554b87eb172f2010e2e5a5449a55e5defe9adbef7f603eb302ef4d232b58624d769edb627f822698e7972df0eec9dedbffa4b311 SHA512 e8f7e87305c4c134f3cb7e1d3680ea5fca02a05e90607ccafee0290b206cd3ff1f71c0545f12aa2006fcd4e44f2626042fc00cd1f2db329fd02dd26fe6a509bd
-DIST kmenuedit-5.27.1.tar.xz 926292 BLAKE2B 0a4f06c118d077326be890ca4d0fa148b3bf4104c9ad04c41b1f07ef3e8f6590ee075a45dc03d0a980ab384cab2a3de41298e89a06e668c9e6d91e363473551b SHA512 921b2a1fd8a888d58af61280daf799c1ca80c271d079376db730df1e42fb3b9fbbe561b42591141de1ec837ccbe9b5893a537b7bf3b497b7f95ee65149291fc3
+DIST kmenuedit-5.27.2.tar.xz 926376 BLAKE2B 14eca601259da5bb4d4f12db4fa0e341032590a6abb87a3a4518948e238956e289c90dc703e1618cebda9dc8990eaab5a19177648b3a21275dece00abec8c3e7 SHA512 b6752a197604ae9337a4158c714a77a1c4eabb9c7c6cd65d7055532a04eaaeec42930b3a03b04d22539152bcf5bb6d6b9084b533878f54416dfcb1bb48eb6618
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.27.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kmenuedit/kmenuedit-5.27.1.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-5.27.2.ebuild
diff --git a/kde-plasma/kpipewire/Manifest b/kde-plasma/kpipewire/Manifest
index 101ce32d4678..f737cb4542f8 100644
--- a/kde-plasma/kpipewire/Manifest
+++ b/kde-plasma/kpipewire/Manifest
@@ -1,2 +1,2 @@
 DIST kpipewire-5.26.5.tar.xz 52848 BLAKE2B c77263dd20d419fc590a1257b8934257f40f9c7751b4c1542db30fc4ba5814ae1076190d9fe08325398a9bc85f7321c6ed1059bf0b010debe20346110d211661 SHA512 59783fe9cb46ae467bc907a04bb0f499bdd23a39c607d7f0203dc550f2268a36e1914d55df90f167328f9b2644144642540e3d20ba27c6f1b66beff1c807d0d1
-DIST kpipewire-5.27.1.tar.xz 58088 BLAKE2B 066859de6c89d6708624a0b55cd47730a4a434fe61af81b128553e507aac103b05ebaceb3c462d5a73179cda7373f9e51030ddc85a937e02595eab3e66211d1d SHA512 1aa190c45e9573609d3b9ac7f80c5a0fd4700252b802c30ed76816899ca1572515c8f5e6555f5452c7ba3ff901ebc5caeedb9b54149709c08f64fd7dc3532eff
+DIST kpipewire-5.27.2.tar.xz 58344 BLAKE2B e245ef5c68ae7c4d8446a1afd63198c22a8599d16834e1b2baa6461e1ca20a20d482429aaa986778ced0772b2d396d846bc5e81b920af32cf3faa62e7c2c93f2 SHA512 d56a32cf2c55997c3049c836e0571be6cc9bb053202a80e33cc8c2469925d72776c3ec4be4f5753ddf9a3cfe87fcc50cb02d2eaa627a9dbd72c11b2bbce7c5be
diff --git a/kde-plasma/kpipewire/kpipewire-5.27.1.ebuild b/kde-plasma/kpipewire/kpipewire-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kpipewire/kpipewire-5.27.1.ebuild
rename to kde-plasma/kpipewire/kpipewire-5.27.2.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index a197e859fd70..d4a2153c0cbf 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,2 @@
 DIST kscreen-5.26.5.tar.xz 154600 BLAKE2B 202f7ec24b01ca057a5e52b796176e6ae09518693cb50e16b0d3901351fba58d5554d959f4afa48b5539981870e02f14bde8c25402d4c2b6427acf5c896ca75f SHA512 58635bc2c5cb3e3cee6b838ddc3a9068c9b22bcedef6ddd9c4b6aa59889b59242118227e706208c17c89241a701f850d42e9c5617d876068367246d35d1800c2
-DIST kscreen-5.27.1.1.tar.xz 183716 BLAKE2B a9ec5c616b91ec24fbda76c38139bad9cddb6a5838c5051a2726ece1aa67237419a2d4be1db3c84960f1db5a25015a4e30572cf2bc30164a440303f41a560b59 SHA512 47f8b95687d384c9cbce451d6d7fff2d69933c5778a60d5661258bc2050d6eeb94f3db4c058b1ca2cb8f1760637b13f967bf0f138c57f487fd5932e439b29456
+DIST kscreen-5.27.2.tar.xz 184024 BLAKE2B bb5b4789e5b87a4669721288d05a6bbd43a8e181c51cdc866906cd21271283171e96fb4b7e9e0746b2f782b462c46e0ad0fe703b2e45a486cdaab9aa08a6d9f5 SHA512 804e43e5d188df1f5b65e99462658683eaa2356a089ccc9bca916e09614e5a79ad4ec28cfb6f7bfcc8453398bb445ed0ca1cb21592bcdbbc0f5b3cc9361beeb9
diff --git a/kde-plasma/kscreen/kscreen-5.27.1.1.ebuild b/kde-plasma/kscreen/kscreen-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kscreen/kscreen-5.27.1.1.ebuild
rename to kde-plasma/kscreen/kscreen-5.27.2.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index f1864b63ebe0..fd779cb711d5 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,2 @@
 DIST kscreenlocker-5.26.5.tar.xz 116164 BLAKE2B 4973b6843636fee06a570d96772fcd6fdfa1d6308a492b214431a7b4847432e7ba56ca0db04b3c8ce6fd10d61b41fa5690679133d5a828db616936cd5cd6911d SHA512 2580cf1ea0f5a653b577457fa155402303772f9044876fe21a2a65154355282522e3dbcd0ac2bacd960d7377c24c2e8a1ee3b776181b5560da1e814e2ab4dd72
-DIST kscreenlocker-5.27.1.tar.xz 159588 BLAKE2B c9e5fea650291b5296cd6e84e964cad8057c96b96dd9cbc1b699e6308080e2a995322feb8184b8acd57a76509abd05a0dcdfdea3ef6370979d8706f51a068120 SHA512 65947cb6025b5aeb81b944a245938b4b036de9852b7f2a38a92faa48ac624ae6c98ce98def861b7b9b0c63256264c597af3a4779e851c7149e23d353f58cc855
+DIST kscreenlocker-5.27.2.tar.xz 159608 BLAKE2B 2ba3bfc4b9a5d8098c65fe5e38244a7b61b37fb8f4c6b112cb23b90b3ae97e1892bbbebd970d8c884620d70e462cfec5adca1bde3e2048461c7e1211844826cf SHA512 0054c3cc8eda0aa2e04b7563d8370044f7e68a602b903a195373efdb7cdcdf0973b22798b6bca3241aadf6fbb593db9a9eaaafa4a757506a33c0b2d28ae746dd
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.27.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kscreenlocker/kscreenlocker-5.27.1.ebuild
rename to kde-plasma/kscreenlocker/kscreenlocker-5.27.2.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 577ab75c179d..918e9cf79ab5 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,2 @@
 DIST ksshaskpass-5.26.5.tar.xz 27580 BLAKE2B e5fed3921804b91f5f7e9a38a327a4b03cbf1fae2a6ba7a4ce123171ea70122f0c86a20f8c719c0459b5084098f042b731a912b9c0bd9979b80793043796184d SHA512 a1e50379415d006f5a2ca8292147e3bf33cb7588a6c03d5ed6dc11c0e77a3c2abf93e950f61391f464a9d17389b75dadc6e16721ec9cad7e71266ca7c0496bfd
-DIST ksshaskpass-5.27.1.tar.xz 27752 BLAKE2B 6449243be61ab4df0fb14e9c17fc5fa9548bd96cc42d99fa5fcd96f7249d4a8dbcdb112a64a2067da1a34aa7f37947f6a7ee3879b59826a1a47970c00a8d35dd SHA512 5c489a69b2c463bda2988f793fc1746d42bade23224ae932ca72d57b506959bb055077c37bc54b931d55d4b601c178900adae4b459c92f792a632a2c17ffb018
+DIST ksshaskpass-5.27.2.tar.xz 27748 BLAKE2B c6155b156e52e0e81a75796d80b4b28ffa27b8f758029cbdaae575d03db00abde6d00b1d65ee394a1496b2549480cf73f020c23332ad5a6e34ccd7fdd58dc08b SHA512 7731592a86d09c4a14193dad3d19220fac6338e69435c84ebed0142b165ad6b5663c3ce4d283747e46633895a9fe02d1a36348fa9d2487ed43fb75eededf4733
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.27.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/ksshaskpass/ksshaskpass-5.27.1.ebuild
rename to kde-plasma/ksshaskpass/ksshaskpass-5.27.2.ebuild
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 3cbe707535e8..36729add48eb 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,2 +1,2 @@
 DIST ksystemstats-5.26.5.tar.xz 107224 BLAKE2B 8423894b5e8bd739bc9d5b91af6c4d3cba2aa94699f822e483d20962075f92e8215a3db4f565a27420870df5737250669ccb1d3489bf3d0df71ee1c82b3c69a6 SHA512 67e563fc49f60de58d8319b58f823bb51a979aa596f384936859080a97e01616081fdf96b533c7bae464f131893ddd51de5298d64b886ed0f4901e895b5eb56b
-DIST ksystemstats-5.27.1.tar.xz 114128 BLAKE2B 29051a960c4d3b6b8a7c0ab2391a932597da85f5244b12c792bef299b0ac4f9a3fbc6bb052768667631c0baf9c9a57dcc28b720540c20603569501128606813c SHA512 2261574182b93bf9cc07857f71831d40d76955915c8e898f3a33b0379b16aa9f98dfc51efa79a3caab2b7a1144514c471c51e1e3e6cc93ba23005ab0238b78d0
+DIST ksystemstats-5.27.2.tar.xz 114124 BLAKE2B 1af0dde3abfdd687cfd2353bc67133eb08e0a1cfe7b996a2d6a475688e500c8679505a8a2411ddbd84ef0a95d55d501e25e4a58f721e9d927b04f4f882802d99 SHA512 2b0bef21e513c9e1c7f40d75466fa7950fc8ff7b3cbf2c554ccf1bbb6a2c07b0944da38acb7fec505580919f4e498b740db517a5c55bdf63e467646def3d4091
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.27.1.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/ksystemstats/ksystemstats-5.27.1.ebuild
rename to kde-plasma/ksystemstats/ksystemstats-5.27.2.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index e60be5c35038..2ba39792e077 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,2 @@
 DIST kwallet-pam-5.26.5.tar.xz 22808 BLAKE2B 42543b6c08dfbe873b6e2ad6503ac35b63022935ab8c40a93da432bb4d3cc240cf5da75565ef839f4cededb5c41a2a485614e47105161456f3310abcb5b79102 SHA512 bf1aeab2c4db2e0ce6e282890326b78b92ce2079f59a50d5729b0af79a7562bf845027f1f1af510181f851f7c02e4fa67c97ab58514981eca21e02ecb1ed36a3
-DIST kwallet-pam-5.27.1.tar.xz 22844 BLAKE2B 52ee60bd2defd80b942e7ed65a0a572a83553b4e95c1b7aa973419247ec22eefb86fd37924f8004b303428daf1a20ab9cb743479e87ec5ad25729618c55667c6 SHA512 a1f4a6ab97a35c35547472219fc3d6a4de55dc0dba9909b4830c09a424f2561284d708362d37531716764fe1c47cd8f234aff9b1b6511bdd51828d55dd6f0c0b
+DIST kwallet-pam-5.27.2.tar.xz 22848 BLAKE2B b690e8ae1dad36e4bafbf5cc6c798fcbbf8764854c383af2287d725c11bb7f2e3ef2d19655818dfd763ee84b21c96f0167e9b78076accf19bd6dfe62c66a46c6 SHA512 8a4149701251d82f4a2edf76a821e537dd0f0851038d224c9c3c28b2e69e5896588e25f04b58c85e6af5389d02b7bc3b72c961e44255443dabb61b0d96f9ff68
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.27.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kwallet-pam/kwallet-pam-5.27.1.ebuild
rename to kde-plasma/kwallet-pam/kwallet-pam-5.27.2.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index e4103b0c0c5c..cee6ba7465a2 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,2 @@
 DIST kwayland-integration-5.26.5.tar.xz 26972 BLAKE2B 108eeebc92768755fba22d7435829f514904a3f39c748a70f220c1ae4fa078d5def0921f6c96effc2c7cc1ae0580d8c251034e87acaf4107d340b7bfdac1e443 SHA512 de252e67f488f920538a15e69836d4b8779a3123e1913c78cb7d69833a8fa475eb1166928cc965bc7ad69aa26d3dc58395ac7d06fb2349120bd014939d81e229
-DIST kwayland-integration-5.27.1.tar.xz 25688 BLAKE2B cf3528a7f11fe9777bc26e060b5d8c78edae65ec7e442298eeafb3f2270a92375903ee2671374d6ae190b93146f80b57580bccd88020822bd2d034ae6757fb7e SHA512 1e618ffa118bbcb362dee66f1532daf2943ea324d6a65540a8088a325f22084a56938fbad7d7f1b8104bb8628d97a814820a79ab1538332c331091feb517a278
+DIST kwayland-integration-5.27.2.tar.xz 25700 BLAKE2B f516369631c693b7128475f04fb97ea96b770359953ab58154f872dddb3b589531da05116b7be6820a6bb3d4a4843f903d554f7601ee981553544011cef38009 SHA512 005b670ca353aea2a63819172b2290aab473292851dccd6b5f2b0db37087b4fd409903dbc8065700fd99abebee6741a7beaa8bfacb2434674a70e3cfdd39596a
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.27.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.27.1.ebuild
deleted file mode 100644
index 8c56787c316b..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.27.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.102.0
-QTMIN=5.15.7
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Provides KWindowSystem integration plugin for Wayland"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
-# slot ops:
-# dev-qt/qtgui: QtXkbCommonSupportPrivate
-# dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
-# kde-frameworks/kwindowsystem: Various private headers
-DEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtgui-${QTMIN}:5=
-	|| (
-		>=dev-qt/qtgui-${QTMIN}:5[libinput]
-		>=dev-qt/qtgui-${QTMIN}:5[X]
-	)
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5=
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
-	x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_kf_module IdleTime
-	cmake_comment_add_subdirectory autotests # only contains idletime test
-	cmake_run_in src cmake_comment_add_subdirectory idletime
-}
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.27.2.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.27.2.ebuild
new file mode 100644
index 000000000000..079a05edc071
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.27.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.102.0
+QTMIN=5.15.7
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Provides KWindowSystem integration plugin for Wayland"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
+# slot ops:
+# dev-qt/qtgui: QtXkbCommonSupportPrivate
+# dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
+# kde-frameworks/kwindowsystem: Various private headers
+DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtgui-${QTMIN}:5=
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[libinput]
+		>=dev-qt/qtgui-${QTMIN}:5[X]
+	)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
+	x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module IdleTime
+	cmake_comment_add_subdirectory autotests # only contains idletime test
+	cmake_run_in src cmake_comment_add_subdirectory idletime
+}
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index f6c01320acc6..d99440888427 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,2 @@
 DIST kwin-5.26.5.tar.xz 6658216 BLAKE2B 8e49136fb1b38a6fad3ef6f71f130236e121f54e98519133e615a83dad9a6fe620e279d6e769d70aff393b07c541bb70779eb974bf0c1dacb29e61e3b1ac69f0 SHA512 ef374b18fdedbb5322e0abba9f5dcd023391d96c7564c22e3a73a8fc030ef682f892f68fc618175da17527ec5fbd786e0efb452f5e52f29ffb1237eee912b5d8
-DIST kwin-5.27.1.tar.xz 7602544 BLAKE2B 746a0e3f4e2a0b02e5acc3e85ac5c795d7f8df4f364a53437c45745520cc842c112d028bf336f7201059a6003988c23c3cd80beddcdddedc94fd15217693e6a9 SHA512 8993416d207807ae954974e9d76de183701b2a7d3661f0248dc689c7079d8c3538ca3cb400aeb6707fdecd0e021b4846dbddac674e75226ce0265b51f987a127
+DIST kwin-5.27.2.tar.xz 7606528 BLAKE2B 04bcdd3e105af9ad8f4f5c1645a7847c0230acf870cdba379b241a88f00b957534a405eebf8f2524881290ccae072915c23f3eb4b47c92e8c550e95089a9a828 SHA512 08dfedecfc99f95bc042ebc0f625549c5b82db568a6cfae289d5580c8465b8aca61fd91c5413f92a4a51a6ac35a373edac0ee4c40a8701c6b1b8f815066c5319
diff --git a/kde-plasma/kwin/kwin-5.27.1.ebuild b/kde-plasma/kwin/kwin-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kwin/kwin-5.27.1.ebuild
rename to kde-plasma/kwin/kwin-5.27.2.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 37d9ac400f63..b5d41ef96164 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,2 @@
 DIST kwrited-5.26.5.tar.xz 23400 BLAKE2B d4d02647f51cbc3439418ae99bb37d8a575287eca78415a92d31416dd59610bdc10193c8c22bdcbdf59f34609de173d931fbc9de611b557c16ce5d8c320bfb70 SHA512 938beaddac35652a4b83044a785f215ba54435af1c3138f1793d104c7e79c24c1c5e52b9cbbe50e1407c41cc675fa6b5878654fae0ffd07cb40654214f218965
-DIST kwrited-5.27.1.tar.xz 23432 BLAKE2B c1dc0cf8835ec0077f6fdd239f033d7f4691940ba7d0e116949f1d859310d303f347a76fac0055abe693935b375c21159ebd5becf84c75d6fa9f8647c84d03cf SHA512 34c3c3b3364434a9e8867755c99f63fdfdf714b9415564e6591904fdf60caf419aa5f8f5774ffd3769bfbbca5a3134e0eda17e4e447fcf3071752805fb75f86c
+DIST kwrited-5.27.2.tar.xz 23420 BLAKE2B 77007106a2e2e19ee369fb6657d8078152adfca60fcdd8d09a7224dc98371762e5989b09e8c55d391ad31d18163349224844aa75211253c3a40f34e870ef0480 SHA512 f011d14a4ced171dc9446df40eaf4aa7c4a53813a6190c2d88486b0375b673c61fc85324f915dd6c0cd5292b47f01868b3eb12f3bc4cad45807076e8b8f8ecdc
diff --git a/kde-plasma/kwrited/kwrited-5.27.1.ebuild b/kde-plasma/kwrited/kwrited-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/kwrited/kwrited-5.27.1.ebuild
rename to kde-plasma/kwrited/kwrited-5.27.2.ebuild
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 6bb32d2d3072..73c9f29a7af9 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,2 +1,2 @@
 DIST layer-shell-qt-5.26.5.tar.xz 18316 BLAKE2B 537ea8cbcb6a98350090b2330981de3d77311a5696d06260a9e3a90ed99dce02b5d03e33953ac872250367ae598f681ee63053ac230ae4c293b2d5dd94d598d0 SHA512 d81289c3a9dffb7212d466d1468e80e99703d599c2dee4fc1f8a9a5687892d77b8df6e09ee79592a4d2bfd183e3fabcf7257a5082071ea057a306e336e86e2ed
-DIST layer-shell-qt-5.27.1.tar.xz 18344 BLAKE2B 0ce4ee8210ede2deff1f452f1d41303090d9fc307649ff41dc5a5d231052760d6acc8474c0501ca46862c040f448fe8a89b6e86f5ab0dab7716dedcf94611ffa SHA512 c8da1f2052a2b444ac267e84a4eed45beb9cbd754e9579f042c81ceeb0c0db1b963ac111951394dfbc2ff80f65751c4bf742bdf6cc15b3e0766fa5ee02578e63
+DIST layer-shell-qt-5.27.2.tar.xz 18420 BLAKE2B 5dc8c9630f255605cfc5cc5f8467b6bb272edca3e84c9856401100095faf3ca8585e80dcb4564fccd113c9d471ec1d913a55403a93abaed112fab85247929e53 SHA512 5ce3f05b05c3666cd5e957535a4c01c5b92da51e9d2341f314a11b4c9f304cd52f36bfba7e68bfa3cd2d282d35c8a650f20b7ce99327ad68191a96752369ae25
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.1.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/layer-shell-qt/layer-shell-qt-5.27.1.ebuild
rename to kde-plasma/layer-shell-qt/layer-shell-qt-5.27.2.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 029de19855ad..d46acc4300c8 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,2 @@
 DIST libkscreen-5.26.5.tar.xz 106028 BLAKE2B 67601a61a7fdb41c42b3840de29de295482eed942e3ae17a044d29a53821ebb7f5e831ca01c246d8a3f720a27d14d0580203979c5e73e3c624a416cfce458f0b SHA512 a67d1c3a9671380ff1fd0549819a599ac65f9654940a9c18b0695b070eccb9ac153e0ab81ba32e4786913fed8c64ae1754ef275e5f913c1fb221ac9ad8620d10
-DIST libkscreen-5.27.1.tar.xz 113780 BLAKE2B d41f156a2832f17f5eeca7f1c6038de8b2b25ffd405deca87f8ef8d9be6e5990c8e9575284ac54eb0041a407765875c4d4459a3cd4447e8ee6ccf99564acf3d2 SHA512 195559ce4f82b032e853317dbfb2fae863adb7f5b9d68ae4eddab908fc82b3f4ae1c8f35f712a044f8f508d3a0fdc42fd762116efa051834a4968b6435f0fa29
+DIST libkscreen-5.27.2.tar.xz 113968 BLAKE2B 63425eb56b3dca8cf32ee61a2d61a4811ee407e78ebd862c4646813811e4a6b394cee58e734ec93fbf618207c33005b71068c7485562e66db3aeeaa13443419a SHA512 7a7e39588a9a9d266eceed8a152c02614fa6d1f5ebce03f9d1af2be14dcbf14d5dbd6da9f004e280fa3284a094d9d67c951e09f841a8c1cef120a7d392527bff
diff --git a/kde-plasma/libkscreen/libkscreen-5.27.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/libkscreen/libkscreen-5.27.1.ebuild
rename to kde-plasma/libkscreen/libkscreen-5.27.2.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index d94952ecd4d1..655b9e1f84da 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,2 @@
 DIST libksysguard-5.26.5.tar.xz 796464 BLAKE2B c3e02dd6f66aec96556ae6587f55006f6efa43bfbc10ef601f4d249f41c2d5b31834795a53a7c55e5d5e3c0148e3922e81d6bebceead6da8deeadd7f20a70af8 SHA512 7ea143fde6daf141b73eb9ee6eabace8d0e5a3eb99a3b8a00ec1fe37cff4267ef20fb6c685a36aff303601b5f7c1d8c46082a542dd8dd06033b4b50a69e6d396
-DIST libksysguard-5.27.1.tar.xz 870652 BLAKE2B 0b0bb2d85693f1b47f3613bc6592322ce25fb4d4f4e2e355596ea3017d9d8bc6f2c4973121a6211d6c76574a53e2accc7570fcddcc2d523bab1070b2f04516f3 SHA512 00899b4086c744460b9f326a8015d7c6ee1ca3b94bd080819c50292cbdc90c81fa9587d1c48146846b8a52d7cb79a4f0589f591c04305a37bf7a2ef96bed16bb
+DIST libksysguard-5.27.2.tar.xz 870344 BLAKE2B 595b4125b8baf49b8de1f57854f6ef0d3880dd3eb8911ecf6b6bc5b694777e41aa3f1e0f3523c06256122ef37c606111a76c9e77de76f3268669b5a9941b4020 SHA512 0c94873a9a7dc72e012a593397a3b8dc1254e6923971d36164db7116a098612d6c6b7c69dc9b98aac7295ca16d9e604ee837a712e9aabb6a7d85a81bdfa631bf
diff --git a/kde-plasma/libksysguard/libksysguard-5.27.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/libksysguard/libksysguard-5.27.1.ebuild
rename to kde-plasma/libksysguard/libksysguard-5.27.2.ebuild
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 076984f6574e..e1567eb8e116 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-5.26.5.tar.xz 17470516 BLAKE2B 4809ad1ec93e4e6d27b17197457b76f5971ea6c74ac64f64e68ecfe828068f7f33af69bdd03411a4cd0cf8fb26080ebf9c85741eacc0e53d6b782af4eabb4b8a SHA512 9fb840d3f36e1cb25126a715d5599bf89680b0c3ff2a674f07f83246dc15358e15c7e31565d39570e33f6b4d3292822d5fdde05e4795f2eef13e1a0ff2f1c687
-DIST plasma-workspace-5.27.1.tar.xz 18626768 BLAKE2B 9562b437551bd387927a93862b985c3f6a83856e74bf17a248a927d23b0d4d115d7e3f698cfcd2e392d905cfc9723138f2fee5a2187e4fc16eb682fb9e3cf47f SHA512 eb8b3acc76452637791f3cdcb44ec77edd2e09d3f599dfaff5116471971fb0966b98d5383d3f2a1e05e1b741a348f4f254241d0fc9df26e9d89846478e4688ae
+DIST plasma-workspace-5.27.2.tar.xz 18632808 BLAKE2B 50799ad1ec647f8089b254a5402b7a18955f96164f9da899993b1e1cd1ed09dac673a11e3d746d44bda75f1d19c7b928fd080e70b3a037300fbc50760a7d16b2 SHA512 b7b6862b31f56c2c7405560ce365a54a28d88873c049c0dc972efad4f81ef2b647d8f691da5ee05b252a9daeee3e86c3b2a50aaa7c6acd6e36a9488f3b7a7d4c
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.27.1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/libkworkspace/libkworkspace-5.27.1.ebuild
rename to kde-plasma/libkworkspace/libkworkspace-5.27.2.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 323879deda77..ad11689f6938 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,2 @@
 DIST milou-5.26.5.tar.xz 50668 BLAKE2B 0b2dfde00ad8c7d5b5b12862383c3c17c485c7a256c5546f9b198e6362732c0ec553a5d5b5f6609c49ec60ade2ffdeecee972ce9c72f451c88f321e13010e095 SHA512 9ee939adf36dd9d9c180dbf1176dbd03d567d9ec87f3e85c36cfcf2b8da26039271c5f403dbf07190a57424d655f15e84ccf0b0af9264cb0d3a137077b701146
-DIST milou-5.27.1.tar.xz 56804 BLAKE2B a41456084a1bf29ba2efb974b264a19340e36afe611672553d7e04b9a986808b2e45831120e672273191ee2951b91b7ae2f79c4aa02da7e1fd3666f0f82cab70 SHA512 fc113ff25cdf79b16cab89659e605e3c1777fa0cc2652235b7521a4de8aa12650cea29f31e771cbdedc5138a79d3f9b740d316ac2485d8011badd4819cf4b094
+DIST milou-5.27.2.tar.xz 56852 BLAKE2B c8367347c034418ddf5ccd58f9aa8695506903882c7b179a09eb7f1902edbd99bc7821624c9e85d0a0f55155399762ae7db270519b033ade19f8328553324bae SHA512 f3ab8f41c1ebc965cc0dac9cbb0ebdb2be0f82656adad239016d8f44e1d893834a3ef8efdd56ed0053952f02d7b32db9d37c53e6b78066cd1b9cdec7903fde17
diff --git a/kde-plasma/milou/milou-5.27.1.ebuild b/kde-plasma/milou/milou-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/milou/milou-5.27.1.ebuild
rename to kde-plasma/milou/milou-5.27.2.ebuild
diff --git a/kde-plasma/oxygen-sounds/Manifest b/kde-plasma/oxygen-sounds/Manifest
index c53b25da0d19..1f49ab660160 100644
--- a/kde-plasma/oxygen-sounds/Manifest
+++ b/kde-plasma/oxygen-sounds/Manifest
@@ -1,2 +1,2 @@
 DIST oxygen-sounds-5.26.5.tar.xz 1896532 BLAKE2B bbada3fd2248ec8af95239a4bc1b0c3d2dbb1862f2df1a160e0d49b733ba86edf8e934262f1cf7d2f6aa40f3633db55e59ace309aad1c4b9f2e7ec533d32fe49 SHA512 41689a333767bb9547459dd8309b7d547b0a14ee14eaff59c5ba69b9b377fda0a75587a6a7c115dd2b0f18dd946f44a1f13e63fb53467d4ae9dbf6f2456fb00c
-DIST oxygen-sounds-5.27.1.tar.xz 1896532 BLAKE2B 08bd5a13182fa7ee6c2a3f3eb2287bb34c942224c0a18725be0b5fd4bc9dabb1da80afb364c4040675ea24a08bdbb179eeb35c105d2729c7a26323dcf9c07299 SHA512 a59d3542ffbcfa53b6e098de6313f5becf189e8aae2f68ce305e80f76a35f72e4a1e375d1e460374030f68032d1290eaacdf3402523ffb35f24bddbd0dd70bee
+DIST oxygen-sounds-5.27.2.tar.xz 1896512 BLAKE2B 368d056909621354f0cbf92858414c4cda7e9866c811b67c40054c64fb7693db01a255d97bc9e3c982697c65276a1a93d19834d59606fc2fd54ced19443e07e9 SHA512 e9b5dc917595d757a80009845d8024be6913a6dc98727e247d92d6969823529fe35f72677b1bc271e7e27d7e98a7dd33b8367608de5993e44202cd3ccde7edff
diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-5.27.1.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/oxygen-sounds/oxygen-sounds-5.27.1.ebuild
rename to kde-plasma/oxygen-sounds/oxygen-sounds-5.27.2.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 6108a5e3b5c4..c8c95c56f58d 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,2 @@
 DIST oxygen-5.26.5.tar.xz 2731316 BLAKE2B b13b8f2b618c3f7d8e64d4985e23e1ea22ab1d2762d4e0a587faba78a147ddaf2fab137bca1bc39f1168f4dcafdc0ac3956dcf5c007db6b983fa17a8c3f83637 SHA512 a07f099344f499599be045fc7dd418a22ed11c3cb02cfa1f4ec872016b36eb7ce06992b6f31b7f069a74452064821de335967aecbb96cdbe4c6092d1800bf5d5
-DIST oxygen-5.27.1.tar.xz 2788008 BLAKE2B 0a55a548fbe31b22a6e9992ffbf25d5a323769b49bc89325a8e70459725caaff0bc5c0092677810773841e8866127b26d4339e0dbba37e69551899b0175c0620 SHA512 109d6f6c11183b6d514a6347e2169c9ded58e7b4badaa93cbf09df0b08a6f4d1770d61a8fd3a8f69cddd6ab6ebcc8c9be5923728e85d6ba304df8a215cd57cfa
+DIST oxygen-5.27.2.tar.xz 2782828 BLAKE2B 9af383dcb034a09f9a7ce9cf37d14f4f3f6d09861bcc15dfaedcabe919cf7b83f0e9b61a99d8dc1b08dfb2f6686892656184b2150a21e2db2b85e2662f1c7d52 SHA512 94e5f0945565e819742a4361d40c4c745b3b2e3e5eb82d9d016883a74423944ea41a6d953fa85d48db0ff4c917d90b26d379cfc6d6f15f831b2efbbb32bfdfad
diff --git a/kde-plasma/oxygen/oxygen-5.27.1.ebuild b/kde-plasma/oxygen/oxygen-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/oxygen/oxygen-5.27.1.ebuild
rename to kde-plasma/oxygen/oxygen-5.27.2.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 6d008820dbcc..e0d247318867 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-browser-integration-5.26.5.tar.xz 237984 BLAKE2B 7cca3fb78d3eb85deb1227aefd348c77a13bf8197e8e1cc47331902a3b184cfa225b519e4bfc0a69e5bfd06d42375e0a48e0a5755d34d4eb53c9af064a9cb1d5 SHA512 cddb7fb164469b84989f4a22290818264087c90a8d5d9b1a71561566c72358a7930d44d961758c85cb52670b680dfe48b4a331cf9f8aa616f91d2fb5204ef56b
-DIST plasma-browser-integration-5.27.1.tar.xz 211036 BLAKE2B 76abd4ad2dc641efe19c77f79481c7e595ad26fdb9eab684b2c71309d8c709ecbba88fd9fc8319a3228bd257e1219cc0a5db96996d0bdcf5657646fdfa8bfd48 SHA512 c63bc07dacdd6334c1b4971bfb1cb838aef240251f4423ed0032740976c5cef333727ddfb6ccc45bce6b4bcc7f6b9d62e18c2bea2116163270ba153d71da1ba4
+DIST plasma-browser-integration-5.27.2.tar.xz 211024 BLAKE2B e23a8c174169660ea552b8160f3a6c11f0471fe96e5dfd435e3a103fbdd7f00171ab6a4ba7bedd2bfc8a36eb45612fb69fbdc4fb1797174cc7034b5e87e8aa06 SHA512 e38dc6ab91295fde5ada42820872a06ef1b83d18f95f6231386104313f516a1b2a4a3d4a4c3692699acb86241cd59ee2b30b8701778bc142a94fb995da19d92c
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.1.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.1.ebuild
rename to kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.2.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 76af7caf6312..92c60cd86871 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B 093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce SHA512 6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182
-DIST plasma-desktop-5.27.1.tar.xz 14327032 BLAKE2B afae3fd93fe5a0bdc238e401f287f0fa70004ed36163af9db873b131839ea792a06797897e052dd9a174a96ce957d3d35b8f1096e01aee2b34ba1bb687dcf30c SHA512 476f696635b9f52a2f62b53a3abe5750fb9704c077f905a493669a592186c3bbba531983cf07415a00d6441bcf267723fa7215c564bf2f254bedd0920fc9b845
+DIST plasma-desktop-5.27.2.tar.xz 14328460 BLAKE2B 5300d526ed97b940302950c324c3e7fb549b38a3372ee54e86f67e2faecc67615e57e04cc72f983637da7c9be8ec227b5b1f2019e4d654670e9051c58f3152eb SHA512 adc9d4ba9dee1749c0ce63b920d5f3346fd2d260c4253457f5ea3aa79fab4343b7b77a8d05923e56c3f50987a4f734e3e2a4329d9a80608fb0076bca4c3de98a
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.27.1.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.27.2.ebuild
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 477ffd2f16de..3bb04c003951 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-disks-5.26.5.tar.xz 92236 BLAKE2B e9acfb767e5a68fc3eb9f15756a69481cc78d92eda96f2abde4ef1ff48ee515bb2c59fa760e4579d666b4f644cb56769af13c587a5f70187790436a63b31cabe SHA512 38f6d6ff1c70f46d6175ea48d205f79e4dc368fe36593717a1e09fe6ba089d4c42687bc108f20bb50a89dc70e9ae505deda51dfc1566b1da044c83c1973a3e40
-DIST plasma-disks-5.27.1.tar.xz 92464 BLAKE2B 5f4ccec35ecad83f065819484294fb1bc6e67045287f9e33346435e655f8b16dca7449b3b8a30b7df1758e9877567299206835417f86029d8db9a9ce613194f8 SHA512 e395d8afb80308d86de04671c82a8161c803cd447a63895dd912624ada08fb217e196bfba0ce33f562c270554620ed43baaa57b724cd21e889795f2fc6395381
+DIST plasma-disks-5.27.2.tar.xz 92480 BLAKE2B 1d1f27ba353af9f7d921fbcf89b0462e59e79c300a72a31e105af9bcf9ffef524554fa2de50d96e7a2757e266b372073ecc29b5ddec476732026ac7f5fdeba38 SHA512 f0ed46bac31784b959e60bcb809cff26cbb8ae98e75fe68bddeb5f869721125414a652346acef1e12337a7c53f6b75092ff4459ffc5ec2cf2924fbdc71cc8df6
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.27.1.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-disks/plasma-disks-5.27.1.ebuild
rename to kde-plasma/plasma-disks/plasma-disks-5.27.2.ebuild
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 0873c5c68125..b5cb1c0e0c96 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-firewall-5.26.5.tar.xz 358560 BLAKE2B 5a5a15045414879bc155eafdec60941ba62559129cad5eb6b026e98973fa39ca7169e599190e04de5f9a7097727a98283e810f046265da122fd35f87c2be3659 SHA512 cd9ec0eef5511cab11211aac2ed14b593638386d41ce6e378053699418ac8c4698aa42d637763dae56668a794d1f877213a328dee86fe7777b909b3932bfb755
-DIST plasma-firewall-5.27.1.tar.xz 361820 BLAKE2B 5c134be4e1c074860c71254487dca955b04c1f732559463babee9d00f06415788a26639fd1831ad9f741add18561397609648cb0158272c429b73b1b607abc5d SHA512 eea2b8dc14102830206d0c11ef1927f7e2f10a864f2619f452c09f9ca83906d93607dcbb664a2010b7d38cf5236a6276d1fc54935d2f68b651a5eac67af0d4ea
+DIST plasma-firewall-5.27.2.tar.xz 361836 BLAKE2B f04bf599dec7d2c59a9e71f041881742750da0f5b8bc915d5940ca1f7fa8a6cafa3c3ed930b1b20b1335d609de0e43ebfa3c27f00ed6119b66f2cf84e570f269 SHA512 319756948adb4f8bd1eb93fe10c6b18afa9efb4938a94a8e6369c0f1d382bdcc9331b7d05bc9c26e60e7404f576d75d560e2039463e340a61bb2c49b6c42daba
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.27.1.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-firewall/plasma-firewall-5.27.1.ebuild
rename to kde-plasma/plasma-firewall/plasma-firewall-5.27.2.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 790bbdedddd2..eae470861446 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-integration-5.26.5.tar.xz 88928 BLAKE2B 47366792a1b53256686f28bfa3e510e11e359354f8e3fdfe562026ef7f8e88a05c6df88c8dde0e5e064eb2bac01821f41bdb7105a7af855de721561d8470b29d SHA512 9dea235efd85fbd7b7de0fab1af75f801ec7c1faa4621264512a50b754a92392bd580a70da44e2a6854eb8f1d4869a1971c91b581697ed5345609c6cc2e00f7b
-DIST plasma-integration-5.27.1.tar.xz 90436 BLAKE2B 7f564621a4a682bdcacfdf0ff618bb42c49c43a4263d1e039ad2fbeab22d039c27f6290bcac1fa0b02ceac162a180d6183c3cbc2a810c7f8c4f46fc6d563cb74 SHA512 5d5da8f519bc0ca4ea93400429cc3069a3793e54664c36e2cda8ab4b304c3c35b693f8a6cc4b00502a31444b4e92336cebae0afb1877b2a4a98ac3cb112dc282
+DIST plasma-integration-5.27.2.tar.xz 90412 BLAKE2B 868bf576db86e7c65e86e735cac327f6f605563133384addf141d1f626c851796e61a8eab6ea50d9fc447d835dee27687cf9fb27eecb42cdc907e7bf561ec892 SHA512 b6e253a3e0658dd92fa63a222429e339787823c048f690018c2f5c63a5b0310d74830e083b0d63ae20ad1e2ce0b9a45cadcf06b70a790277626c78da9d1d485f
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.27.1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-integration/plasma-integration-5.27.1.ebuild
rename to kde-plasma/plasma-integration/plasma-integration-5.27.2.ebuild
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.27.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-meta/plasma-meta-5.27.1.ebuild
rename to kde-plasma/plasma-meta/plasma-meta-5.27.2.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 9185c6658a03..23c9e50a9596 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-nm-5.26.5.tar.xz 972940 BLAKE2B 4f10049a0a946b67fd0638913c365558a8e95b80d1d896323f4030738f8dd4d07cc77c4aaf212c52d8ba89635d932369d2f69e134722d24a5eed41841b15409a SHA512 bb17b06de15cc5b36d1eedd4fc8551eff240f8e61a4a036450b2365c99eb5885adc9541c29aa95b311d79d57b62ab95f41b746402cb6de7ecee6c6c4e87ac9a3
-DIST plasma-nm-5.27.1.tar.xz 1148268 BLAKE2B 8a09fe6b8b0e623813c75930ea2a3557c47c7d209654a32db7b93843c885803e17b1fb17fd4b66d2803bf3ebeb62732f36bb089c605e0f16ddbad9288cc16c00 SHA512 d398da4aa538ad0c9a2b1e66734c5909753cbd58ca8a10c2a9c02facbb8efcb16640bc5ae68dcd93882821f7b57b086c38a4a6569e388b652090126841c66317
+DIST plasma-nm-5.27.2.tar.xz 1148676 BLAKE2B 9982c7cf343df1ae32d8d78abfa15fdf4c729e8c1b22cbd0310802e26c8adacdc9c37e1f9698ecf06a1cd90f689bdb72208f3634764f27ab0128c78ca09a77b3 SHA512 134f61e193632d301d2b3fbb7a215741e0ef3588df0f97e0a69fc26a85961ca79083238b2f952681e98e971e0e350e10827f910efc90618021d4bdc84d4b3c7b
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.27.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-nm/plasma-nm-5.27.1.ebuild
rename to kde-plasma/plasma-nm/plasma-nm-5.27.2.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 714c4744fb73..9dc10de1fd29 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-pa-5.26.5.tar.xz 142680 BLAKE2B ea94c9e3440803f96ccdd3835e24d776851e30aef3b78c3c5b810ac00a8ec540679d95e83eb7559f0e89e7efff510aecaf8b193d86f5ac57de5805809eb1975b SHA512 91607057095e77b320978f44766a2d71fbd4c7cac6291052099a90b6f527f2a2bb5db5bff2af117708a22aeaac669efbac9720f8065778a909c4dc1125411f9d
-DIST plasma-pa-5.27.1.tar.xz 161736 BLAKE2B 58d423df56b9663f4c63262a752306c83ff42c2534b582e9de0a8b543ab897ddc340cb0cd2d97297015dee8b51ae5a4edafaa26fb953f0eacdf5226aca8af7c9 SHA512 7930c3fc56931e7512c56718c3b97b5127eb033a0156feefb14a2ea3a409eaa9a93ed0583f875e4519606ebea9c0a501776487a32a903c0efc568c1d4122a4f2
+DIST plasma-pa-5.27.2.tar.xz 161852 BLAKE2B 7ddf828ab3ff73adc39e026d29d24bc5d02609506298c3fe369b8e11492aec029e4a859203ff57fa39a842795bfd107354d5163863d8662f780aad8f7306dd74 SHA512 10aa6d543d767a270b1961866b8d3b8881fdedbded7580be8ffa201b66f5af6a8ad94c9e7d542229241cc69e302d6d45de249247b6afcb149c5df50aa5fac47c
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.27.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-pa/plasma-pa-5.27.1.ebuild
rename to kde-plasma/plasma-pa/plasma-pa-5.27.2.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 0d5234543d35..499b9298c2ad 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-sdk-5.26.5.tar.xz 274576 BLAKE2B 5752c9c8be5ea7a4e07bdb8f134ac3280bf90e38339784426e47e10784d7905bf6f516fb081b82279f8859f296247e3512efac7b45ac245a47e6b6e12c5027a8 SHA512 0757fb74770356b44f86fcdb3dbbf5cef75f80c3453471e42f79b974375099679cf87190509ab6af41d30d5236da4dcecfbd780695f0506e86c32981923f58c7
-DIST plasma-sdk-5.27.1.tar.xz 319540 BLAKE2B 0e4428e283e22571db46bfdf0c29a5ba399cd01998b577e193075ddfb574b5ef041fa9ff6ab8cdb07f4dc799d54645e0350a384a99da8ffaf2df01dc76fdbdb9 SHA512 f87f60bafaf5b140a52d0ee30675b4080eb632ccd4c07e158547e87ac20840102653efed51fb1a0928e8607c37ddf9fce74d74331bbe7bb55dbca8d462f8ab46
+DIST plasma-sdk-5.27.2.tar.xz 319936 BLAKE2B 4912545dbe150946d0841b95f66edf2e16df8d50f7727c42ab6a1590ea14ef549f807594f67e0635b0d70bab680a698a243415cb68d91f8480324a3631175eb4 SHA512 17523ff97b15e92eb55a4fbbe1a3d53a1b343134169e1a852d37d36f413766e411260b35f31a75ed0b1b1159da9ab6164fcc7bc5e00a45ee78abcf8d225577c1
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.27.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-sdk/plasma-sdk-5.27.1.ebuild
rename to kde-plasma/plasma-sdk/plasma-sdk-5.27.2.ebuild
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 99cfd3c54d18..8e8975ef6691 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-systemmonitor-5.26.5.tar.xz 168500 BLAKE2B 26e5407bf29cc6fe5e2b53184ca983f63226acd6b4ce5f92bde9b5065b3f96a1a092ccfb133e9e1dc7f9277e52fb8756dd5fe620cfe0814532b8d4aa843a12da SHA512 bd529d94e50cc7fecd3ffbcfe5401ab6d9792e4e1174651c877cb433dfaeb1fb80e1c9db4d146f07f469856ee09de74e0c57c7c193c39993a2c542502c53578a
-DIST plasma-systemmonitor-5.27.1.tar.xz 171428 BLAKE2B 49e41072b0d8e3d39fe3fba013e8532e08e6d98db482782143a4a6f759a0f008a21f7277d40fb277aa817cefb38fd0479202a1009c012d9766eae286d33537f0 SHA512 5e372b7fc4736f99fcb81e729a389d42fa764a9029bbea107fd448af1fdac8d534926cd2dc72ec3ecae03629d564269b2005a26d979f0ac9be183b24f7fd3f18
+DIST plasma-systemmonitor-5.27.2.tar.xz 171408 BLAKE2B fdb39422bd94ad3133da603a9819daf3706ac20d7a9b0e225b86e9f9dc2b4f4bfa0392208b364a468777f1fb4e987ede442cb6eff3d16775c15efb1af4d24383 SHA512 a5f10865fadd1c724ed61e46424474b1f8aec320f559a33425fb8817917906a1645a4fff9511f878c83297fedf79abb2252a0a8ee5bf5553eaf6e653661b956e
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.1.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.1.ebuild
rename to kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.2.ebuild
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 7925e50a7c39..6d41163b46d2 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-thunderbolt-5.26.5.tar.xz 71912 BLAKE2B 40546213181a5b426aaf3bbd03f1a32a3a7cff70438acd1130a2cba364375b3803fb7eeb0da8c0e8489d5cd49881ace39b3ce10eae01cb18fa51ef612f74d2c4 SHA512 182fa9df929eeca0c3fc3960f731c120e4a09fbc4b42babcc1d99374440b8bf32c564628c58fa5492b5ec9d8d50f98160c845d48e3215846e5ca7385256a783b
-DIST plasma-thunderbolt-5.27.1.tar.xz 71824 BLAKE2B 3a369684ffdbd4e22b9fca9111cd52cbae00212c5c219ef6985b0b3cab3ea830eacb469cac2142eb19a27c77fd94e1064d8b0b749739e2ca0f211cb3746b6934 SHA512 5349091b46aefb1aab3b1421431b4da45eb0e8d02dcc9afe0fc9497a5f120bb5d7e706e2c93acbc08e7eb532dfea8ae80f6638a883e3af07e713d3590195f2ee
+DIST plasma-thunderbolt-5.27.2.tar.xz 71824 BLAKE2B ee7a977cdccc14cbd85cfc96b529f6d9a9c84dcb9ed6b1c7e6df19d96adabf91a00ecac93550cbc5c57d782b6cdf61db42dc150a27e698a2c41a7eb2fb6f221d SHA512 638b6d85daf4528e624a6421b5bf63da586a870626f176df5a1308441fbeceac79d497ba366522074db41d1906b28465b1d9ed4aa2b0a8ac0ad9d7b8d4faa288
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.1.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.1.ebuild
rename to kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.2.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 9eea4e9ed6d8..cab4cc9032ed 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-vault-5.26.5.tar.xz 186448 BLAKE2B 648c6f8a42df1dcfc10893a9ca53189f6fe87fec1848b2b5af372c8039a582f79880945b62ccb19cd387417d1f276b69d46bec38ef67683d04e0052273173ed8 SHA512 86c7806363683331d81bb4a207beaaa65cb45280a5fbfc76b0d70dc1409dec8a4b8baf79856069e6ca31947996a6450835f73cce1704fd4612c0d15cc95f51d0
-DIST plasma-vault-5.27.1.tar.xz 186484 BLAKE2B 8aef51ba931a430f0d045cc011d6ea6b0f745efbc976c524e11d37ce48e79567d27aa9920ca68d2304519b0520530278ba1e15d8109b48674248cdeee062358b SHA512 b5008bc0156cb8fa8230e1861f6672e9fc0cffa8f18cb87a49a8d396a9e84efd0b14ba20a6faf56b0e5013be66da74fd82d2f7ce487031e2b4ebcb5b66a6c4e6
+DIST plasma-vault-5.27.2.tar.xz 186488 BLAKE2B fc748c33177904d15fdc3eee1bd88c9feff0f676ec5b6ec29a5d68ec6a83f1447c9e9167e08c8e3602639a258df1dd5f0d70347cc89b367660341c411d8c7cc2 SHA512 424a1136027eb7b44bcce790494a8028901a122b57160661c869789a3118fe5dd0e2bc9df0fca5b648ed3571a579967b03dd59155f38266bb0b7e2815fe03333
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.27.1.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-vault/plasma-vault-5.27.1.ebuild
rename to kde-plasma/plasma-vault/plasma-vault-5.27.2.ebuild
diff --git a/kde-plasma/plasma-welcome/Manifest b/kde-plasma/plasma-welcome/Manifest
index b4af5c5d3baa..16830a18b931 100644
--- a/kde-plasma/plasma-welcome/Manifest
+++ b/kde-plasma/plasma-welcome/Manifest
@@ -1 +1 @@
-DIST plasma-welcome-5.27.1.tar.xz 814556 BLAKE2B fca893f6b1974f08587361f43486bff2a2230276b36e6c0ed2ff0d2dfc85994ca50cd163abd10d8b405fe43e7a10a652c9e0d1e3d89a2d6dcf1662b91a82898d SHA512 a620aeb89c36b6ca53be9cf5a85741a7cf2f67d273d532723fc5891825c5755b14e36772675c9600fea5b041ba4090dd77923d7dc380578d6b962fe5facd71bb
+DIST plasma-welcome-5.27.2.tar.xz 819128 BLAKE2B 701abdab3d51c8637e131b810cebe3c405321fce8549007f447b4e30f598f9f2b389c2ac9615f720a7f1ddf4c7c1547d8777fd7979a262699d9746f602103797 SHA512 7d31baecf4fd84338af0ecbbc9eb04418bdf794b7f6a769a9d4a58b0f76b2b2e8817a6bf42713e35619280c72981b1198bf16cd1eb228b362e93a7eb03b3c544
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-5.27.1.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-welcome/plasma-welcome-5.27.1.ebuild
rename to kde-plasma/plasma-welcome/plasma-welcome-5.27.2.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 9f125ff6c839..b37a50f73f64 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-wallpapers-5.26.5.tar.xz 84793540 BLAKE2B cc78540f5003f0d59ed55dbe224b9b00212d146e5cd0ba9a92d79e44e76077161ebcd2dd998009ad51a78d9f0475443d581f90bc8f990f45f3fcbc89435d8ea1 SHA512 e2c1f765c1f163a85eeb8716009105a2ee6d8837966a1fd37195f9e39dc873ce6267357c25f081e87041158a17d79e969ad2085d64805ee9267fd3cae7e65a77
-DIST plasma-workspace-wallpapers-5.27.1.tar.xz 94032352 BLAKE2B aec6e734d6f369581412fa3bba1f0da54cf6d407f86158516529e98ac94e99d9a4eefbadc221b07fb6da7e5c267c4ae3ba2f7ae14484902286733a4f3934ba1b SHA512 02c14d54a444948adf362289dc64f2659a035c90f8bbcf046466c6368c3ca2dbfc15ade79e6b04671037afc08d92522377a434151b0f83ce7cca27dcc62eb08f
+DIST plasma-workspace-wallpapers-5.27.2.tar.xz 94032072 BLAKE2B 08ba1d34ef22d3967a215be5116b8ddc1568b800f8629d2f6d0620b95368a201ee613976030d2eae44100ac533e9e0f6d22b667db258c6aeab801fbadf878275 SHA512 831006dbb98e453ff6a973e6e2ce7a63e6eeb17e2f2bd852c8ec169063644727f960f71cc798d78c311cb8e76862c64ec8d03245a6eeb004ec331dcd6b311e06
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.1.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.2.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 076984f6574e..e1567eb8e116 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-5.26.5.tar.xz 17470516 BLAKE2B 4809ad1ec93e4e6d27b17197457b76f5971ea6c74ac64f64e68ecfe828068f7f33af69bdd03411a4cd0cf8fb26080ebf9c85741eacc0e53d6b782af4eabb4b8a SHA512 9fb840d3f36e1cb25126a715d5599bf89680b0c3ff2a674f07f83246dc15358e15c7e31565d39570e33f6b4d3292822d5fdde05e4795f2eef13e1a0ff2f1c687
-DIST plasma-workspace-5.27.1.tar.xz 18626768 BLAKE2B 9562b437551bd387927a93862b985c3f6a83856e74bf17a248a927d23b0d4d115d7e3f698cfcd2e392d905cfc9723138f2fee5a2187e4fc16eb682fb9e3cf47f SHA512 eb8b3acc76452637791f3cdcb44ec77edd2e09d3f599dfaff5116471971fb0966b98d5383d3f2a1e05e1b741a348f4f254241d0fc9df26e9d89846478e4688ae
+DIST plasma-workspace-5.27.2.tar.xz 18632808 BLAKE2B 50799ad1ec647f8089b254a5402b7a18955f96164f9da899993b1e1cd1ed09dac673a11e3d746d44bda75f1d19c7b928fd080e70b3a037300fbc50760a7d16b2 SHA512 b7b6862b31f56c2c7405560ce365a54a28d88873c049c0dc972efad4f81ef2b647d8f691da5ee05b252a9daeee3e86c3b2a50aaa7c6acd6e36a9488f3b7a7d4c
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.27.1.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.27.2.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 89ea2ebaca37..41d5e1b3614f 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,2 +1,2 @@
 DIST plymouth-kcm-5.26.5.tar.xz 44028 BLAKE2B d02d378b930a2441f797be6c93669fbc4d13c673ec73c7eba8e3b02a8b54bd84f7fe32b0824f1910ac74343ddd113ac3dd41e68becfd3f77e3e2eb02e315adbd SHA512 c7c1ef4032b855846fe26a0c3be98835c0b9f3866612092ce6c07ae50898d99c3d988b0603df4305e484035b535e1991f5425bb99343e177fe9764c1ebdcfdc7
-DIST plymouth-kcm-5.27.1.tar.xz 45580 BLAKE2B fb53a22466155311a112f4f7e5447a652cee0b23f3c34b1504ae5a96c5aaf69a51a05ae3100168b5b810df0ba183622be4d46dc632e1601a5df5d4b2caecdbac SHA512 84da120f17dab3fecdb06b87aee82d02b150e847f8c061346b1930433d74b3e02fb5179deea765cfa51087c678a2931938c8bef5be82c54be94a7ea528a557cd
+DIST plymouth-kcm-5.27.2.tar.xz 45560 BLAKE2B e1d22218d2a11faa2513c7e0907c70710c28ad90da790772fae94a1b0c3f9e777ed3cbf2c6c6440c7ad7f9fe8973cab502e494bc0d79d2e084f67a896c32606c SHA512 51cf21dc2e68d6b46e6ff6e819e50a6be56149242e92145eb8c612b41ed2c8e232d78e745ee4861ffe64c5bfd4ecd36d49fab58412904781fc71912a336b0f20
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.1.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/plymouth-kcm/plymouth-kcm-5.27.1.ebuild
rename to kde-plasma/plymouth-kcm/plymouth-kcm-5.27.2.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 6536b78abe42..7f69b91a7667 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,2 @@
 DIST polkit-kde-agent-1-5.26.5.tar.xz 49776 BLAKE2B e0727510c9fafeaede0043c9861a1429adbe219564bf652a53e026641b8583d8669eb21e42aa35a2ca2666c302a5b25d4bd36a2874cb19a2c9373006c490526f SHA512 9e25925701b1c1167c0edfa58fcc749ab3120535321c4a6594de909b9e1d8323b677303e863c8c5babd7d5dfdca4e0dd2d1673ec7921d19ac4fca4069de9fd3b
-DIST polkit-kde-agent-1-5.27.1.tar.xz 52448 BLAKE2B c2a131ed1f8ec0ceb89e798a7ea53c37c68cddf4b1944aa4d1f8140597a82b5c714083a65f7ca925fe5e57bd165efac0b53d3b198f4005aa5a5548de187a01be SHA512 ebfc74a9a11a48953fcd67c3e6810da5d72efbc015c7588f6fda3832e5d9a6cf6dd174ddcc35ea1aafb81355034f232ffd9cc875ad70665e46c69838bd87a372
+DIST polkit-kde-agent-1-5.27.2.tar.xz 52440 BLAKE2B d0fdd2de611c42234ad9ef75bedad3a268a6d599346503580ca86ac1cc267954c38f653109ecbb62b1baccf84f8910e9a847736deb4aa551e2fb10ddc589bc32 SHA512 028989df107939b6092b371090c6467ad8d0367a6c9f53f84d9bf616fd8d654624b48352cb6e2f9e0b5c2d6bc2af9a8291caf16872b12ec20fababd9c9663472
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.1.ebuild
rename to kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.2.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 2bff9c66fe88..2fd67bc41616 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,2 @@
 DIST powerdevil-5.26.5.tar.xz 642792 BLAKE2B 978f9aa0ff88cf0b9c9713917f88da5434a87d919b629c7302fe8213a4367fec2e5a3f30dde7c860c76f46126330c3609c0406a33e96309d30256c81628a55d9 SHA512 213bbb4baf63e35511355c1005e39f416f467752d881fc1e48068ab5d34faede0e00597bda1e36053706236202385c976ddf63777fe8970494885276b6ce44c3
-DIST powerdevil-5.27.1.tar.xz 785372 BLAKE2B f70adfa30743f1a7a50e31f8ed7b2f559de629ed55c3c01681575e98ccbebb18ef4a7c29de7fd8ad8f64a744a949f46e1caf840c709e4f93ea4344de469757a1 SHA512 7250e8546eb11bf9ab9531db84580ef125b18b4dbe09ab9eb43a7cdbb53a95a2a4d7b68cd114f9c9c747ff410ffb1e9537d6ce3b0d423f17d864ef43e057d7ae
+DIST powerdevil-5.27.2.tar.xz 785352 BLAKE2B a4ab588ef5a35f86794030f61afd26d8ebd8ea512037283c3f89190c6506601913be17605b7c5e2216dde2e247ea605e738963b62b13d14c9b0277e9b20a444a SHA512 e8dada0ed01baba6a1f8fa07305ac457d8ba15f0112234c0f162e7f995c55348499fbd954418fc70a64cbec20d10994d670cfdcaa11f49d5c0b47a70675677d1
diff --git a/kde-plasma/powerdevil/powerdevil-5.27.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/powerdevil/powerdevil-5.27.1.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.27.2.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index ebf6e25128de..17cde051c996 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,2 @@
 DIST sddm-kcm-5.26.5.tar.xz 82944 BLAKE2B e09347c9efe9f0fdb838df3ae225936dbc6f481dd6941f987632da39fb2e1ebfeb920b51680cb3b0da17811c8879deae8e7b95371f81899b03c6a40ff71ddeef SHA512 4173ac8c6d8ea407360f00b6688551221b36180175863daa6186908bd5e1bf987e3759c76dbd05bfeb274bebd3df00ce4ad86fb50366b5113480ffae8bea30da
-DIST sddm-kcm-5.27.1.tar.xz 91300 BLAKE2B f1e8f0ebb3704a4690fc9c666fd064ba358e188487095a0e0f33c0764c14f74d8a1a2faffa614053312c54d6c8fec4420b12dc49791c5523dd767dca6c1cc8e4 SHA512 ce1f2b139e837985298e14bc24295a341c26fa0640825af91cc377eb29d65e656c57ab636ce50dc856343237b8c78db071606477166c3cbec81f44c72f6e2410
+DIST sddm-kcm-5.27.2.tar.xz 91304 BLAKE2B 6f9a307233f2296fe9ec00b7637461009e546f83fc683dcd1738ac9d1ae7fa02e4e1559280b449e7c36e1270a56e246ceed31ef991771efe59ee2e5248d39f13 SHA512 c0a5a1c79fd47aec289b71c56c063854eaa4dee5c1338be3924ddb3147b4e9132928d32860c76b7c22730bd057b240d305135d49d96807adbabeb5195bc29367
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.27.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/sddm-kcm/sddm-kcm-5.27.1.ebuild
rename to kde-plasma/sddm-kcm/sddm-kcm-5.27.2.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 345d12ef127b..decb47933484 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,2 @@
 DIST systemsettings-5.26.5.tar.xz 205752 BLAKE2B 2e58bdac114de8a20705eeff4e41efdec75608f9fa845c17fc030bd9cac50f0a0aaa4acf7f1955daea055c7b4383177af3634463c8f0c184917e2fac0de8b465 SHA512 1a231f2f74da6486dd36841fe7c5e7b8bfc731e690be95f4d78be3f7f1d7dd613e5d03de392e0b46eb6aff3109762321816c1e1b90b575a99ea8588cf9940e98
-DIST systemsettings-5.27.1.tar.xz 223240 BLAKE2B 870ca140d490fb81de493323ecad966118d1ab93c0fc344654829be8e1b0bfea8876e65d72e608a9b930a3f4dc6d03b1b860d721dfd6b80d7898b266e4fba0b0 SHA512 eb3f6b0ebdbb2a451522fc0b576adfa57070218ec96f2f751b6345fc709fa6db9919f7afbd1afc61b8ab126a1687197f086ea14a728c0418b789a7252414e862
+DIST systemsettings-5.27.2.tar.xz 223384 BLAKE2B f1c83c325dd16a231c737a462ed987faa3b4eaa2b150a9713868381eb89e316df7201d62b3531ca59e29c512f18183a5cad97c3f70ec040b53d5769ae6fb86b0 SHA512 bc4da600913b9ba3389a3527d690e606669870b5a0742d125bc38eef3c3a2928f84af1fb7965a3bb440653103d90420c268f9441dcd68ca36f98c9bc27218b73
diff --git a/kde-plasma/systemsettings/systemsettings-5.27.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/systemsettings/systemsettings-5.27.1.ebuild
rename to kde-plasma/systemsettings/systemsettings-5.27.2.ebuild
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index ff89126a8099..745758962dfb 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,2 +1,2 @@
 DIST xdg-desktop-portal-kde-5.26.5.tar.xz 110164 BLAKE2B 0eff7ac5fadce31831b9479fc812aede2f540917b186da0c71f9e85a4277923fd39e68ff4acb488772905cc296644b7a5e2f8c0fa12ef7e5cd7d5f7ccaf843d8 SHA512 d79ea70b476e08e0ff554e7a9b261abca21b07a177a576cf4c6e8d36b08dc8f48f5ccebf25d72b293439fafce53ae29e77b6289fce1ccccfabe69a5d21f6389c
-DIST xdg-desktop-portal-kde-5.27.1.tar.xz 134372 BLAKE2B bca018865d570f48917df6c5a1a73e8014925178318d65cc4bd85d358e3d8af3cc6de1250d78b9817e84a3cef6ace33962b44081b96e3b57ed0a70c0ebbfdcbe SHA512 92e16476301f1438d1ea367506a9526cf3b5114141965e1614493f8b7f6a866fc32f8761bdf6ca4c162f2823faaada5e18a2111d8f6d2a0dca13fae1e43aebfb
+DIST xdg-desktop-portal-kde-5.27.2.tar.xz 137396 BLAKE2B c2c0f13ce5615d4d6892cd087a8b44403f24d33e654f39cc50bb8488f6c46c3514b07db37036998dccd8dc6fe19833c5d3097184f7c2168132ac5dce4be160e5 SHA512 46c56ae5f5cc7c3c265eb7b58d2e658f93bea9374ea56d9605f47875ceba91da610b4b6a152772e9f2fcd98fc3d38b2dbe04e8b62efa1b70a5ea28aebe6da853
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.1.ebuild
rename to kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.2.ebuild
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 076984f6574e..e1567eb8e116 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,2 +1,2 @@
 DIST plasma-workspace-5.26.5.tar.xz 17470516 BLAKE2B 4809ad1ec93e4e6d27b17197457b76f5971ea6c74ac64f64e68ecfe828068f7f33af69bdd03411a4cd0cf8fb26080ebf9c85741eacc0e53d6b782af4eabb4b8a SHA512 9fb840d3f36e1cb25126a715d5599bf89680b0c3ff2a674f07f83246dc15358e15c7e31565d39570e33f6b4d3292822d5fdde05e4795f2eef13e1a0ff2f1c687
-DIST plasma-workspace-5.27.1.tar.xz 18626768 BLAKE2B 9562b437551bd387927a93862b985c3f6a83856e74bf17a248a927d23b0d4d115d7e3f698cfcd2e392d905cfc9723138f2fee5a2187e4fc16eb682fb9e3cf47f SHA512 eb8b3acc76452637791f3cdcb44ec77edd2e09d3f599dfaff5116471971fb0966b98d5383d3f2a1e05e1b741a348f4f254241d0fc9df26e9d89846478e4688ae
+DIST plasma-workspace-5.27.2.tar.xz 18632808 BLAKE2B 50799ad1ec647f8089b254a5402b7a18955f96164f9da899993b1e1cd1ed09dac673a11e3d746d44bda75f1d19c7b928fd080e70b3a037300fbc50760a7d16b2 SHA512 b7b6862b31f56c2c7405560ce365a54a28d88873c049c0dc972efad4f81ef2b647d8f691da5ee05b252a9daeee3e86c3b2a50aaa7c6acd6e36a9488f3b7a7d4c
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.1.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.2.ebuild
similarity index 100%
rename from kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.1.ebuild
rename to kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.2.ebuild
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index a913ce458be4..8f568b0fa3fb 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/crosswire b/licenses/crosswire
deleted file mode 100644
index 4bf2fcbad126..000000000000
--- a/licenses/crosswire
+++ /dev/null
@@ -1 +0,0 @@
-Copyrighted. Permission to distribute granted to CrossWire.
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 5492936b9792..4e83195f9d39 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index efb9d020ba31..b80a3e3d3d7a 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -117,9 +117,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Don't use libsoup-gnome (bug #565924)
-	export HAVE_LIBSOUP_GNOME=no
-
 	local myeconfargs=(
 		--disable-bsfilter-plugin
 		--disable-generic-umpc
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-102.8.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-102.8.0.ebuild
index de0ca9a5b7eb..111a1c0c3750 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-102.8.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-102.8.0.ebuild
@@ -320,6 +320,8 @@ pkg_postinst() {
 		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
 	fi
 
-	optfeature_header "Optional runtime features:"
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
 	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
 }
diff --git a/mail-client/thunderbird/thunderbird-102.8.0.ebuild b/mail-client/thunderbird/thunderbird-102.8.0.ebuild
index 558c9b798bfb..c41d696dab90 100644
--- a/mail-client/thunderbird/thunderbird-102.8.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.8.0.ebuild
@@ -1171,6 +1171,8 @@ pkg_postinst() {
 		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
 	fi
 
-	optfeature_header "Optional runtime features:"
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
 	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
 }
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b5450555989c..89a06a82ca10 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest
index 62b8a02241b7..ea73949011e7 100644
--- a/mail-filter/courier-pythonfilter/Manifest
+++ b/mail-filter/courier-pythonfilter/Manifest
@@ -1,2 +1,3 @@
 DIST courier-pythonfilter-3.0.2.tar.gz 59121 BLAKE2B 6223ddd62c1c1af980720451e3446cd3b2296a243c5c8d3b5e60fd8640e3391ba2e561ea251bbacbb4a1c6cdbe7eccf6f7ff8221d952cf5703d389b0267a1a2f SHA512 62985a3fefc2d324b3ba7035117e88e4e246815e63fe1b681af11a38a20ea55e649a233c1979b918b166f5c2abbcc22037f215b73be298763f777648249cd652
 DIST courier-pythonfilter-3.0.3.tar.gz 61994 BLAKE2B 286e9b9af580512080663cf392d9ebbe12bb35e527e3b8ab5b2c10109049d7dd3ff227f17cce126f6fdf7cf4053b163e494ad23f4260a3778a5ed58af5b50f0e SHA512 0dda245f634a181a363e99be0641c627f778d5c7d3dc67c0fab27a6471d5d4a76d24e371ffe72456653875ffcae58eb423f5885fd483d5882f0dd75be5b946ff
+DIST courier-pythonfilter-3.0.4.tar.gz 63336 BLAKE2B 0a002b68a1828d20258f7671bd91bded3960e1b60cb00ec80ca43fcb783729509c18b2603fbc044649b2514a6911b71b369c0525c87a47719b5328dfd78dcea2 SHA512 00b08b607ed6c613a5a010855c34580d0ea22e11e6ca9d5f2a9806c9f1f9cce15d32b66822433c29e23b71b955da18fe63bf78fb6240e6e6f026a27f52c2d86c
diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild
new file mode 100644
index 000000000000..074fe41d1cd8
--- /dev/null
+++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYPI_NO_NORMALIZE=1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python filtering architecture for the Courier MTA"
+HOMEPAGE="https://pypi.org/project/courier-pythonfilter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="mail-mta/courier"
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild
index 65b4859f8e7b..b56338644696 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index dd0fe17116b7..3c8d8f91224e 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 16894fd77d76..5cbf6e03d16c 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1 +1,2 @@
 DIST encodings-1.0.6.tar.xz 312720 BLAKE2B 4649d8d12fcfcbb7de9e8bd8aa7e77514835a56990123549137b4bbe5615c1e9fcddccb13b6442d8a525efd147926801a5029cb10126462b29e31e3354da3683 SHA512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134
+DIST encodings-1.0.7.tar.xz 299588 BLAKE2B 25c1be5e1bab85630617803eff63ad3a55ca865db5e5ffad98979986f2396e501d40736ebf90c9d9548bad79dff6ec53440c9e0e0bfe27e2f22acfe24a63bf5e SHA512 dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8
diff --git a/media-fonts/encodings/encodings-1.0.7.ebuild b/media-fonts/encodings/encodings-1.0.7.ebuild
new file mode 100644
index 000000000000..59d091fc67d0
--- /dev/null
+++ b/media-fonts/encodings/encodings-1.0.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# font eclass is inherited directly, since this package is a special case that
+# would greatly complicate the fonts logic of xorg-3
+XORG_TARBALL_SUFFIX="xz"
+inherit font xorg-3
+
+DESCRIPTION="X.Org font encodings"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="x11-apps/mkfontscale
+	>=media-fonts/font-util-1.1.1-r1"
+
+XORG_CONFIGURE_OPTIONS=(
+	# https://bugs.gentoo.org/815520
+	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+)
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index a3492be2f209..3b9a795e8f56 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1 +1,2 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
+DIST font-adobe-100dpi-1.0.4.tar.xz 886528 BLAKE2B fac12a9ab96fcc6053a2ffd491b4f98dcf82b278e191b5a28426ff9c87ef3b0663d3917e10c50a58e1e52b6f26b5b3ae6f63f757cbdedeb20a3230b09acce186 SHA512 fedb86672c3b9cb624ee5d74d1d710f21d92c2d48a1fcf0a45b54b3f992f6f5599fc271d38a7e25ef123b64d405fa60a3d46883fe7a9d71ebad83c9b418f8383
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..fbe04feb5faa
--- /dev/null
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="adobe-100dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Adobe bitmap fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index d2ff9c3e2fff..d4f933c908e7 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1 +1,2 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
+DIST font-adobe-75dpi-1.0.4.tar.xz 735140 BLAKE2B 1e9d833f750c4dd3841053aa16dea94fe2675cc4b7fce76680ceee4ec977ca29faba885ef26a6b0d20f240a478525d9c34e16925b4c9c114289917444a1ece03 SHA512 4e63c268525f21c03525870129c8d42cbd17a03d86d9c88bebdccb5094a1093acef1d2b6d4dde221559cb19f047b86baf58fa8ad65d28d4cb6c3064ec164836a
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..6824e09e0919
--- /dev/null
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="adobe-75dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Adobe bitmap fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index eb9f82238f7c..5c7e9423a567 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1 +1,2 @@
 DIST font-adobe-utopia-100dpi-1.0.4.tar.bz2 353852 BLAKE2B e5d37b5608725ca36987999aad269e3ed5a988069cbe232ece934f2ed71dfaa94ed78499e911f16f7f6d8114e684d501920bf927ab3551cc211f27deace2f613 SHA512 fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
+DIST font-adobe-utopia-100dpi-1.0.5.tar.xz 292184 BLAKE2B ab39ebaceadff69fe0254ec8818224628b83ba297b65106c587e9d56aced049742e0a0c284d013ec575c360676c6780ffc25de3aa28a9d76adfa96e1bb3942fa SHA512 9685d66de107ab3142aa9322bbded20f4f538d7bcd8c97bfb4db8eb1fc440724b0c7574ee8b4b5e96c81044c8ee4da175dd638f03dc3e1e650200fdf7b8a169b
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
new file mode 100644
index 000000000000..55cc003a6eec
--- /dev/null
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="adobe-utopia-100dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index 562d01414133..95a9ea8e8aa8 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1 +1,2 @@
 DIST font-adobe-utopia-75dpi-1.0.4.tar.bz2 273484 BLAKE2B a304d690de9727c5678dc1613cf7c8960594607a5f21fea15d03caade18df23ea83ff62fe7bd6c12750a0c9ffd11c28d4507e811eb271a1d1f874f0bcf0e3a92 SHA512 c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
+DIST font-adobe-utopia-75dpi-1.0.5.tar.xz 247312 BLAKE2B 8ec3044fdeb6e5eae00994db5e7edfc108df71cd9ae19f5d89302e9ad152faae8d9e633001c4cbe42bdc4d4c84b341a34842018cf1a20dcf12bfa88a5aa1326b SHA512 9608698288fca47bf61cff911b8f081593807eed9f138ea22f05a7b6c26c481ec5144d79665cf509ba889df35ef5406e0de71710362bcf6de6b602c12158e22a
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
new file mode 100644
index 000000000000..4abc0a842299
--- /dev/null
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="adobe-utopia-75dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index 80bee9725639..9859f3c07d13 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1 +1,2 @@
 DIST font-adobe-utopia-type1-1.0.4.tar.bz2 269159 BLAKE2B 0e23240a7b79a43c0508935b460e1f7f4cedc72e98dd903644b97d042983dde4c62610f53055d35717bdad56c5a9f52962bd11c4ee484cbb9b89b6c4c95752b5 SHA512 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
+DIST font-adobe-utopia-type1-1.0.5.tar.xz 264312 BLAKE2B f1c3bb224ca165266938fe36c250daa87e94dbf4e5a92eecc2245526947a8992a388611f7d4a225f89201db33d1d7a454f15f33946b1eb6b8b0914bba7671949 SHA512 e30f4c7702f47a3a42206975fbcfec058317681956d246411e50e372b669bdc875c5d7fe28bad7d298bc61b71a997c7836fb6ac16effd223a96723a6e9ece649
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
new file mode 100644
index 000000000000..99ed0391e993
--- /dev/null
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="adobe-utopia-type1"
+inherit xorg-3
+
+DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 9048e49b440b..dd7d34ee683c 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1 +1,2 @@
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
+DIST font-alias-1.0.5.tar.xz 96780 BLAKE2B dd8bfcf3de35babded89ce1b66af357292b5202bf981c44697cd637de026837ee17d5583f8a48b117190c700cf7137011f86d4b63a63e0eb9d2dfc95ed45d151 SHA512 86bffa6b9ff789eeba715c079965157806ed633d44cd3dbf5e2a4bba2b390a0f48db65edc8e3264acbc2368d78a8d7e05bc2e2e3a86ddbf6b08bfe7f5e862bcc
diff --git a/media-fonts/font-alias/font-alias-1.0.5.ebuild b/media-fonts/font-alias/font-alias-1.0.5.ebuild
new file mode 100644
index 000000000000..dda00232dcdf
--- /dev/null
+++ b/media-fonts/font-alias/font-alias-1.0.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="alias"
+inherit xorg-3
+
+DESCRIPTION="X.Org font aliases"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="x11-apps/mkfontscale
+	>=media-fonts/font-util-1.1.1-r1"
+
+XORG_CONFIGURE_OPTIONS=(
+	# https://bugs.gentoo.org/815520
+	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+)
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index 3cb3737586e1..5d5e50694e05 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1 +1,2 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
+DIST font-arabic-misc-1.0.4.tar.xz 104644 BLAKE2B b58be869efd943b800989594d14cfd87e5f8b7add99ce27ce419eafe52e1dfb18724720116a962d0e7a67af13f1a41322f0a2b3d12f0d9ed8d2faed8d07c5555 SHA512 afd5fae32440b133c5ee0195af44ad1462d35c2f451dcf4b1c93e0ce245d009b120d39eb5f780b003ae2f572408965e6d149437e9ebbf5738cb69193aaa4d488
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..2023dc55f673
--- /dev/null
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="arabic-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org arabic bitmap fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index 71f39659fc63..8c25e0308ace 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1 +1,2 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
+DIST font-bh-100dpi-1.0.4.tar.xz 569512 BLAKE2B a27b289749b18c776b86bc270d6fbaa55ac1cbe50aef7e5467b7f64848742bb8ee1f0fb324c5359cf75e4cb5e3300cd7d3d25d61103e585d1158b8efadf6c1ce SHA512 5fe2a24df0d0e9109f1c1cb2556f4cdbf07cc16441e565333f01a00815dd4555b6ef0dd689ef3196ddb76db7480bca8f0b501d4244262d6c64d4751d75503b44
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..835cc0c8f77c
--- /dev/null
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bh-100dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
+
+LICENSE="public-domain" # bitmap font, not copyrightable
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 4bfe82176a40..cf955b239a45 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1 +1,2 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
+DIST font-bh-75dpi-1.0.4.tar.xz 472540 BLAKE2B 4c3e5aaa5894b9c74ffb6c578bad7ec0c12c8f9592abb30be0586be555db18c062e689d93e854615138d5395cdfbce29a6f12667cd4e0f0cb451c2977bbfefa9 SHA512 8ccc5accdd43b4e1b8007c94e7916c6ee947ff0d57e3b0ce92154b718ef0ac2579659719738a50ef3ab0998a8bcea5b055e6a2e4d72b9fa5755b786143303955
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..a3cc86e49c96
--- /dev/null
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bh-75dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
+
+LICENSE="public-domain" # bitmap font, not copyrightable
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 57681ad7cfd5..bf9497183957 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1 +1,2 @@
 DIST font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 245807 BLAKE2B f2cd40b5621aa3940e8047bd6b2ca588fde367512da196ebfa32469be06ea15c87641da8f81f14191a65dd5eb791de1256e26c5cc20e0dab3883834028003665 SHA512 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
+DIST font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz 212808 BLAKE2B 569cf4990dc1eb318b7edc0dd8651fc4dbeaec9528657505d60bb3548c6a37a6e45802a2a73692d2c6aa924a2b12b7b958df551da52aac51711877531ac77d5b SHA512 31a4d061430089c5523815dde7d7cf73c9cba768ab79004eb65af8a1684fdd57d0829d9f4249c8e542e733266cc5f83e38eff403423a77a06af15008ce95d2ab
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..8fcb674264bb
--- /dev/null
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bh-lucidatypewriter-100dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
+
+LICENSE="public-domain"		# bitmap font, not copyrightable
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index 19f82b1c3167..b0929bdfcd2b 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1 +1,2 @@
 DIST font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 219511 BLAKE2B fe05029295ef04414dd37fe80d023cfbf423fd3c314d53cb71dc2e4c623634e8e5b911f7a92851f49dd66cc9939d4998d4ec78f705a52908d01e1dcb91f08387 SHA512 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
+DIST font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz 189952 BLAKE2B 1347d53ed01622feeac38d578c39381d40e35e174b0cc6641cf7c4852c63077249a20d9da4fa1c5d98e12331d153815331d29c732ea4f634bc9666b79fda5590 SHA512 bfe2776b84533dd23648df42b2c74fb7f49e665e4f2128c6af529425a1569051c9ddadb696dfa7a6bd959a4929f8a75f7e4fbd7da7767d272a0a8a5424a879cf
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..5757d4d47e29
--- /dev/null
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bh-lucidatypewriter-75dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
+
+LICENSE="public-domain"		# bitmap font, not copyrightable
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 1e2fc71bee52..f9016c61a05a 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1 +1,2 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
+DIST font-bh-ttf-1.0.4.tar.xz 372012 BLAKE2B c29459ba2ef8aa3821c8f6d500febc5d638ada726597236bbf76d468a12ccac4e23a0787e17af70be3e9eea0163d86846cf69f8eaf23bb2be91fac446a640dfa SHA512 d9d1cfdd3d73157d0253bebb76e91b92c5ffface42dd6aeca40f1deffe03f079a0f9a46d6fb368e5c213e413d0753766e9454ac4222baa3c9898dfcf92718fd0
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
new file mode 100644
index 000000000000..5f103d848bc1
--- /dev/null
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bh-ttf"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
+LICENSE="bh-luxi"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 930614c35158..c9d2d32ee157 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1 +1,2 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
+DIST font-bh-type1-1.0.4.tar.xz 633212 BLAKE2B fa2b80703eaa86eb77726250c7f98af5271f4e24f224e8e88124dab80bc8988f0760d451c6ff9264ed1af083a2ceeec0fa8b8eee636351c44823a825cb92dc22 SHA512 06b0752b67a8109c0173be2ad4b9623940bc0c55e5854dddfd74c4abf96b4ab2f0e4446325c4d6971011231176f87a06b55e906b7472f371b9824d89e3cbee7f
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
new file mode 100644
index 000000000000..5d4e7f7eb756
--- /dev/null
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bh-type1"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
+LICENSE="bh-luxi"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index ec05784fc86c..729669470314 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1 +1,2 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
+DIST font-bitstream-100dpi-1.0.4.tar.xz 176520 BLAKE2B 43dad919d77c6d28f918bd8851cd9f72f3a7622c761a861c00777671cf0c57abe602de8b8e8093a81b6c3ab03e8c6d42224d74f3faf4d0132a9834b671bb8216 SHA512 1389681eee8b9e2bbfe0293b0aa1add7c6fa86149ff3cb779195ddcc548b1a519336c2d43b6988c899dc09d44ca30de9ffb5daca24fc3906694ab0fd391eb437
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..9687cfea0429
--- /dev/null
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bitstream-100dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bitstream bitmap fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index 4a21b6bc8128..b89aae130a7c 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1 +1,2 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
+DIST font-bitstream-75dpi-1.0.4.tar.xz 159708 BLAKE2B c9e240839f6365553df3061cb2113c939b3306d70ec321a1cafb232fce7f471a03029dc308370424d932fe6d39a27585fd48fa581486eb63153dc1ab3e0fe806 SHA512 d678c58493696b3a744878991838b329243e5ba7985b1a435b62e9b1a05b5609d0b66d5943d840479ce2c5fc1da1b0633c33f28e3613712d26802fc41ee22c22
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
new file mode 100644
index 000000000000..7e7fd8b3c85d
--- /dev/null
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bitstream-75dpi"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bitstream bitmap fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index b531696d2a09..30f8e3882c74 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1 +1,2 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
+DIST font-bitstream-type1-1.0.4.tar.xz 393644 BLAKE2B 7d00778c7179e803ec5f5ffad80c845351bb9633a27b9d92fd82dbe61dac8e5b24c0df19d99533a1b0d064a767990d30a7df934e1f27c05f85e3bb50f3050e62 SHA512 f09d60abb88c9be6227c57f5519f08e5e3c59c916183d32a512d3c2ace0047eaad2b377c3725c8987e8b4c55468eb7821322ff5447f000d4c2be6cb909f6219b
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
new file mode 100644
index 000000000000..6caf8be5d3b5
--- /dev/null
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="bitstream-type1"
+inherit xorg-3
+
+DESCRIPTION="X.Org Bitstream Type 1 fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index 050767d74981..2e28da508593 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1 +1,2 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
+DIST font-cronyx-cyrillic-1.0.4.tar.xz 235908 BLAKE2B afaaadfebc31b199ec7d1bfcb93c9041450d85a95f22a641dcaf0e3e06919a8ca46be48e9b34231976a3763810302630b49562fd7144ccf972879265a7de4a98 SHA512 39c0bfc08ac746fd98a668d7545da503e8413d5d66cdb1884489ed7221fa4f09dad8dc997ca39595113e2f12fd65de6d2bfd8eaf1480aa93d5eb961d2e2f7cff
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
new file mode 100644
index 000000000000..9ede5c1f2ded
--- /dev/null
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="cronyx-cyrillic"
+inherit xorg-3
+
+DESCRIPTION="X.Org Cronyx cyrillic fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index cdd18da67bfb..ea10495d278c 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1 +1,2 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
+DIST font-cursor-misc-1.0.4.tar.xz 97384 BLAKE2B 080d34385b352241de6312554d8896926a761db24a58d3b5946e78f03c55fa246ca1a9750ce057b0f0a5d7edd3778951c05932615eb42be30458fa9e2422205f SHA512 22bd86a81cdfb1e17f885dc3961071c08920171a6f0736ae52d95c8e576b1debc7570aa3b7e1007f474b50435fba411f0eb1847894e8b52f6e6268d91cf9f2db
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..5d583f3d6477
--- /dev/null
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="cursor-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org cursor font"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index 2ebcfc148056..11d967e9b25c 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1 +1,2 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
+DIST font-daewoo-misc-1.0.4.tar.xz 493896 BLAKE2B c9839e54fdc5a62c7615e98670e97d8112248294fbf98ac42116fa4ef19900c35637651a43298807cc6fda5a4a84414351f9f8c27f03614b1a0a27d4ec9aee50 SHA512 be9f550e8cb84f9e24afb6b739c357cb159da8a06f8bc2c26c9fbb62320427dd7522e04d10492cec91ab559b2e5dd5067012ff3225695a8337f1cd7db9801f57
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..05cae003de87
--- /dev/null
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="daewoo-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org Daewoo fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index 7aa0d3c03d6e..b2b1e714ea2e 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1 +1,2 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
+DIST font-dec-misc-1.0.4.tar.xz 95284 BLAKE2B 2de5f171a67bbc2d37f49774d25058a4b3460a150c44b681aba194a60b4f7b3243ac8752f83bfc2260deecdf47175518060d3322002e9bd25c3129ddcc4591e7 SHA512 bf6c0e4924835346f1f7913a04fa3903a7c55d292317526dd8eaa799dfb3b52eb2157c34692d659b41a18123af8389785dcb4aa0c31fc387cb368642801c3335
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..815ff85667cb
--- /dev/null
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="dec-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org DEC fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index afc873b92deb..7e632891df02 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1 +1,2 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
+DIST font-ibm-type1-1.0.4.tar.xz 378468 BLAKE2B ed741c5fd646383446073f22f4dae82c08f060ac8fa47c4ee0deb9322c448a7262d444b84e246a50aa153286a6c50b1574079d71e0de51f9f68435fffd3f76d7 SHA512 42ebc9f1b0726a9a1bf3d7c8a3b7102a448e7c6ff0c5ac1dd8a4861bf51c344ddb2e077df41b86e3e896100371a33f997d6df834b4d64b835d81a36dfddfbce3
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
new file mode 100644
index 000000000000..2be4246d42c0
--- /dev/null
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="ibm-type1"
+inherit xorg-3
+
+DESCRIPTION="X.Org IBM Courier font"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index 891b42209715..526c45bc85e2 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1 +1,2 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
+DIST font-isas-misc-1.0.4.tar.xz 712068 BLAKE2B 0d42906968da4060a0d4adb38f53f08bdf530bcda6f18dbe03112e687304e063a75679589343e68d485668b89fafbfe7f83920338b5aeaf474c55b4fc3f607c4 SHA512 7c8cc9083600949fff4a0373f9f22df80f6a2c97d8d56bc2c4d03b102d16ad071b984b1ecf547d2d17ede9335e5c3a418512631a18938b7728c66b4339dcedd5
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..95dffb086571
--- /dev/null
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="isas-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index b5feca3c7236..ef1e32bfcc70 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1 +1,2 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
+DIST font-jis-misc-1.0.4.tar.xz 514704 BLAKE2B eef0d29fac663e3d60e38cc28e97312939478247071ca3dc592c6443deecbed54ddb0bc894b62bae10d3b02d151366544bfd589c6e964e13b026ae125ca99836 SHA512 c54034205e7bd7a01b311c25c890f9fd1abc25f842315812d5c83d4e4091e5e6c2125a43d4d532b88c79d51cb812b86cfa8e7e4c1a87175746f1bd4e38129440
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..1fc059d5ff65
--- /dev/null
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="jis-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org JIS (japanese) fonts"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index d22366b0099a..9921895291b0 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1 +1,2 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
+DIST font-micro-misc-1.0.4.tar.xz 94544 BLAKE2B 347c58af6b699b0845129ee7a20c401f340417f0fa2945815f161037159c9dabb1f809d4234be87bba0f4dffac47b39310d0d01e12f47d583c5ce609d9fdeb85 SHA512 e9a402a5042eef0b618bc30b319256cae9f71f546c167c8b638a780f93cbdc2d61c472203efaee7077acedfac3b3981feefbc1017cfee8512077e61deff42ed3
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..7c27c77d50a7
--- /dev/null
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="micro-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org micro-misc font"
+LICENSE="public-domain"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index f895f2e7d4d4..a2b4373e81b0 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1 +1,2 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
+DIST font-misc-cyrillic-1.0.4.tar.xz 124252 BLAKE2B dd4b2f648f30a8ca48fc187e5b8b739cf8adcec25a4453bc4c749ea0dea4f5f954ce860569dda03c56493389730a64aaeda6b72732b4f9041da237cf3813c75f SHA512 fb2102805fedbd04b1533b85abcde79f432b97b72822bcfcdc09f525488d0d0c63815c8c25b79bab864bbe11fa1b72e2c34f5ba7b96eee1b6c84b841bb333353
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
new file mode 100644
index 000000000000..e2288f7707c6
--- /dev/null
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="misc-cyrillic"
+inherit xorg-3
+
+DESCRIPTION="X.Org misc-cyrillic fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index 58a204e032ce..bcc4cb8cd0dc 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1 +1,2 @@
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
+DIST font-misc-ethiopic-1.0.5.tar.xz 222624 BLAKE2B 8184f7d6ebc72ac4524073670319ef26dcd09b1667973e46fb4756f61a4752104a974a44a8666d9bd011f56b3502746531ae8e608959e124068e4a3d5539ba16 SHA512 7732a828c005e3762b6383729134c5656fd575ac59288504d047fbe26e9965a80519a37b0cc4c6b89379a85a62160c5ea76017f790447a230c015aa7a9143ba0
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
new file mode 100644
index 000000000000..fc918c94867e
--- /dev/null
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_DIR="OTF"
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="misc-ethiopic"
+inherit xorg-3
+
+DESCRIPTION="Miscellaneous Ethiopic fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-fontrootdir="${EPREFIX}/usr/share/fonts"
+
+	# This flag unexpectedly doesn't control whether the font (i.e. the .ttf file)
+	# is installed, but instead only controls whether mkfontscale/mkfontdir is
+	# run. I suspect this is a bug.
+	--disable-truetype-install
+)
+
+src_install() {
+	xorg-3_src_install
+
+	# TTF fonts are not supposed to be installed.
+	rm -r "${ED}/usr/share/fonts/TTF" || die
+}
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index fc449cfc08da..29b8092d5943 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1 +1,2 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
+DIST font-misc-meltho-1.0.4.tar.xz 831660 BLAKE2B fa0c8d19f8fe056ab3d9d17b00cf425f2c048253dcb919cc37e221c1b094d55fa297aba0ab55a1d2e14c7b52cc061d08b2e489e30f29828713d725ad90a38f63 SHA512 1391e24b0402f50dfa877d71305ef8c144c489b21db0fdab278668360eef7e5ebd4145d77f52b5fc7225895804f3fc7f0e67ad114d64cde073e642d7ae328a54
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
new file mode 100644
index 000000000000..a90e5abccd58
--- /dev/null
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_DIR="OTF"
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="misc-meltho"
+inherit xorg-3
+
+DESCRIPTION="X.Org Syriac fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 7c9e8449d7d9..74c8e0239c15 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1 +1,2 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
+DIST font-misc-misc-1.1.3.tar.xz 1563776 BLAKE2B 0b56e86ddcf11623a3e05da2571fec30fbc763fa1916fcbee8a2eac64fb5b1722d5a9da8f192655e88220077763121670618fee9878fa3174ea73fe6d50f6654 SHA512 fac4bfda0e4189d1a9999abc47bdd404f2beeec5301da190d92afc2176cd344789b7223c1b2f4748bd0efe1b9a81fa7f13f7037015d5d800480fa2236f369b48
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
new file mode 100644
index 000000000000..5dd3ed932ef2
--- /dev/null
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="misc-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org miscellaneous fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 528d33ab119c..467c4390bf1f 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1 +1,2 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
+DIST font-mutt-misc-1.0.4.tar.xz 220528 BLAKE2B a6e4a20c73638343f157ffb548a081c3b0b8358d23c2703742703dc4fb6d34a50c5e52a91d695f2216c2329041c5457581f754944a7d433b98fba87d5d5c65b2 SHA512 9cbc82e6a519572576cb60f4d6b9795468666d53ac7df17d6736ab04190cb5f58c8b57be61ab509fc9372e1114c6aaa5e0d098ec1fa63dc5d8638916614f7046
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..09f53d8d710a
--- /dev/null
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="mutt-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org ClearlyU fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index 95aaaafdbced..f8f321b0f8df 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1 +1,2 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
+DIST font-schumacher-misc-1.1.3.tar.xz 128680 BLAKE2B 389cde6ea6f7e0155bdf5686b50e2a9bb4c1bccbbe94da5830a0ddadf6c7f8aaf33cf623d1fe45169b0460b74a771192acf010a27a724f197c07483a21c3f507 SHA512 83b25495535176a5e348269358ac34af8223023a55e2c5c599725ee90ec9ff3ea9ff19cca46b93eeae7ef985da325f9065c83d829a4a8c72d0c3c197242a1b64
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
new file mode 100644
index 000000000000..4114f1c2b2b7
--- /dev/null
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="schumacher-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org Schumacher fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nls"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index f33cb0b9e3e8..c8b4c4e50430 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1 +1,2 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
+DIST font-screen-cyrillic-1.0.5.tar.xz 98788 BLAKE2B 88c7b1640f4aaebe373107c76c935132d3efe87ed64f60002e4092c6d5ba3c07498c2815668d0fd95417fd1ca967fccb4bea4d572f1172d2f33c086ec39c2e82 SHA512 9f136fc6f6a3621c4b38302af5396789b1e6558b9b4b1b991624945eb9aac8497a6cd415460abc7dbcbaad1ef8ebd23cacfb3448c6e34cc9ba0726e7973c1a99
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
new file mode 100644
index 000000000000..bfac9bfa2fb8
--- /dev/null
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="screen-cyrillic"
+inherit xorg-3
+
+DESCRIPTION="X.Org Screen cyrillic fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index 8cfd2c36f3d2..369ef8b33cd4 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1 +1,2 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
+DIST font-sony-misc-1.0.4.tar.xz 102428 BLAKE2B d78bf15716be7e4e24e42fa766c303e85073c25e94b9cd464d712a967d55bdae5a81402a9dd4f0485ec558a9d88cf28f550ca1006e1f996d08517e8398c83a6a SHA512 f361fca66db2ec80b1467fb6bff57bd2cfc6722473bd7ad119026a97552eef07ff77552c01eb8f98f3299d7fd40c8c2cb3e0d0b01adca2f81c2c2f75581dc113
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..4fd4e1096aaa
--- /dev/null
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="sony-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org Sony fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index eb5813e85128..9cc0d94d2e3f 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1 +1,2 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
+DIST font-sun-misc-1.0.4.tar.xz 109832 BLAKE2B 8d1f67f71a604cd105052e97d0a5e2cdf26be6994f41bead83ec767f1c6e1e5ed81de3fa75e9bdb55603029a7f067ab9cbceca34d865fa8edf61771bee61b131 SHA512 9eeb330c1190557479636119af8aeb49917f1faeaa42d3a93e35d318348ee4247405544107ce9f5a244dbe2c0001c8d34b604b961bd9d92431f84b992fe9739e
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
new file mode 100644
index 000000000000..55e2fcfe239b
--- /dev/null
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="sun-misc"
+inherit xorg-3
+
+DESCRIPTION="X.Org Sun fonts"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index 8dfdd0dbf7a6..d29d1ea3809e 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1 +1,2 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
+DIST font-winitzki-cyrillic-1.0.4.tar.xz 96564 BLAKE2B 0ba04018b630c4c73dd8562ffab2dd732d9ed8232d3296081a815b3c9308d18a16255e5185c81dfd1b13d057904d0c454f44b6169a358109fe959e45fdfbcddf SHA512 11e366f96abe65aed9fb6fd087b2bd90af9f60548de0cebfeb348262860957a63a997616e00092d312b8ae9c262a7bb52da69c704a27d34018a45b98a87eb158
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
new file mode 100644
index 000000000000..0bf047a2ad8c
--- /dev/null
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+FONT_OPENTYPE_COMPAT=1
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="winitzki-cyrillic"
+inherit xorg-3
+
+DESCRIPTION="X.Org Winitzki cyrillic font"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 5ab969628c4b..7d04bf493629 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1 +1,2 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
+DIST font-xfree86-type1-1.0.5.tar.xz 120500 BLAKE2B 2d5073241ba6d0f966edd1deeac8b5c31f67fb5c1aa9ae49b4447ceb027033dee0001ff9398aa28f98d13cce2f75aa19f746c2396c47c297823711188db76cea SHA512 0a92d911269c5c4d815dfb617bfcc57c3bd54e4cd308eba87f9ec49851369d99dea61950dbd6cdc0f85db92c0c24055da88063b083b4b0cafb3315051bb650ed
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
new file mode 100644
index 000000000000..db9aea661c59
--- /dev/null
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="xfree86-type1"
+inherit xorg-3
+
+DESCRIPTION="X.Org XFree86 Type 1 font"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 739378bbb71d..a8314703a56c 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 29de8ad79d88..c5c5033cf47f 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,6 @@
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3 SHA512 f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
 DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466 SHA512 17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
+DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752 SHA512 05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618 SHA512 789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c SHA512 e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88 SHA512 a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild b/media-gfx/darktable/darktable-4.2.1.ebuild
new file mode 100644
index 000000000000..aba89cc810c2
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	DOC_PV=$(ver_cut 1-2)
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? (
+			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_uk? (
+				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
+			)
+		)"
+
+	KEYWORDS="~amd64 ~arm64 -x86"
+	LANGS=" cs de es fi fr he hu it ja nl pl pt-BR ru sl sq tr uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
+#    in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
+#    by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
+#    (and curiously enough, empirical observations suggest current versions of Portage are
+#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
+#    on GCC; that might be a bug though)
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	colord? ( x11-libs/colord-gtk:= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	gamepad? ( media-libs/libsdl2 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gmic? ( media-gfx/gmic )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	heif? ( media-libs/libheif:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lua? ( ${LUA_DEPS} )
+	midi? ( media-libs/portmidi )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:= )
+	webp? ( media-libs/libwebp:= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			if ! test-flags-CC -floop-block &> /dev/null; then
+				eerror "Building ${PN} with GCC requires Graphite support."
+				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
+				die "Selected compiler is sys-devel/gcc[-graphite]"
+			fi
+		fi
+
+		use openmp && tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DRAWSPEED_ENABLE_WERROR=OFF
+		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GMIC=$(usex gmic)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_PORTMIDI=$(usex midi)
+		-DUSE_SDL2=$(usex gamepad)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# This USE flag is masked for -9999
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
+
+	if use nls; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch
new file mode 100644
index 000000000000..33ad7f647752
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch
@@ -0,0 +1,22 @@
+--- a/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake
++++ b/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake
+@@ -2,7 +2,7 @@
+ 
+ unset(RAWSPEED_CACHELINESIZE)
+ 
+-if(BINARY_PACKAGE_BUILD)
++if(BINARY_PACKAGE_BUILD OR RAWSPEED_MUSL_SYSTEM)
+   message(STATUS "Performing binary package build, using hardcoded value.")
+ else()
+   try_run(RAWSPEED_CACHELINESIZE_EXITCODE RAWSPEED_CACHELINESIZE_COMPILED
+--- a/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp
++++ b/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp
+@@ -4,7 +4,7 @@
+ #include <unistd.h> // for _POSIX_C_SOURCE, sysconf, _SC_PAGESIZE
+ #endif
+ 
+-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 1) || defined(__APPLE__)
++#if defined(_SC_PAGESIZE)
+ 
+ int main() {
+   long val = ::sysconf(_SC_PAGESIZE);
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 5a905dcc84d7..30159e1ec4d9 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1 @@
-DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
 DIST exiv2-0.27.6-Source.tar.gz 32280263 BLAKE2B a025452b7e70aef109a2f7831ba5c0528b0cb8fda92e5959a5927abd442d650f8d40cc47f56d8f87508e5f37e8378728f99e3a4fa96e7a0319cb4542659d9a60 SHA512 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
deleted file mode 100644
index e6e220a5330b..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	inherit git-r3
-else
-	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}/${P}-Source"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://exiv2.org/"
-
-LICENSE="GPL-2"
-# In 0.27.5, ABI seemed to be broken for bmff functions
-SLOT="0/27.5"
-IUSE="+bmff doc examples nls +png test webready +xmp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		>net-libs/libssh-0.9.1[sftp,${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${DEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-0.27.5-musl-tests.patch )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	cmake_src_prepare
-
-	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=14
-		-DEXIV2_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		-DEXIV2_ENABLE_BMFF=$(usex bmff)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && eninja doc
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd "${BUILD_DIR}"/bin || die
-		./unit_tests || die "Failed to run tests"
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.27.6.ebuild b/media-gfx/exiv2/exiv2-0.27.6.ebuild
index c34d98c09301..40332eff2db4 100644
--- a/media-gfx/exiv2/exiv2-0.27.6.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN^}/${PN}/releases/download/v${PV}/${P}-Source.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${P}-Source"
 fi
 
diff --git a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch b/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
deleted file mode 100644
index 3fa70d739f4a..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://github.com/Exiv2/exiv2/commit/82adcb1f86def0555b25713a8b84dba84944b275 (1)
-https://github.com/Exiv2/exiv2/commit/7d8cd00778c3eee9f32af04b009d8a5651eb53e7 (2)
-
-This is basically just commit (1). Though it wasn't directly applicable so I just merged it with (2).
-Easier and it makes the file same as upstream.
-
-diff -u b/unitTests/test_futils.cpp b/unitTests/test_futils.cpp
---- b/unitTests/test_futils.cpp
-+++ b/unitTests/test_futils.cpp
-@@ -42,21 +42,8 @@
-     std::string tmpFile("tmp.dat");
-     std::ofstream auxFile(tmpFile.c_str());
-     auxFile.close();
--#if   defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MSYS__)
--    const char * expectedString = "No error (errno = 0)";
--#elif defined(__APPLE__)
--    const char * expectedString = "Undefined error: 0 (errno = 0)";
--#elif defined(__sun__)
--    const char * expectedString = "Error 0 (errno = 0)";
--#elif defined(__FreeBSD__)
--    const char * expectedString = "No error: 0 (errno = 0)";
--#elif defined(__NetBSD__)
--    const char * expectedString = "Undefined error: 0 (errno = 0)";
--#else
--    const char * expectedString = "Success (errno = 0)";
--#endif
-     std::remove(tmpFile.c_str());
--    ASSERT_STREQ(expectedString, strError().c_str());
-+    ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos);
- }
- 
- TEST(strError, returnNoSuchFileOrDirectoryWhenTryingToOpenNonExistingFile)
-@@ -68,22 +55,7 @@
- TEST(strError, doNotRecognizeUnknownError)
- {
-     errno = 9999;
--#if   defined(__MINGW__) || defined(__MSYS__) || defined(__CYGWIN__)
--    const char * expectedString = "Unknown error 9999 (errno = 9999)";
--#elif defined(_WIN32)
--    const char * expectedString = "Unknown error (errno = 9999)";
--#elif defined(__APPLE__)
--    const char * expectedString = "Unknown error: 9999 (errno = 9999)";
--#elif defined(__sun__)
--    const char * expectedString = "Unknown error (errno = 9999)";
--#elif defined(__FreeBSD__)
--    const char * expectedString = "Unknown error: 9999 (errno = 9999)";
--#elif defined(__NetBSD__)
--    const char * expectedString = "Unknown error: 9999 (errno = 9999)";
--#else
--    const char * expectedString = "Unknown error 9999 (errno = 9999)";
--#endif
--    ASSERT_STREQ(expectedString, strError().c_str());
-+    ASSERT_TRUE(strError().find("(errno = 9999)") != std::string::npos);
- }
- 
- TEST(getEnv, getsDefaultValueWhenExpectedEnvVariableDoesNotExist)
diff --git a/media-gfx/flameshot/flameshot-12.1.0.ebuild b/media-gfx/flameshot/flameshot-12.1.0.ebuild
index eaeba5e61c70..fa3545cbb409 100644
--- a/media-gfx/flameshot/flameshot-12.1.0.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/media-gfx/fontforge/fontforge-20230101.ebuild b/media-gfx/fontforge/fontforge-20230101.ebuild
index 4d98f841cb94..ea1aee2c6a6f 100644
--- a/media-gfx/fontforge/fontforge-20230101.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 0e77f5860711..cce6c28e6bfe 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,3 +1,4 @@
 DIST fotoxx-22.35.tar.gz 8675173 BLAKE2B 0d0c709da603a59f432b184b0477cc3a65166c39209c5ccd440cbb317d1c835cf9b2a64870b10bff07debc4617585ed976f8a2157ee1a600861c2edab9ad023f SHA512 aceec8172da1c2c40c422ac194ab870a39cc33d6e1f484fc5fd7292145636ef546fa400023bbcc403d7e2ad108eef6d1c696cce7983c39088fede3a8538801c4
 DIST fotoxx-23.0.tar.gz 9258345 BLAKE2B 96510f43c2b8a289191a1194adf13b255d29ebd8aae4e286f2fcc180bb1ecefe5df7ab9251a55e83010a527d455117ddd99dea7df189a38bc82e5b233806307e SHA512 b40025f90561c10ebb107edf26863be154c0b699c811275f2de71f9da417921704fb2215266d725a7f84b19327da54b3f9be2d00db6dfb9738739a2e9ffc1903
 DIST fotoxx-23.1.tar.gz 9198469 BLAKE2B a14064c1b240badcfe5c24970528956e2f7acfbcb6720c7f376447bb65b26db7f50ceedbe3ad8c36d7439e56dae074d4e6feee315a746e911a1d2fb9b77dabcd SHA512 5adf8501bb5ce232668b8dd551ccfac591f23dbb33dec4c303b37b1f4f7fd6c43dab67f3dc38a8647260b32e51f9778cb6dcaba5aaa91a2565d1f810afca7353
+DIST fotoxx-23.2-source.tar.gz 9233622 BLAKE2B 425c6f20210c62d08ee14f53436f3256e829a6fa3453047fe07ee0357fa277cdfe37340a6c19d0c39c2885b5ab6478d4791eb00631447f0b8d6ee53436750d5b SHA512 6193c99f11034609fdc052cf29184835644c76fd37270d8a8e9a76524d7bec7ea6ddc8e0c0ad7874d6997eba5c8c81f0f1a355a06a1220600380931aab10759b
diff --git a/media-gfx/fotoxx/fotoxx-23.2.ebuild b/media-gfx/fotoxx/fotoxx-23.2.ebuild
new file mode 100644
index 000000000000..6fef1f8c11cb
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-23.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libchamplain[gtk]
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-22.18-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	sed -i -e "/^Icon/ s/\.png$//" fotoxx.desktop || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
+	elog "be placed at /home/<user>/.fotoxx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/gimp/gimp-2.10.34-r1.ebuild b/media-gfx/gimp/gimp-2.10.34-r1.ebuild
new file mode 100644
index 000000000000..d8d1639a7cdc
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.34-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.98
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.40:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:=
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with jpegxl)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+			mv ${plugin}/{,${prename}}${plugin} || die
+			mv {,${prename}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.10.34.ebuild b/media-gfx/gimp/gimp-2.10.34.ebuild
deleted file mode 100644
index 5cdd6b4b938f..000000000000
--- a/media-gfx/gimp/gimp-2.10.34.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.100
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.42:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19:=
-	>=media-libs/lcms-2.8:2
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:=
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl:= )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with jpegxl)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prename=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
-			mv ${plugin}/{,${prename}}${plugin} || die
-			mv {,${prename}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 26174056ae0b..f5db8513e425 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,3 @@
-DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
 DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
+DIST gmic_3.2.1.tar.gz 11236401 BLAKE2B 8a68cee641892298e93373f9ad1a1ea4dd9995d813db7050a8a1c5f6658b2b08f9f9c4064dbef2a87e5350dc62c0bfa10d226a53ebff1962c3ad3a75ad318fba SHA512 c03a06acdf6669291602df4938a14de113d48ffa598b3c4af7975bd16aea37d426878ff0f593f22992da135a7b6e27fbb39dbaca4f89726ec367552f14be433b
diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
deleted file mode 100644
index 04cfa560f193..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
-resulting binaries appear to be the same whether -fno-ipa-sra has been
-specified or not), clang fails on it as not recognised.
-Just get rid of it altogether.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@
- if(APPLE)
-     list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
- else()
--    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive)
-+    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
- endif()
- 
- if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
deleted file mode 100644
index e97ef6bf6138..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch
---- a/cmake/FindCImg.cmake
-+++ b/cmake/FindCImg.cmake
-@@ -147,7 +147,10 @@ if(ENABLE_JPEG)
- endif()
- 
- if(ENABLE_OPENEXR)
--  find_package(OpenEXR)
-+  find_package(OpenEXR CONFIG)
-+  if(NOT TARGET OpenEXR::OpenEXR)
-+    find_package(OpenEXR)
-+  endif()
- 
-   if(OpenEXR_FOUND)
-     list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr")
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -307,8 +307,8 @@
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR)
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
- # (http://www.fftw.org/)
diff --git a/media-gfx/gmic/gmic-3.0.1-r3.ebuild b/media-gfx/gmic/gmic-3.0.1-r3.ebuild
deleted file mode 100644
index bb07cf674b67..000000000000
--- a/media-gfx/gmic/gmic-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
-REQUIRED_USE="
-	gimp? ( 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=
-"
-DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
-	openexr? (
-		dev-libs/imath:=
-		media-libs/openexr:=
-	)
-	png? ( media-libs/libpng:= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools:5 )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
-	"${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || 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=no
-		-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"
-	local 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 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 qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-
-	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 qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -le "3.0.0"; then
-				einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
-				einfo "Please use the built-in G'MIC plugin provided with Krita 5 instead."
-				break
-			fi
-		done
-	fi
-}
diff --git a/media-gfx/gmic/gmic-3.2.1.ebuild b/media-gfx/gmic/gmic-3.2.1.ebuild
new file mode 100644
index 000000000000..3c824f3eee11
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.2.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
+SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
+
+REQUIRED_USE="
+	gimp? ( png fftw X )
+	qt5? ( png 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
+"
+DEPEND="
+	sys-libs/zlib:0=
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gimp? (
+		dev-qt/linguist-tools:5
+		media-gfx/gimp:0/2
+	)
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
+	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
+	"${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+gmic_emake() {
+	local mymakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		STRIP="/bin/true"
+		LIB="$(get_libdir)"
+		OPT_CFLAGS="${CXXFLAGS}"
+		OPT_LIBS="${LDFLAGS}"
+		GMIC_USE_CURL=$(usex curl)
+		GMIC_USE_EXR=$(usex openexr)
+		GMIC_USE_FFTW=$(usex fftw)
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		GMIC_USE_JPEG=$(usex jpeg)
+		GMIC_USE_OPENCV=$(usex opencv)
+		GMIC_USE_OPENMP=$(usex openmp)
+		GMIC_USE_PNG=$(usex png)
+		GMIC_USE_TIFF=$(usex tiff)
+		GMIC_USE_X11=$(usex X)
+		QMAKE="qmake5"
+	)
+
+	# Possibly unnecessary since 3.2.0, just in case though.
+	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
+	emake -j1 -C src \
+		"${mymakeargs[@]}" \
+		$@
+}
+
+src_compile() {
+	gmic_emake lib
+	gmic_emake libc
+	use cli && gmic_emake cli_shared
+	use gimp && gmic_emake gimp_shared
+	use qt5 && gmic_emake gmic_qt_shared
+}
+
+src_install() {
+	# See below for why this has to name a directory even if USE=-gimp
+	local gimp_plugindir="/deleteme"
+	if use gimp; then
+		if type gimptool &>/dev/null; then
+			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Cannot find GIMP plugin directory"
+		fi
+	fi
+
+	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+	# Upstream build scripts create PLUGINDIR and write some files to it
+	# regardless of whether the GIMP plug-in has been built or not, or even
+	# when they haven't been able to execute gimptool to get the base path.
+	use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+	# These are already gzipped in the source tarballs
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.40.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.40.ebuild
index 37dd8079e1a4..8171180c0101 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.40.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.40.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 1bbfaaea4539..37c23f2511ad 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,2 +1,3 @@
-DIST hydrus-515.tar.gz 41096030 BLAKE2B 47f09ef0b0a0c83960f7feadac28d14a051235a3f4601d6a0518b05c7c62ba4b0ec0093a474b232cc2bbca77c21579a69d963eb8372d7bab3d8ddd67a6067f1b SHA512 b8d330b546de1f8b4aa319783893d3fdfda7926faa05fd9494713e0a9f975b507eb1e42d56917a71721836162929f9bab78579f291aa72150f6e124c63bc259d
+DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051
 DIST hydrus-516.tar.gz 41098992 BLAKE2B 4195ade87f9f42f5aaf592ae502e49404d3fb188f7921c137973e7df31af8bb346c243a375e99014cfa9e3d6821a187b254cfe79f88c470cf54aa45e50e9bb22 SHA512 941cb81fba305708a1c33250aae366ae3bf8ba83d9aab90475bec09109608c86b68fdcc84d18a4fe324f57b2b91b8531887d9792b9d9130c5234f9cfa96e106f
+DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2
diff --git a/media-gfx/hydrus/hydrus-515.ebuild b/media-gfx/hydrus/hydrus-515.ebuild
deleted file mode 100644
index 6036cc0f1d38..000000000000
--- a/media-gfx/hydrus/hydrus-515.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-DOCS_BUILDER=mkdocs
-DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
-
-inherit python-single-r1 desktop docs optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# RDEPEND is sorted as such:
-# - No specific requirements
-# - Specific version or slot
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},lcms]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-		media-video/ffmpeg
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/userpath-in-local-share.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 and development, not actually needed
-	rm -r static/build_files static/requirements || die
-	# Python requirements file, not needed
-	rm requirements.txt || die
-	# Remove unneeded additional scripts
-	rm *.command *.sh *.bat || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-	docs_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
-	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 help_my_client_will_not_boot.txt db/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# ${DOCS[@]} files are copied into doc
-	# ${S}/docs/ is the markdown source code for documentation
-	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	if use doc; then
-		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
-		rm -r "${S}/_build" || die
-		# The program expects to find documentation here, so add a symlink to doc
-		dosym "${doc}/html" /opt/hydrus/help
-	fi
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
-	optfeature "memory compression in the client" "dev-python/lz4"
-	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
-}
diff --git a/media-gfx/hydrus/hydrus-518.ebuild b/media-gfx/hydrus/hydrus-518.ebuild
new file mode 100644
index 000000000000..072c47dfe381
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-518.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex"
+
+inherit python-single-r1 desktop docs optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+	SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch"
+else
+	SRC_URI="
+		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
+	"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/${PN}-3.11-test-fixes.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 and development, not actually needed
+	rm -r static/build_files static/requirements || die
+	# Python requirements file, not needed
+	rm requirements.txt || die
+	# Remove unneeded additional scripts
+	rm *.command *.sh *.bat || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+	docs_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
+	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 help_my_client_will_not_boot.txt db/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
+}
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index e447f565f37b..072c47dfe381 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
@@ -18,8 +18,12 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+	SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch"
 else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
+	"
 
 	KEYWORDS="~amd64"
 fi
@@ -58,7 +62,6 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
-		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
@@ -76,6 +79,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/${PN}-3.11-test-fixes.patch"
 )
 
 src_prepare() {
diff --git a/media-gfx/panini/metadata.xml b/media-gfx/panini/metadata.xml
index 56eed8856ff2..5fc9f473c187 100644
--- a/media-gfx/panini/metadata.xml
+++ b/media-gfx/panini/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>jubalh@iodoru.org</email>
+		<name>Michael Vetter</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">lazarus-pkgs/panini</remote-id>
 	</upstream>
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 38604bf15bb7..5978148372fd 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -1,7 +1,3 @@
-DIST renderdoc-1.21.tar.gz 46911586 BLAKE2B 4d4a38de38837c29e005f6c576a3de9edd221eb1dceda7e65fad65ccc6d672f2de0ebb008a9c0440f61647996f30189ffb71f2379aa04a20e68386416b6f4b35 SHA512 9386a42a1ceeb4712d43c18c699a0234ef7f55f6ca03c7a0537cd97dc76fa1429220b95d8f66c5007dfc92535ff552fdb8b3b755aa8e6ce159aa1e98c6fbce5b
-DIST renderdoc-1.21.tar.gz.asc 833 BLAKE2B baa858de1915a2e4e69bf1fdf21271fe39d0e768100330db3b0a9f312235a0253c8289265dedb6d458a2c829c3058dca74166269b08c8639ecec2d049a7193e5 SHA512 a2197421d004aa7b86672824fd61261ed91d802e1eb2319e1d5ba5d0c32c58dd61a7916ec41dc9a3b8661e24bd9d3f6da70d44e6ebe4a8e6a7dafe4f83ae5338
-DIST renderdoc-1.22.tar.gz 46942430 BLAKE2B 8dfdea0883fd050af2359bb26c7ed2f99109e9ded10251d60ee00c6d14146432d04ebe939559e845a8ebb48a4d35552e0478ce5efe9afbe5b6468abfd53db573 SHA512 b2e6d977293ff904e6919f041e6f6148612980ae22bcf19262aa54f8ea32c24510ab8c72be4178ddead91d400423d7a89a2129d04e6c339d4f33151bb1c4249b
-DIST renderdoc-1.22.tar.gz.asc 833 BLAKE2B e8281369e602302a56189f81c6a4fc8084d0167de7ca76cb5066653a3697aa0c74ade8565ff98fad64e72ba1e0d3eec6447c7b96974ef7814d512e07ebfa0a9c SHA512 070255fa5ddbcb52c938b9354c6505b9b1c4ba3cade9f066cd938424076f4c475efee061575da111038e9fb7b49487216542a7742048596d9e729160f8d68e9e
 DIST renderdoc-1.24.tar.gz 46998687 BLAKE2B 34316e81da94eeeb0aff2291563e9bf5c46089746f7dc53f8def2b047d0d377e5c26edd8fee23ff97d77037bcfc8468b7f27f2c82c7f6e80f20cd5278b026d75 SHA512 07cc35800c13893bf1b8f8635d5a819f546e458be6a8111d1b40d54e25977c0b88d7c7bc6a89a813dfa353e0fe0a84a334d3796e04c327bf2f42c65a172f9027
 DIST renderdoc-1.24.tar.gz.asc 833 BLAKE2B 0649f4437c57fee9cd69946cff3be0b2b156656fe648b56504ff241dbd43d37d4f3d6a89ea17bd006a7d4778f3d901e25756c069baeb3d55283d9046d19b3cb0 SHA512 fad7ffd3a9538d26b38a9a32a22021063cf9b457cedecb1e40cb7cf7a55e86c290ed1776877612af02205b0f8d35f5331f05e7b2fcdfc00469be21831b62939f
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch
deleted file mode 100644
index 94ec9a9bbf14..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1a9c1bc02d2ed1b8e1723750d8e9eb9fa92fddef Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Thu, 10 Feb 2022 18:02:37 +0000
-Subject: [PATCH] Use getenv("HOME") instead of getpwuid
-
----
- renderdoc/os/posix/linux/linux_stringio.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp
-index c704fc7fc..9a556ec16 100644
---- a/renderdoc/os/posix/linux/linux_stringio.cpp
-+++ b/renderdoc/os/posix/linux/linux_stringio.cpp
-@@ -595,8 +595,7 @@ rdcstr GetTempRootPath()
- 
- rdcstr GetAppFolderFilename(const rdcstr &filename)
- {
--  passwd *pw = getpwuid(getuid());
--  const char *homedir = pw->pw_dir;
-+  const char *homedir = getenv("HOME");
- 
-   rdcstr ret = rdcstr(homedir) + "/.renderdoc/";
- 
--- 
-2.35.1
-
diff --git a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch
deleted file mode 100644
index be808131c362..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 70442b7a3952350429872e95d843374f0aaa6a2f Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Sun, 30 Jan 2022 17:19:47 +0000
-Subject: [PATCH] build: Use system glslang
-
-Requires -DGLSLANG_TARGET_DIR option.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -437,6 +437,17 @@ elseif(UNIX)
-     endif()
- endif()
- 
-+# glslang package does not export a -config.cmake file.
-+option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
-+include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
-+include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
-+if(NOT TARGET glslang OR NOT TARGET SPIRV)
-+  message(FATAL_ERROR "glslang or SPIRV target not found")
-+endif()
-+
- add_subdirectory(renderdoc)
- 
- # these variables are handled within the CMakeLists.txt in qrenderdoc,
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -595,7 +595,7 @@ endif()
- add_library(renderdoc SHARED ${renderdoc_objects})
- target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
- target_include_directories(renderdoc ${RDOC_INCLUDES})
--target_link_libraries(renderdoc ${RDOC_LIBRARIES})
-+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang SPIRV)
- 
- add_dependencies(renderdoc renderdoc_libentry)
- 
---- a/renderdoc/data/glsl_shaders.cpp
-+++ b/renderdoc/data/glsl_shaders.cpp
-@@ -26,7 +26,7 @@
- #include "common/common.h"
- #include "common/formatting.h"
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "os/os_specific.h"
- 
- #define GLSL_HEADERS(HEADER) \
---- a/renderdoc/driver/gl/gl_shader_refl.cpp
-+++ b/renderdoc/driver/gl/gl_shader_refl.cpp
-@@ -26,7 +26,7 @@
- #include <algorithm>
- #include <functional>
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "gl_driver.h"
- 
- template <>
---- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
-+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-@@ -1,91 +1,3 @@
--set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang)
--set(glslang_sources
--    ${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp
--    ${glslang_dir}/OGLCompilersDLL/InitializeDll.h
--    ${glslang_dir}/SPIRV/GlslangToSpv.cpp
--    ${glslang_dir}/SPIRV/GlslangToSpv.h
--    ${glslang_dir}/SPIRV/GLSL.std.450.h
--    ${glslang_dir}/SPIRV/GLSL.ext.AMD.h
--    ${glslang_dir}/SPIRV/GLSL.ext.EXT.h
--    ${glslang_dir}/SPIRV/GLSL.ext.KHR.h
--    ${glslang_dir}/SPIRV/GLSL.ext.NV.h
--    ${glslang_dir}/SPIRV/hex_float.h
--    ${glslang_dir}/SPIRV/InReadableOrder.cpp
--    ${glslang_dir}/SPIRV/Logger.cpp
--    ${glslang_dir}/SPIRV/Logger.h
--    ${glslang_dir}/SPIRV/SpvBuilder.cpp
--    ${glslang_dir}/SPIRV/SpvBuilder.h
--    ${glslang_dir}/SPIRV/SpvTools.cpp
--    ${glslang_dir}/SPIRV/SpvTools.h
--    ${glslang_dir}/SPIRV/SpvPostProcess.cpp
--    ${glslang_dir}/SPIRV/spvIR.h
--    ${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp
--    ${glslang_dir}/glslang/GenericCodeGen/Link.cpp
--    ${glslang_dir}/glslang/Include/arrays.h
--    ${glslang_dir}/glslang/Include/BaseTypes.h
--    ${glslang_dir}/glslang/Include/Common.h
--    ${glslang_dir}/glslang/Include/ConstantUnion.h
--    ${glslang_dir}/glslang/Include/InfoSink.h
--    ${glslang_dir}/glslang/Include/InitializeGlobals.h
--    ${glslang_dir}/glslang/Include/intermediate.h
--    ${glslang_dir}/glslang/Include/PoolAlloc.h
--    ${glslang_dir}/glslang/Include/ResourceLimits.h
--    ${glslang_dir}/glslang/Include/revision.h
--    ${glslang_dir}/glslang/Include/ShHandle.h
--    ${glslang_dir}/glslang/Include/Types.h
--    ${glslang_dir}/glslang/MachineIndependent/Constant.cpp
--    ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp
--    ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h
--    ${glslang_dir}/glslang/MachineIndependent/gl_types.h
--    ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp
--    ${glslang_dir}/glslang/MachineIndependent/iomapper.h
--    ${glslang_dir}/glslang/MachineIndependent/gl_types.h
--    ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp
--    ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp
--    ${glslang_dir}/glslang/MachineIndependent/Initialize.h
--    ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
--    ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp
--    ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp
--    ${glslang_dir}/glslang/MachineIndependent/limits.cpp
--    ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp
--    ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h
--    ${glslang_dir}/glslang/MachineIndependent/localintermediate.h
--    ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp
--    ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp
--    ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp
--    ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h
--    ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp
--    ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp
--    ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h
--    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp
--    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp
--    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h
--    ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp
--    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp
--    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp
--    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h
--    ${glslang_dir}/glslang/MachineIndependent/reflection.cpp
--    ${glslang_dir}/glslang/MachineIndependent/reflection.h
--    ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp
--    ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h
--    ${glslang_dir}/glslang/MachineIndependent/ScanContext.h
--    ${glslang_dir}/glslang/MachineIndependent/Scan.cpp
--    ${glslang_dir}/glslang/MachineIndependent/Scan.h
--    ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp
--    ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp
--    ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h
--    ${glslang_dir}/glslang/MachineIndependent/Versions.cpp
--    ${glslang_dir}/glslang/MachineIndependent/Versions.h
--    ${glslang_dir}/glslang/MachineIndependent/attribute.cpp
--    ${glslang_dir}/glslang/MachineIndependent/attribute.h
--    ${glslang_dir}/glslang/OSDependent/osinclude.h
--    ${glslang_dir}/glslang/Public/ShaderLang.h)
--
--if(UNIX)
--    list(APPEND glslang_sources
--        ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
--endif()
--
- set(sources
-     glslang_compile.cpp
-     glslang_compile.h
-@@ -108,8 +20,7 @@ set(sources
-     spirv_processor.h
-     spirv_disassemble.cpp
-     spirv_stringise.cpp
--    var_dispatch_helpers.h
--    ${glslang_sources})
-+    var_dispatch_helpers.h)
- 
- add_definitions(-DAMD_EXTENSIONS)
- add_definitions(-DNV_EXTENSIONS)
---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-@@ -29,8 +29,8 @@
- #undef min
- #undef max
- 
--#include "glslang/glslang/Include/Types.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Include/Types.h>
-+#include <glslang/Public/ShaderLang.h>
- 
- static bool glslang_inited = false;
- rdcarray<glslang::TShader *> *allocatedShaders = NULL;
-@@ -129,6 +129,7 @@ static TBuiltInResource DefaultResources = {
-     /*.maxTaskWorkGroupSizeY_NV =*/1,
-     /*.maxTaskWorkGroupSizeZ_NV =*/1,
-     /*.maxMeshViewCountNV =*/4,
-+    /*.maxDualSourceDrawBuffersEXT =*/1,
- 
-     /*.limits*/
-     {
---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-@@ -31,8 +31,8 @@
- #undef min
- #undef max
- 
--#include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/SPIRV/GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
- 
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
-                        rdcarray<uint32_t> &spirv)
diff --git a/media-gfx/renderdoc/renderdoc-1.21.ebuild b/media-gfx/renderdoc/renderdoc-1.21.ebuild
deleted file mode 100644
index 547e21513366..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.21.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	dev-util/glslang
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.18-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.20-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Ensure that we use the system glslang headers instead of the
-	# vendored copy.
-	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	# Lots of type mismatch issues.
-	filter-lto
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild
deleted file mode 100644
index f89d8865ddb7..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-# For Python 3.11, see https://github.com/baldurk/renderdoc/issues/2730
-PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	>=dev-util/glslang-1.3.231:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.18-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.22-r1-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Ensure that we use the system glslang headers instead of the
-	# vendored copy.
-	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	# Lots of type mismatch issues.
-	filter-lto
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.22.ebuild b/media-gfx/renderdoc/renderdoc-1.22.ebuild
deleted file mode 100644
index 47381cf87597..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.22.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-# For Python 3.11, see https://github.com/baldurk/renderdoc/issues/2730
-PYTHON_COMPAT=( python3_{9,10} )
-inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	dev-util/glslang
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.18-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.20-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Ensure that we use the system glslang headers instead of the
-	# vendored copy.
-	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	# Lots of type mismatch issues.
-	filter-lto
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.24.ebuild b/media-gfx/renderdoc/renderdoc-1.24.ebuild
index d7e55bb1ce79..f524df42b3ef 100644
--- a/media-gfx/renderdoc/renderdoc-1.24.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ AUTOTOOLS_AUTO_DEPEND="no"
 DOCS_BUILDER="sphinx"
 DOCS_DIR="docs"
 # For Python 3.11, see https://github.com/baldurk/renderdoc/issues/2730
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
 
 DESCRIPTION="A stand-alone graphics debugging tool"
@@ -40,7 +40,7 @@ SRC_URI="
 # swig: GPL-3+ BSD BSD-2
 LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pyside2 qt5"
 REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-gfx/scrot/scrot-1.8.1.ebuild b/media-gfx/scrot/scrot-1.8.1.ebuild
index ba72c669ffce..47b8cb413562 100644
--- a/media-gfx/scrot/scrot-1.8.1.ebuild
+++ b/media-gfx/scrot/scrot-1.8.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="feh LGPL-2+"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1aa2360c3992..e57a2a485ee5 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
index 9a108ddf4ff2..dec0b5ace8f9 100644
--- a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="media-libs/libpng:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index f340daa34e99..ff3907b10097 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,2 +1,2 @@
-DIST babl-0.1.100.tar.xz 313808 BLAKE2B 068693717d6b9535b1e562d014350e7fb9e891cbb2aab54b6a146acb3c202c54add4b6599624e200c872f6fc44756b62c6e4daf06f806a03abbc5faee61f61a3 SHA512 19d2f656b2c758f7b4b5ac090c08689617db0eb8c304ef501ff002ca32e9ddd7eeb99d5d9aeaba79c34c4c551bda936f5a1b209fad20cd73db85b0ddea82f9da
+DIST babl-0.1.102.tar.xz 313872 BLAKE2B b5720b256368c0d1cba5f6da98185bcad3770390e38e0a495b19a51ef3adeb9ab25e9ada8c085fc685261ca5722ee0dd6876091bf366a0a9ef876e096b8cdba9 SHA512 7a4cbf011bdac3dbb41e76fbb7fe389b3bfc2c844b58b2f743c0805fac47ea8d8f94997ed3e8f0744d7ed8d9b7d14b807fddddb959d809cff8f729462fe1b601
 DIST babl-0.1.98.tar.xz 312516 BLAKE2B c12626e4b8127a5b2e17507e20cf6ce324834a58d64fa54b80fbe00ef2468d3d29c870d44a22f08f7e74404cf6f47321084c854a4ba017cf0c8c199d8210849f SHA512 33b2e3f8fbcd6602bb82d6242dd2911bb2232e69350f7a0e70e14b1472052e27b0e2a1fa6a2b6d0449fc9796353336e311c8d4007c532447cd61f95b684a3120
diff --git a/media-libs/babl/babl-0.1.100.ebuild b/media-libs/babl/babl-0.1.102.ebuild
similarity index 100%
rename from media-libs/babl/babl-0.1.100.ebuild
rename to media-libs/babl/babl-0.1.102.ebuild
diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
index df7811180d4a..4dadc4a70ab4 100644
--- a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/dav1d/dav1d-1.1.0.ebuild b/media-libs/dav1d/dav1d-1.1.0.ebuild
index b5f6a15127d1..a673178e2710 100644
--- a/media-libs/dav1d/dav1d-1.1.0.ebuild
+++ b/media-libs/dav1d/dav1d-1.1.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit meson-multilib
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
index 375b82c75a5f..5f49c1190a16 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	inherit libtool
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/gegl/gegl-0.4.42-r1.ebuild b/media-libs/gegl/gegl-0.4.42-r1.ebuild
new file mode 100644
index 000000000000..fb178cc72f3d
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.42-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="https://gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.68.2:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.98[introspection?,lcms?,vala?]
+	media-libs/libjpeg-turbo
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	sdl2? ( >=media-libs/libsdl2-2.0.20 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:= )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# patch executables suffix
+	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
+	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
+	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
+	# skip UNEXPECTED PASSED 'matting-levin' test
+	sed -i -e "s/composition_tests += 'matting-levin'//" \
+		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
+	pushd "${S}/opencl/" || die
+	for file in *.cl; do
+		if [[ -f ${file} ]]; then
+			"${EPYTHON}" cltostring.py "${file}" || die
+		fi
+	done
+	popd || die
+}
+
+src_configure() {
+	# Bug #859901
+	filter-lto
+
+	use vala && vala_setup
+
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Djasper=disabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature openmp)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature sdl2 sdl2)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
+}
diff --git a/media-libs/gegl/gegl-0.4.42.ebuild b/media-libs/gegl/gegl-0.4.42.ebuild
deleted file mode 100644
index 89deb6434997..000000000000
--- a/media-libs/gegl/gegl-0.4.42.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.68.2:2
-	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.100[introspection?,lcms?,vala?]
-	media-libs/libjpeg-turbo
-	media-libs/libnsgif
-	>=media-libs/libpng-1.6.0:0=
-	>=sys-libs/zlib-1.2.0
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/pango-1.38.0
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	sdl2? ( >=media-libs/libsdl2-2.0.20 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:= )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	use test || return 0
-	python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	# patch executables suffix
-	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
-	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
-	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
-	# skip UNEXPECTED PASSED 'matting-levin' test
-	sed -i -e "s/composition_tests += 'matting-levin'//" \
-		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
-
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
-	pushd "${S}/opencl/" || die
-	for file in *.cl; do
-		if [[ -f ${file} ]]; then
-			"${EPYTHON}" cltostring.py "${file}" || die
-		fi
-	done
-	popd || die
-}
-
-src_configure() {
-	# Bug #859901
-	filter-lto
-
-	use vala && vala_setup
-
-	local emesonargs=(
-		#  - Disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		-Ddocs=false
-		-Dexiv2=disabled
-		-Dgdk-pixbuf=enabled
-		-Djasper=disabled
-		#  - libspiro: not in portage main tree
-		-Dlibspiro=disabled
-		-Dlua=disabled
-		-Dmrg=disabled
-		-Dpango=enabled
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_feature cairo)
-		$(meson_feature cairo pangocairo)
-		$(meson_feature ffmpeg libav)
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature openexr)
-		$(meson_feature openmp)
-		$(meson_feature pdf poppler)
-		$(meson_feature raw libraw)
-		$(meson_feature sdl sdl1)
-		$(meson_feature sdl2 sdl2)
-		$(meson_feature svg librsvg)
-		$(meson_feature test pygobject)
-		$(meson_feature tiff libtiff)
-		$(meson_feature umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
-		$(meson_feature vala vapigen)
-		$(meson_feature webp)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
-}
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 38f965aac7f8..e831ab1a713d 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,2 +1,4 @@
 DIST libass-0.16.0.tar.xz 396304 BLAKE2B d5d1a2492faaff671182b1ebdbdbab230529897575a485113a1025e73b3bdee1d5136f1dde9f5ded2bed3ad27fab78601d8f586499b5c7c3160f5d94a6357bea SHA512 ada605f5887da06aa1d072a52f8baaba64b62008ccb377560d71d5a030c1f5434d6c60fe39a156e063f553b8a07b4dfe954e4d035036888a629c6e663ce60ba9
 DIST libass-0.16.0.tar.xz.asc 228 BLAKE2B 78596aa961939f16ab0de76a040038bb299591be329808ad662bb3bf91fe59b2b78557ec6837a99bd232d986fd06953fc40b03a110122627af33a8877dc51d6a SHA512 2696214e9d3f3d5ace7946dc37b8103fe5cfb6d0b86b19620e7bd2aaff5a701b244edae892c7a673d8ba6e93ff324dfde9c7ba75ef19a9710dcdef42fffafa6b
+DIST libass-0.17.1.tar.xz 403160 BLAKE2B b191e8910ddb3e41fb9df79b27517a127c0da2ad74c0a81920bc2cf8843ab18b02a60738024fa8d3594b91bd26ec6ea7f87e17ca5e07825a6017dd29d2b72b32 SHA512 437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23
+DIST libass-0.17.1.tar.xz.asc 228 BLAKE2B 0e70c104438be4409239f435d7872737fde1aba4485816ad0e35f0de743ee303662e66334425d0d511af4974e03443ba6d33ac44f941de9b0da17a56f204edea SHA512 a28c8271b4c5b5756620be9baf81b0262eb71c4f20d1aadb24238d1d0ccba44fdb3b25d788a3f7c9039945431a3d31842a7855660cc28a0a8acc36ff8f0c0298
diff --git a/media-libs/libass/libass-0.17.1.ebuild b/media-libs/libass/libass-0.17.1.ebuild
new file mode 100644
index 000000000000..05e4b30b8395
--- /dev/null
+++ b/media-libs/libass/libass-0.17.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libass.asc
+inherit multilib-minimal verify-sig
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="https://github.com/libass/libass"
+SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz.asc )"
+
+LICENSE="ISC"
+SLOT="0/9" # subslot = libass soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="+fontconfig test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-1.2.3:=[truetype,${MULTILIB_USEDEP}]
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	test? ( media-libs/libpng[${MULTILIB_USEDEP}] )
+	verify-sig? ( sec-keys/openpgp-keys-libass )
+"
+
+DOCS=( Changelog )
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable fontconfig) \
+		$(use_enable test) \
+		--disable-require-system-font-provider
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index f5e54250bcb7..e0230bfd7cd6 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1 +1,2 @@
 DIST libdiscid-0.6.2.tar.gz 401455 BLAKE2B 0b122f08de89af7863ed21158637e961d8cdbf4dc926e5ff641aad4f23e8b02d8e970221f51caae44d2943b894922134baeb9e99595dee74c085e31b0daefc99 SHA512 7ce9bb589f64644ef44400620bd3e65a329e52c5698b44c3dc1569fb143d9af15d540b95fbdce1b87db0263e2ff55c81133213ed1708cdb25af1b38a46c4e1ac
+DIST libdiscid-0.6.3.tar.gz 393053 BLAKE2B a8fa262e582adc2ed1d37a6ec3bcbf7594c26c46f2ffebe7c3119db6cab34cca0457fffb15aa7a5c153ceb3d279a7a2ea472f103e673b4ca0429357c8f3659a3 SHA512 71ad1ecd979ddea60b581ae94789cd7d547b274500667dcec06e9fc27bc2d9009732a902250070db48a597d4e5798b556a65576ba9d212ea5e6bdb5525feb4f7
diff --git a/media-libs/libdiscid/libdiscid-0.6.3.ebuild b/media-libs/libdiscid/libdiscid-0.6.3.ebuild
new file mode 100644
index 000000000000..00715ae80d75
--- /dev/null
+++ b/media-libs/libdiscid/libdiscid-0.6.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Client library to create MusicBrainz enabled tagging applications"
+HOMEPAGE="http://musicbrainz.org/doc/libdiscid"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	dodoc examples/discid.c
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
index 43fa4bd1f633..5ca93b155253 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
index 0dec75c32601..715276cc4177 100644
--- a/media-libs/libilbc/libilbc-3.0.4.ebuild
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
diff --git a/media-libs/libiptcdata/metadata.xml b/media-libs/libiptcdata/metadata.xml
index ee6dfaf6bd0e..00ae320fd7ea 100644
--- a/media-libs/libiptcdata/metadata.xml
+++ b/media-libs/libiptcdata/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>vivo75@gmail.com</email>
-		<name>Francesco Riosa</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		libiptcdata is a library, written in C, for manipulating the
 		International Press Telecommunications Council (IPTC) metadata stored
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
index 32d2956fb5d4..4088678be5ca 100644
--- a/media-libs/libsixel/libsixel-1.10.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="curl gd gtk jpeg png python test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libva/libva-2.17.0.ebuild b/media-libs/libva/libva-2.17.0.ebuild
index 131eb90cc6aa..5e8b20413486 100644
--- a/media-libs/libva/libva-2.17.0.ebuild
+++ b/media-libs/libva/libva-2.17.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 185404267ba5..8442a8fa3c7f 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1 +1,2 @@
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
+DIST ptex-2.4.2.tar.gz 312942 BLAKE2B 13446eae2327f92410859f7e01dc30e46a069d2069b2b1bf1bd9fe52902efacb6aeadc2c3bdc66dfad17662e01ae6fd3fac2861674691646871721d9e12ceb12 SHA512 3b9607b7803e7c857bb00a6d4d8bbe108810c622a3593fb5d655183f3e6689f274ee5e79bcaab6928de38daf05cf25eb56125f39477f134131a8ad45071551b3
diff --git a/media-libs/ptex/metadata.xml b/media-libs/ptex/metadata.xml
index d644ef1fd59f..0b9a4bd455e6 100644
--- a/media-libs/ptex/metadata.xml
+++ b/media-libs/ptex/metadata.xml
@@ -5,6 +5,10 @@
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>waebbl-gentoo@posteo.net</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/media-libs/ptex/ptex-2.4.2.ebuild b/media-libs/ptex/ptex-2.4.2.ebuild
new file mode 100644
index 000000000000..a8b095d5b9f7
--- /dev/null
+++ b/media-libs/ptex/ptex-2.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
+HOMEPAGE="https://ptex.us/"
+SRC_URI="https://github.com/wdas/ptex/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="app-doc/doxygen"
+
+RESTRICT="test"
+
+src_prepare() {
+	# https://github.com/wdas/ptex/issues/41
+	cat <<-EOF > version || die
+	v${PV}
+	EOF
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
+		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index 31977ffd46dc..58795071635d 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -1 +1,2 @@
+DIST zita-resampler-1.10.1.tar.xz 118800 BLAKE2B b8871899b7e6cac9b46df3c45c5bb1d8e9c9edd41bcbc5944098d9c4eee2ff4e4d216f97b3bfa96ac43082b5333de26201d6cba9eaa152efd20e8c5017478391 SHA512 ba95286b0744df393194f4f94a8aad62f6c088cf80f6be71482ed55beef6503a9bab6644f2565b69002247611fcf0fb6561fc0072578466a0133311721b43cf5
 DIST zita-resampler-1.8.0.tar.bz2 131161 BLAKE2B 1ba5d255fff9c66e18e6177bc7e48a4710fdf54f58c07f162f8c8801f4f449b22dea9922645e7e33b70e07739c2b381176714e704f9840305f194f3c23d66de2 SHA512 adf1f465ac09104be5a02c1cf0f052a44b4c1a448312f3aca016a889e98cfcdebfded38f60300ad85d18ae03eadca7e8e95efb2875267bc36435ccfac881a8e7
diff --git a/media-libs/zita-resampler/files/zita-resampler-1.10.1-makefile.patch b/media-libs/zita-resampler/files/zita-resampler-1.10.1-makefile.patch
new file mode 100644
index 000000000000..45859759c445
--- /dev/null
+++ b/media-libs/zita-resampler/files/zita-resampler-1.10.1-makefile.patch
@@ -0,0 +1,79 @@
+diff -urpN zita-resampler-1.10.1.orig/apps/Makefile zita-resampler-1.10.1/apps/Makefile
+--- zita-resampler-1.10.1.orig/apps/Makefile	2023-02-17 12:27:32.000000000 +0300
++++ zita-resampler-1.10.1/apps/Makefile	2023-02-19 15:19:08.513618954 +0300
+@@ -23,18 +23,17 @@ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= /usr/share/man/man1
+ 
+ VERSION = 1.10.1
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2  -ffast-math -Wall
+-CXXFLAGS += -march=native
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I ../source
++CXXFLAGS += -ffast-math -Wall
+ 
+ 
+-all:	zresample zretune zresample.1.gz zretune.1.gz
++all:	zresample zretune
+ 
+ 
+ ZRESAMPLE_O = zresample.o audiofile.o dither.o
+ zresample:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zresample:	$(ZRESAMPLE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
+ $(ZRESAMPLE_O):
+ -include $(ZRESAMPLE_O:%.o=%.d)
+ 
+@@ -42,31 +41,24 @@ $(ZRESAMPLE_O):
+ ZRETUNE_O = zretune.o audiofile.o dither.o
+ zretune:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zretune:	$(ZRETUNE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
+ $(ZRETUNE_O):
+ -include $(ZRETUNE_O:%.o=%.d)
+ 
+ 
+-zresample.1.gz:	zresample.1
+-	gzip -c zresample.1 > zresample.1.gz
+-
+-zretune.1.gz:	zretune.1
+-	gzip -c zretune.1 > zretune.1.gz
+-
+-
+ install:	all
+ 	install -d $(DESTDIR)$(BINDIR)
+ 	install -d $(DESTDIR)$(MANDIR)
+ 	install -m 755 zresample $(DESTDIR)$(BINDIR)
+ 	install -m 755 zretune $(DESTDIR)$(BINDIR)
+-	install -m 644 zresample.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zretune.1.gz $(DESTDIR)$(MANDIR)
++	install -m 644 zresample.1 $(DESTDIR)$(MANDIR)
++	install -m 644 zretune.1 $(DESTDIR)$(MANDIR)
+ 
+ uninstall: 
+ 	/bin/rm -f $(DESTDIR)$(BINDIR)/zresample
+ 	/bin/rm -f $(DESTDIR)$(BINDIR)/zretune
+-	/bin/rm -f $(DESTDIR)$(MANDIR)/zresample.1.gz
+-	/bin/rm -f $(DESTDIR)$(MANDIR)/zretune.1.gz
++	/bin/rm -f $(DESTDIR)$(MANDIR)/zresample.1
++	/bin/rm -f $(DESTDIR)$(MANDIR)/zretune.1
+ 
+ clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so *.gz zresample zretune
+diff -urpN zita-resampler-1.10.1.orig/source/Makefile zita-resampler-1.10.1/source/Makefile
+--- zita-resampler-1.10.1.orig/source/Makefile	2023-02-17 12:27:32.000000000 +0300
++++ zita-resampler-1.10.1/source/Makefile	2023-02-19 15:07:48.327102241 +0300
+@@ -31,11 +31,9 @@ VERSION = $(MAJVERS).$(MINVERS)
+ DISTDIR = zita-resampler-$(VERSION)
+ 
+ CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CPPFLAGS += -DENABLE_SSE2
+ CPPFLAGS += -DZITA_RESAMPLER_MAJOR_VERSION=$(MAJVERS)
+ CPPFLAGS += -DZITA_RESAMPLER_MINOR_VERSION=$(MINVERS)
+-CXXFLAGS += -Wall -fPIC -O2 -ffast-math
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC -ffast-math
+ LDFLAGS += 
+ LDLIBS +=
+ 
diff --git a/media-libs/zita-resampler/zita-resampler-1.10.1.ebuild b/media-libs/zita-resampler/zita-resampler-1.10.1.ebuild
new file mode 100644
index 000000000000..cfb0bb30df59
--- /dev/null
+++ b/media-libs/zita-resampler/zita-resampler-1.10.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C++ library for real-time resampling of audio signals"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 tools"
+
+RDEPEND="tools? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+HTML_DOCS="docs/."
+
+PATCHES=( "${FILESDIR}"/${PN}-1.10.1-makefile.patch )
+
+src_compile() {
+	tc-export CXX
+	if use cpu_flags_x86_sse2 ; then
+		append-cppflags "-DENABLE_SSE2"
+	fi
+
+	emake -C source
+	if use tools; then
+		emake -C apps
+	fi
+}
+
+src_install() {
+	emake -C source DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
+	if use tools; then
+		emake -C apps DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	fi
+
+	einstalldocs
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index b6ba029477da..f0af5b45a691 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/hdx-realtime-media-engine/Manifest b/media-plugins/hdx-realtime-media-engine/Manifest
index accc327dd387..14b23b4b317a 100644
--- a/media-plugins/hdx-realtime-media-engine/Manifest
+++ b/media-plugins/hdx-realtime-media-engine/Manifest
@@ -2,3 +2,5 @@ DIST HDX_RealTime_Media_Engine_2.9.400_for_Linux.zip 30105551 BLAKE2B cf511ecc01
 DIST HDX_RealTime_Media_Engine_2.9.400_for_Linux_x64.zip 30137698 BLAKE2B 87819d23930898c9849c5bacb83551b46401185c2eaa9342c7a9fee28592f072a659d698e028bfcaf45dfe7cf4393aa7ad49aa6f92e79c6768c298759e116dce SHA512 6fa794646cfe607b94a42c430f2fdb6cde3cc1135a115436b6a2e6629b256ce27e5a116dbab707b5a9c1e6e8065ebd6fd67756a2ddb34245b945970471f56cf4
 DIST HDX_RealTime_Media_Engine_2.9.500_for_Linux.zip 30099634 BLAKE2B aee56c8f2e909ebdeba751ec45a74f7e0a350c7d3ecca0f815f5da5693d3b0941e07cd7bcfdc4d86cbae97668b6252e308e30d57d08494b7ff47ad4e302a8494 SHA512 bfc1949dd8a2774fa0e3228c75523d26d6f28f39e2936b5152567f52a39dc853569a4a012c7e49fa72dd7e75262f0a615bad872191be155ca9c6920bf56ae888
 DIST HDX_RealTime_Media_Engine_2.9.500_for_Linux_x64.zip 30138987 BLAKE2B f59c7cac53c7fdf9560ef7f31ade2e3439c8fa54e46cfb8ad86e4b8bc8880073e73cce5f4cafd2d009ec8bae688d41c8bc8f7d26cf2b89665c2414b87aa0bd6c SHA512 8d9bd9ac2414472d80f04025f0966e32f4157ecd6757c9361c46a2a5d077a3913b93cf5f91f175a239dc4e85363f65a6c855c637a5bce2b3d71775ef66fa345d
+DIST HDX_RealTime_Media_Engine_2.9.600_for_Linux.zip 30123995 BLAKE2B fbdc61bd46ce655ff223815eb54c582adc98af90aa99284731a841b7aad92446ec2c7630e302b947eab79f70d09a9d1f648c582c48403a0df196a03ff8c4704f SHA512 7195b3d99fc1254a9dd0c09532c595be2f4db85eed4071b61891a6d66d99bc763a3f47f93d907fa0e81646cb9a83a3f818c8b36be0804df29bed3b35f853176c
+DIST HDX_RealTime_Media_Engine_2.9.600_for_Linux_x64.zip 30156876 BLAKE2B 758593a90c421b7d93ba37fc9c219e0cd72ada0ef886560973b404a55ff89791ff429d34543030b382fa8fb595c578804f79f5d72487624382deac60817914dc SHA512 26078eafac9395c00d0ef7f215172259d97e6e929633c3987b9ed78252c6583b7d18136ac193c953b599227e4aef8a65dcf03dd8cf8d3f52ce700ffbd1bc5922
diff --git a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.600.2900.ebuild b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.600.2900.ebuild
new file mode 100644
index 000000000000..0d1c23d6f8b3
--- /dev/null
+++ b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.600.2900.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="HDX RealTime Media Engine plugin for Citrix Workspace App"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( HDX_RealTime_Media_Engine_${MY_PV}_for_Linux_x64.zip )
+	x86? ( HDX_RealTime_Media_Engine_${MY_PV}_for_Linux.zip )"
+LICENSE="icaclient"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch mirror strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	sys-libs/llvm-libunwind
+	|| (
+		media-video/pipewire
+		media-sound/pulseaudio
+		media-sound/apulse
+	)
+	!<net-misc/icaclient-22.12.0.12
+	x11-libs/libX11
+	x11-libs/libXv
+"
+
+ICAROOT="/opt/Citrix/ICAClient"
+QA_PREBUILT="${ICAROOT#/}/*"
+
+REQUIRES_EXCLUDE="
+	libpulse.so.0
+	libsndfile.so.1
+"
+
+S="${WORKDIR}/usr/local/bin"
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from"
+	elog "https://www.citrix.com/downloads/workspace-app/additional-client-software/hdx-realtime-media-engine.html"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			zip_dir="x86_64"
+			zip_arch="amd64"
+		;;
+		x86)
+			zip_dir="i386"
+			zip_arch="i386"
+		;;
+	esac
+}
+
+src_unpack() {
+	default
+
+	local MY_T="${WORKDIR}/HDX_RealTime_Media_Engine_${MY_PV}_for_Linux$(usex amd64 '_x64' '')"
+	local deb_base_name="citrix-hdx-realtime-media-engine"
+	unpack_deb ${MY_T}/${zip_dir}/${deb_base_name}_$(ver_rs 3 -)_${zip_arch}.deb
+}
+
+src_install() {
+	insinto "${ICAROOT}/rtme"
+
+	# No, we do NOT install such a generic udev rule into the system
+	local destfiles=(
+		DialTone_US.wav
+		EULA.rtf
+		InboundCallRing.wav
+	)
+
+	local el
+	for el in "${destfiles[@]}" ; do
+		doins "${el}"
+	done
+
+	exeinto "${ICAROOT}"/rtme
+	doexe RTMEconfig RTMediaEngineSRV
+
+	for el in /var/{lib,log}/RTMediaEngineSRV /var/lib/Citrix/HDXRMEP ; do
+		keepdir ${el}
+		fperms a+rw ${el}
+	done
+
+	insinto "${ICAROOT}"
+	doins HDXRTME.so
+}
diff --git a/media-plugins/zam-plugins/Manifest b/media-plugins/zam-plugins/Manifest
index 20140b5fafa4..92b19cade9c9 100644
--- a/media-plugins/zam-plugins/Manifest
+++ b/media-plugins/zam-plugins/Manifest
@@ -1,5 +1,3 @@
 DIST DPF-88180608a206b529fcb660d406ddf6f934002806.tar.gz 3473209 BLAKE2B 74d237a222d2f59e437f98da456a4fb8eb29ef4337054752ac28067cf054de971e600fc141eb2d9ede1d123cbcc94665c4abe005281f427b76c27c0846e91a41 SHA512 7ea26d27bfb17fe67d2c4c4077d203b447407986594b833ee545319221c9c08fb434c1ca11ad425a8d9369df41b331c1286ddd85aabdd7a8570ab7a25b88b0e7
-DIST DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz 2114589 BLAKE2B c8f2cd92b47aa55a467ce14ef2adc8f776c6ce966df680b10c3efbd35ec45fd05ad3a7dee68788701a36a032d563ce2767236397daa0757095b653ecfefcb0fa SHA512 0eab116c5b57d44dc340400340d8fc8456045bdc7e8dbeaccb80f87c7c2e1784f2b24edb8e01e3b6e23807dec86f18caf7227db2c2fd491135b283e795701fb1
 DIST pugl-844528e197c51603f6cef3238b4a48d23bf60eb7.tar.gz 214521 BLAKE2B 2f96fd3f97f3e1c56c06e6c1c08f7d585267b1006428925eeafe5250a9f6da489d4870bd4136ab6d3951f2984d631b5495816610774cad74e07ac8ba2622c2f9 SHA512 ad2eb02099d8539dfcffdda093cf4a8dcb1c959d8c4f860bba2a9777f0bfe3d4f2471ae56d5f7be779a8402c5b446e44c2c7aa66ff07bb87787cf0bd8add6772
-DIST zam-plugins-3.14.tar.gz 23924833 BLAKE2B cdaa13d728cd7a9f7fa2ed53b04b76988bc88d0aa719c57913fd73be778186821d316add5eeea692dabfe1ca222c2f9aaf564abc1128f69da33b8aa592255eec SHA512 30c168ee855011b2f17fcc5e440039628399ab40b69bed9af284713df6155360b38d8249b3de1616e9a2f39885cff43c9e2505868aae891fd22bc92297c1962c
 DIST zam-plugins-4.1.tar.gz 23926863 BLAKE2B 6f503221801a5a40bc7f4e76f6ff5eceb15bac5a5bce3b8c48233143971b9af13d6420b6ba4c1ed679136f952166fc323de7a77a7c6d30761a91e6e1d2d2b04d SHA512 53ffd7f4cebbb65fcdaae53b7d0ad922dd2b1e76479da7caa2c4100d04b5258e0aec4bbfb3b8632b4198375e6677659139abb907bfe9fc11ded772c4e14d5e14
diff --git a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
deleted file mode 100644
index 39faf73105b8..000000000000
--- a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DPF_COMMIT="9243625aacb9fb8dd9fe4bd479b227149eb37959"
-DPF_P="DPF-${DPF_COMMIT}"
-
-DESCRIPTION="Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing"
-HOMEPAGE="https://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins"
-SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/DISTRHO/DPF/archive/${DPF_COMMIT}.tar.gz -> ${DPF_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="jack opengl"
-
-DEPEND="media-libs/ladspa-sdk
-	media-libs/liblo
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/lv2
-	media-libs/zita-convolver
-	sci-libs/fftw:3.0
-	x11-libs/libX11
-	jack? ( virtual/jack )
-	opengl? (
-		media-libs/libglvnd[X]
-		x11-libs/cairo[X]
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	rm -rf dpf
-	ln -s ../${DPF_P} dpf || die "Failed to create DPF symlink"
-
-	# To make absolutely sure we do not even accidentally use bundled libs
-	rm -rf lib
-}
-
-src_compile() {
-	emake PREFIX=/usr LIBDIR=$(get_libdir) VERBOSE=true \
-		BASE_OPTS="" SKIP_STRIPPING=true \
-		HAVE_ZITA_CONVOLVER=true \
-		HAVE_CAIRO=$(usex opengl true false) \
-		HAVE_DGL=$(usex opengl true false) \
-		HAVE_OPENGL=$(usex opengl true false) \
-		UI_TYPE=$(usex opengl "opengl" "none") \
-		HAVE_JACK=$(usex jack true false)
-}
-
-src_install() {
-	emake PREFIX=/usr LIBDIR=$(get_libdir) VERBOSE=true \
-		BASE_OPTS="" SKIP_STRIPPING=true \
-		HAVE_ZITA_CONVOLVER=true \
-		HAVE_CAIRO=$(usex opengl true false) \
-		HAVE_DGL=$(usex opengl true false) \
-		HAVE_OPENGL=$(usex opengl true false) \
-		UI_TYPE=$(usex opengl "opengl" "none") \
-		HAVE_JACK=$(usex jack true false) \
-		DESTDIR="${ED}" install
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 91379268b7e3..30e348074b8d 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/ardour/ardour-7.3.ebuild b/media-sound/ardour/ardour-7.3.ebuild
index 4c32a9d5eadb..534c435d20b3 100644
--- a/media-sound/ardour/ardour-7.3.ebuild
+++ b/media-sound/ardour/ardour-7.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
 inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 4c32a9d5eadb..534c435d20b3 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
 inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index f134b8dd77d5..50ee3bf2b402 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,2 +1 @@
-DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
 DIST denemo-2.6.0.tar.gz 17620623 BLAKE2B 55d142954834332a4bd5ca89125411181521d53f1a552b1397b16bbc51803cac3bc4eb0ffb309ababe2ad1b554e293d23102383aba95cde1cbb18cc96f9c6203 SHA512 9069c973624f05b53c62e5d8a9db5c2b4835ce3465402544d6a9f2a7d3bd617d79ac35c83940b37842a7a147bc2ee44ef33202bf7c107e739bfa303ffcf19738
diff --git a/media-sound/denemo/denemo-2.5.0-r1.ebuild b/media-sound/denemo/denemo-2.5.0-r1.ebuild
deleted file mode 100644
index 77832e66e95b..000000000000
--- a/media-sound/denemo/denemo-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools font xdg
-
-DESCRIPTION="A music notation editor"
-HOMEPAGE="http://www.denemo.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# configure options currently not used:
-# --enable-mem(no) memory debugging: needs Electric fence (efence), which
-#		is not available in portage. See https://github.com/boundarydevices/efence
-# --enable-gtk-doc-pdf(no) doesn't work
-IUSE="alsa +aubio debug jack +fluidsynth gtk-doc nls +portaudio +portmidi
-	+rubberband test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/evince-3.22.1-r1:=
-	dev-libs/libxml2:2
-	>=dev-scheme/guile-2:12=
-	gnome-base/librsvg:2
-	media-libs/fontconfig:1.0
-	>=media-libs/libsmf-1.3
-	>=media-libs/libsndfile-1.0.28-r1
-	>=media-sound/lilypond-2.19.54
-	x11-libs/gtk+:3
-	x11-libs/gtksourceview:3.0=
-	alsa? ( >=media-libs/alsa-lib-1.1.2 )
-	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= )
-	jack? ( virtual/jack )
-	portaudio? (
-		>=media-libs/portaudio-19_pre20140130
-		sci-libs/fftw:3.0=
-	)
-	portmidi? ( >=media-libs/portmidi-217-r1 )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/gtk-doc-am-1.25-r1
-	>=dev-util/intltool-0.51.0-r1
-	>=sys-devel/flex-2.6.1
-	virtual/pkgconfig
-	app-alternatives/yacc
-	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
-	nls? ( >=sys-devel/gettext-0.19.8.1 )
-"
-
-DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
-
-src_prepare() {
-	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
-	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
-		-i Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		--disable-gtk-doc-pdf
-		--disable-gtk2
-		--disable-installed-tests
-		--disable-mem
-		--disable-rpath
-		--disable-static
-		--enable-evince
-		--enable-gtk3
-		--enable-x11
-		$(use_enable alsa)
-		$(use_enable aubio)
-		$(use_enable debug)
-		# --enable-doc does nothing for itself
-		# basic html documentation is always being installed in the
-		# /usr/share/denemo/manual directory
-		$(use_enable gtk-doc doc)
-		$(use_enable gtk-doc gtk-doc)
-		$(use_enable gtk-doc gtk-doc-html)
-		$(use_enable fluidsynth)
-		$(use_enable jack)
-		$(use_enable nls)
-		$(use_enable portaudio)
-		$(use_enable portmidi)
-		$(use_enable rubberband)
-		$(use_enable test always-build-tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# make check fails if used with parallel builds
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	# link html documentation installed in /usr/share/denemo/manual
-	dodir /usr/share/doc/${PF}/html
-	local f
-	for f in denemo-manual.html denemo.css images; do
-		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
-	done
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	font_pkg_postrm
-	xdg_desktop_database_update
-}
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index ed8aec98d68c..cc1aae0b753a 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -20,10 +20,6 @@
     <flag name="aubio">
       Enable <pkg>media-libs/aubio</pkg> support
     </flag>
-    <flag name="fluidsynth">
-      Enable Fluidsynth MIDI software synthesis using
-      <pkg>media-sound/fluidsynth</pkg>
-    </flag>
     <flag name="jack">
       Enable jack support through <pkg>virtual/jack</pkg>
     </flag>
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 5655a1c6dfbe..9dd097346343 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,2 +1,2 @@
 DIST easyeffects-6.2.8.tar.gz 3063821 BLAKE2B d64952ff1e04f0013cb2548cc62d67f4013e9bd51dda2afe50170fc1ddbaabb967da5cb0b2cf6fde44cbdcf196b9656d19172595f6c527099a86b2dfc8ff34be SHA512 8a306308e783ed19fd5380a6b8d1e0ddba1400bca3447ddbf2954355f6d74229d0e750e5ce50b19c9ad1979ee88cda6ad4d1b2549eef7bb88cd29b6dc96dc33b
-DIST easyeffects-7.0.0.tar.gz 3126205 BLAKE2B 8b53a8f8e8499df79353c7904e230b26c766ada9724bc407b08cbce619e1cc1d86bba4f7e557d8324990b025c327bf80f315346d58e88677ca47cbd3da8fe4e3 SHA512 e7e187f154ce076c8e204c5b54951f21fbfe4cd12408a2024560e7fc3a26e58faa7710dc7ae1e5f26a2fe1cafe9ca42c360b1b05ad1e324f614aaac106277ef3
+DIST easyeffects-7.0.1.tar.gz 3208585 BLAKE2B 95d0c8948221bf8fec2e07e4dcfb664ed34065c9d5717aa76b91d3b42336cb989bfcf44a9adc0400898640f3e24dd379861140449fec00afca7dea9064055ba2 SHA512 6eec2020fd91e793caf9fca45eb51e7efc1c59f2bb0d4aca15178a51753258fc1990438eda26b8cb8622b7f51d47d28f184593f238c9ed072f4306be0af3f5a2
diff --git a/media-sound/easyeffects/easyeffects-7.0.0-r1.ebuild b/media-sound/easyeffects/easyeffects-7.0.0-r1.ebuild
deleted file mode 100644
index f1da56bfcae1..000000000000
--- a/media-sound/easyeffects/easyeffects-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson toolchain-funcs
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="calf +doc mda-lv2 zamaudio"
-
-COMMON="dev-cpp/nlohmann_json
-	dev-cpp/tbb
-	>=dev-libs/glib-2.56:2
-	dev-libs/libfmt
-	>=dev-libs/libsigc++-3.0.6:3
-	>=gui-libs/gtk-4.2.1:4
-	gui-libs/libadwaita:1
-	media-libs/libbs2b
-	>=media-libs/libebur128-1.2.0
-	media-libs/libsndfile
-	>=media-libs/lilv-0.22
-	>=media-libs/lv2-1.18.2
-	media-libs/rnnoise
-	media-libs/rubberband[ladspa]
-	media-libs/speex
-	media-libs/speexdsp
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.41
-	sci-libs/gsl:=
-	sci-libs/fftw:3.0"
-# Only header files are used from libsamplerate
-DEPEND="${COMMON}
-	media-libs/libsamplerate"
-RDEPEND="${COMMON}
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	zamaudio? ( media-plugins/zam-plugins )"
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! tc-is-gcc; then
-			die "Since version 6.3.0 ${PN} only supports GCC due to required level of C++20 support"
-		fi
-		if [[ $(gcc-major-version) -lt 11 ]] ; then
-			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/easyeffects/easyeffects-7.0.1.ebuild b/media-sound/easyeffects/easyeffects-7.0.1.ebuild
new file mode 100644
index 000000000000..2bbe7dc5d724
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-7.0.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+COMMON="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.2.1:4
+	gui-libs/libadwaita:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/rubberband[ladspa]
+	media-libs/speex
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/gsl:=
+	sci-libs/fftw:3.0"
+# Only header files are used from libsamplerate
+DEPEND="${COMMON}
+	media-libs/libsamplerate"
+RDEPEND="${COMMON}
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! tc-is-gcc; then
+			die "Since version 6.3.0 ${PN} only supports GCC due to required level of C++20 support"
+		fi
+		if [[ $(gcc-major-version) -lt 11 ]] ; then
+			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 630484b00f72..dee7a125ac36 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,2 +1,3 @@
+DIST flacon-10.0.0.tar.gz 3802889 BLAKE2B e99be9ad2da98e84455426df853bb38cecb91a6c66cb3f532459637adee97078fb034d3c5b5cc905b74756adbf6c11276f589d450c1506fba2dace264efe8b9c SHA512 55744b3ef46f298e8082ab172b8e0b5ad428ec3c965ae69befe7f9abb4e87417cf2373385240000471c92391d243ef3b33f25ae565c8e9497021d3b619a5ac1a
 DIST flacon-9.1.0.tar.gz 3769110 BLAKE2B 9e0c4aaef3f6019a8c8196a204e8281ca4250df441ea14127d9347f26557091e87019388bd2942afc39e45a7864d653e2ae887f665ce190f18e646448c3f8e3e SHA512 be35c61e082be7d05bebee5f99192201f91e90f3a80827ac5808e6798f7ed0ada28ab7c2456702c443be51356ec192cd059408c2c3feb5b48b5bab048d0efb00
 DIST flacon-9.4.0.tar.gz 3772714 BLAKE2B b45d6f934e80ae1d3546c1c54fdab22dac38d7ccf01b903a8c820145465c5732d34d6118bafcbbb4bde8c5bb528a707ebbee8b6a53ab5a1c29f1562a52c61382 SHA512 9dfd4ce558c4e3ce902c3b2e43b3c3fb94606f68dd550f774e3704d19ce6a28e887a7410054d6becfe3d20166aa687b7689821d6ee095e4efdc30e35a85e70ad
diff --git a/media-sound/flacon/flacon-10.0.0.ebuild b/media-sound/flacon/flacon-10.0.0.ebuild
new file mode 100644
index 000000000000..5ae4223ddc54
--- /dev/null
+++ b/media-sound/flacon/flacon-10.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require lots of disk space
+CHECKREQS_DISK_BUILD=10G
+inherit check-reqs cmake optfeature virtualx xdg-utils
+
+DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-i18n/uchardet
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? (
+		dev-qt/qttest:5
+		media-libs/flac
+		media-sound/mac
+		media-sound/shntool
+		media-sound/ttaenc
+		media-sound/wavpack
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.0.0-no-man-compress.patch
+)
+
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# All tests fail with enabled sandbox
+	# TODO: Get all tests to pass
+	# See bug: #831592
+	local -x SANDBOX_ON=0
+
+	virtx "${BUILD_DIR}/tests/${PN}_test" || die
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} optionally supports formats listed below."
+	optfeature 'FLAC input and output support' media-libs/flac
+	optfeature 'WavPack input and output support' media-sound/wavpack
+	optfeature 'APE input support' media-sound/mac
+	optfeature 'ALAC output support' media-sound/alac_decoder
+	optfeature 'TTA input support' media-sound/ttaenc
+	optfeature 'AAC output support' media-libs/faac
+	optfeature 'MP3 output support' media-sound/lame
+	optfeature 'Vorbis output support' media-sound/vorbis-tools
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/flacon/flacon-9.4.0.ebuild b/media-sound/flacon/flacon-9.4.0.ebuild
index 6de27bcb88a1..74f7a97e458b 100644
--- a/media-sound/flacon/flacon-9.4.0.ebuild
+++ b/media-sound/flacon/flacon-9.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -62,6 +62,11 @@ src_configure() {
 }
 
 src_test() {
+	# All tests fail with enabled sandbox
+	# TODO: Get all tests to pass
+	# See bug: #831592
+	local -x SANDBOX_ON=0
+
 	virtx "${BUILD_DIR}/tests/${PN}_test" || die
 }
 
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 7ed23cbdb72e..93466b386a18 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,2 +1 @@
-DIST kid3-3.9.2.tar.xz 1952344 BLAKE2B 5a44a05f614f97dc7ddab39694a1773e1e6c55af7a9dc4ac7b793a520e54a8892c2181903a58f150885b3b4e17ebf921db719863f7ac4fd540f711a444990df3 SHA512 fc0b9db33ea948a2345968ab5da65f959bea829130f4250604d68df778218173d49f92b015d9be4e43f57ba5ae3388b0e97f558774df590b5959aa6f6293acd3
 DIST kid3-3.9.3.tar.xz 1820640 BLAKE2B ea030328d88f583e88959e7536f4e3e086354befc40395700fac8314a1e7c3da7a2f9a614ff9ad98491d9ec4d8b24ead05a2214b94f55786a5e493c1a585056c SHA512 f40c7eaa186eb7d3163635286a8ad89bf6b29dce851b4fadc0814eec7759ed7fbac37e4596365bac4df93c5b655a7e943f8414e7c8f661b29aea7bde5367ed73
diff --git a/media-sound/kid3/files/kid3-3.9.2-musl.patch b/media-sound/kid3/files/kid3-3.9.2-musl.patch
deleted file mode 100644
index 05eb15536386..000000000000
--- a/media-sound/kid3/files/kid3-3.9.2-musl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 15655cd3f19b95d5533bdfd52b0f38c51a4fdf88 Mon Sep 17 00:00:00 2001
-From: Bart Ribbers <bribbers@disroot.org>
-Date: Sat, 24 Sep 2022 17:20:06 +0200
-Subject: [PATCH] Fix build on Musl libc
-
-malloc_trim is only implemented on glibc, so rather than checking if the
-OS is Linux and not Android, check if it's Linux and glibc.
----
- src/core/model/kid3application.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/model/kid3application.cpp b/src/core/model/kid3application.cpp
-index d40bca83..03409d1b 100644
---- a/src/core/model/kid3application.cpp
-+++ b/src/core/model/kid3application.cpp
-@@ -995,7 +995,7 @@ void Kid3Application::unloadAllTags()
-       taggedFile->closeFileHandle();
-     }
-   }
--#if defined Q_OS_LINUX && !defined Q_OS_ANDROID
-+#if defined Q_OS_LINUX && defined __GLIBC__
-   if (::malloc_trim(0)) {
-     qDebug("Memory released by malloc_trim()");
-   }
--- 
-GitLab
-
diff --git a/media-sound/kid3/kid3-3.9.2-r1.ebuild b/media-sound/kid3/kid3-3.9.2-r1.ebuild
deleted file mode 100644
index 506b585726a8..000000000000
--- a/media-sound/kid3/kid3-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake kde.org python-any-r1 xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/readline:=
-	acoustid? (
-		media-libs/chromaprint:=
-		media-video/ffmpeg:=
-	)
-	flac? (
-		media-libs/flac:=[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2 )
-	mpris? ( dev-qt/qtdbus:5 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# overengineered upstream build system
-	cmake_src_prepare
-	# applies broken python hacks, bug #614950
-	cmake_comment_add_subdirectory doc
-
-	sed -e "/^find_package.*QT NAMES/s/Qt6 //" \
-		-i CMakeLists.txt || die # ensure Qt5 build
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_DBUS=$(usex mpris)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
index 22d79737735d..4c7f947233db 100644
--- a/media-sound/lingot/Manifest
+++ b/media-sound/lingot/Manifest
@@ -1,2 +1 @@
-DIST lingot-1.0.1.tar.gz 510112 BLAKE2B a04ef52cc70dba8af54746419190eedc2f2512120e3c1e8576dab0d6dd20c3470a6f857fd751ed4bcf8e291a993ff1f8fa7b0264a24957dcfab0efd9684ef3ba SHA512 98182721ef68411485b3f2faccbf315f340e549dd7cce0fdfaacab7c34fb708c98eda9b96da00701f1987becefced3a7587ffaaad77d6ef86046fb8c9f5f1cb5
 DIST lingot-1.1.1.tar.gz 727028 BLAKE2B c681fcd72f67ae20e49f0229aa9791eace1f65cb596c60e52cff7805bc70d6d418cd87c96629306163756db81236ad31b6c8fe78b7ee401d155f8f81dda4f334 SHA512 71ee6b992a8f9cfe4a90d7cd8ba0098512857d65d773d3d5ec26aeeaa104ee812051b9d6b86c5e6462d1032bf03d7e6120aecd60ca8758fdf96c37f2d7ceacc7
diff --git a/media-sound/lingot/files/lingot-1.0.1-configure.patch b/media-sound/lingot/files/lingot-1.0.1-configure.patch
deleted file mode 100644
index f39dc3d9ad55..000000000000
--- a/media-sound/lingot/files/lingot-1.0.1-configure.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 916ed65b3901731fff02eceadcbc5b18f4c27d6f Mon Sep 17 00:00:00 2001
-From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
-Date: Sat, 14 Jul 2018 09:40:37 +0200
-Subject: [PATCH] Remove unused variables from configure.ac.
-
-Also replace
-  configure.ac: NO_PREFIX_PACKAGE_FOO_DIR = "share/foo"
-  configure.ac: AC_SUBST(NO_PREFIX_PACKAGE_FOO_DIR)
-and
-  Makefile.am : .. = $(prefix)/@NO_PREFIX_PACKAGE_FOO_DIR@
-with
-  Makefile.am : .. = $(datadir)/foo
-for simplicity and conformity with the usual meaning of datadir.
-
-These changes may require regeneration by Anjuta.
----
- Makefile.am       |  2 +-
- configure.ac      | 85 -----------------------------------------------
- icons/Makefile.am |  2 +-
- 3 files changed, 2 insertions(+), 87 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index db5ec16..d61162f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,7 +27,7 @@ DISTCLEANFILES = \
- 	m4/* \
- 	po/Makefile.in.in
- 
--gnomemenudir = $(prefix)/@NO_PREFIX_PACKAGE_MENU_DIR@
-+gnomemenudir = $(datadir)/applications
- gnomemenu_DATA = org.nongnu.lingot.desktop
- appdatadir = $(datadir)/metainfo
- appdata_DATA = org.nongnu.lingot.appdata.xml
-diff --git a/configure.ac b/configure.ac
-index 08f208f..cfb1259 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -162,90 +162,6 @@ if test "x$uselibfftw" = "xyes"; then
-  fi
- fi
- 
--
--dnl PKG_CHECK_MODULES([GLADE], [libglade-2.0])
--dnl AC_SUBST(GLADE_CFLAGS)
--dnl AC_SUBST(GLADE_LIBS)
--
--dnl Set PACKAGE_LOCALE_DIR in config.h.
--if test "x${prefix}" = "xNONE"; then
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Package local directory])
--else
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Package local directory])
--fi
--
--dnl Set PACKAGE SOURCE DIR in config.h.
--packagesrcdir=`cd $srcdir && pwd`
--
--dnl Set PACKAGE PREFIX
--if test "x${prefix}" = "xNONE"; then
--  packageprefix=${ac_default_prefix}
--else
--  packageprefix=${prefix}
--fi
--
--dnl Set PACKAGE DATA & DOC DIR
--packagedatadir=share
--packagedocdir=doc/${PACKAGE}
--
--dnl Set PACKAGE DIRs in config.h.
--packagepixmapsdir=share/pixmaps/${PACKAGE}
--packageicondir=share/icons/hicolor/scalable/apps/
--packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
--
--dnl Subst PACKAGE_DATA_DIR.
--NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
--AC_SUBST(NO_PREFIX_PACKAGE_DATA_DIR)
--PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
--AC_SUBST(PACKAGE_DATA_DIR)
--
--dnl Subst PACKAGE_DOC_DIR.
--NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
--PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
--AC_SUBST(PACKAGE_DOC_DIR)
--
--dnl Subst PACKAGE_PIXMAPS_DIR.
--NO_PREFIX_PACKAGE_PIXMAPS_DIR="${packagepixmapsdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_PIXMAPS_DIR)
--PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
--AC_SUBST(PACKAGE_PIXMAPS_DIR)
--
--dnl Subst PACKAGE_ICON_DIR.
--NO_PREFIX_PACKAGE_ICON_DIR="${packageicondir}"
--AC_SUBST(NO_PREFIX_PACKAGE_ICON_DIR)
--PACKAGE_ICON_DIR="${packageprefix}/${packageicondir}"
--AC_SUBST(PACKAGE_ICON_DIR)
--
--dnl Subst PACKAGE_HELP_DIR.
--NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
--AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
--PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
--AC_SUBST(PACKAGE_HELP_DIR)
--
--dnl Subst PACKAGE_MENU_DIR.
--NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
--AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
--PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
--AC_SUBST(PACKAGE_MENU_DIR)
--
--dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}")
--dnl AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
--
--
--AC_DEFINE([PACKAGE_DATA_DIR], [share], [Package data dir])
--AC_DEFINE([PACKAGE_DOC_DIR], [doc], [Package doc dir])
--AC_DEFINE([PACKAGE_HELP_DIR], [doc], [Help])
--AC_DEFINE([PACKAGE_MENU_DIR], [], [Menu])
--AC_DEFINE([PACKAGE_ICON_DIR], [icons], [Icons])
--AC_DEFINE([PACKAGE_SRC_DIR], [src], [Source])
--
--
- AC_CONFIG_FILES([
- Makefile
- po/Makefile.in
-@@ -254,4 +170,3 @@ icons/Makefile
- test/Makefile
- ])
- AC_OUTPUT
--
-diff --git a/icons/Makefile.am b/icons/Makefile.am
-index 9588562..0b17692 100644
---- a/icons/Makefile.am
-+++ b/icons/Makefile.am
-@@ -4,7 +4,7 @@
- ## If you don't want it to overwrite it,
- ## 	Please disable it in the Anjuta project configuration
- 
--lingot_iconsdir = $(prefix)/@NO_PREFIX_PACKAGE_ICON_DIR@
-+lingot_iconsdir = $(datadir)/icons/hicolor/scalable/apps
- 
- lingot_icons_DATA = \
- 	org.nongnu.lingot.svg
-From 0d65c3c71000a1f234288af4d703af888d569fd1 Mon Sep 17 00:00:00 2001
-From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
-Date: Sat, 14 Jul 2018 09:07:52 +0200
-Subject: [PATCH] Stop generating the desktop file.
-
-Drop the absolute path, and allow the icon to be found dynamically.
-This makes adding bitmaps additionally to the SVG easier later as well.
----
- configure.ac                                              | 1 -
- org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
- rename org.nongnu.lingot.desktop.in => org.nongnu.lingot.desktop (86%)
-
-diff --git a/configure.ac b/configure.ac
-index 5f1ea03..08f208f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -252,7 +252,6 @@ po/Makefile.in
- src/Makefile
- icons/Makefile
- test/Makefile
--org.nongnu.lingot.desktop
- ])
- AC_OUTPUT
- 
-diff --git a/org.nongnu.lingot.desktop.in b/org.nongnu.lingot.desktop
-similarity index 86%
-rename from org.nongnu.lingot.desktop.in
-rename to org.nongnu.lingot.desktop
-index 76842ce..8b3524f 100644
---- a/org.nongnu.lingot.desktop.in
-+++ b/org.nongnu.lingot.desktop
-@@ -6,7 +6,7 @@ Comment=LINGOT Is Not a Guitar-Only Tuner
- Comment[cs]=(Nejen kytarová) ladička
- Comment[fr]=Un accordeur de guitare, mais pas que
- Exec=lingot
--Icon=@PACKAGE_ICON_DIR@/org.nongnu.lingot.svg
-+Icon=org.nongnu.lingot.svg
- Terminal=false
- Type=Application
- Categories=GNOME;GTK;AudioVideo;
-From 29691022bae3180cc021ad7b97023dd483be19de Mon Sep 17 00:00:00 2001
-From: Iban Cereijo <ibancg@users.noreply.github.com>
-Date: Wed, 18 Jul 2018 13:59:25 +0200
-Subject: [PATCH] Putting the desktop file in the distributed files.
-
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index d61162f..d359df3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,7 +10,6 @@
- lingotdocdir = ${docdir}
- lingotdoc_DATA = \
- 	README \
--	COPYING \
- 	AUTHORS \
- 	ChangeLog \
- 	NEWS \
-@@ -37,6 +37,7 @@ dist_man_MANS = lingot.1
- 
- EXTRA_DIST = \
- 	$(lingotdoc_DATA) \
-+	$(gnomemenu_DATA) \
- 	$(appdata_DATA) \
- 	build-aux/gitlog-to-changelog \
- 	bootstrap
diff --git a/media-sound/lingot/lingot-1.0.1.ebuild b/media-sound/lingot/lingot-1.0.1.ebuild
deleted file mode 100644
index 523ec2ba532c..000000000000
--- a/media-sound/lingot/lingot-1.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Accurate, easy to use, and highly configurable musical instrument tuner"
-HOMEPAGE="https://www.nongnu.org/lingot/"
-SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +fftw jack pulseaudio"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-configure.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myemakeargs=(
-		$(use_enable alsa)
-		$(use_enable fftw libfftw)
-		$(use_enable jack)
-		$(use_enable pulseaudio)
-	)
-
-	econf "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
-}
diff --git a/media-sound/linux-show-player/linux-show-player-0.5.3-r1.ebuild b/media-sound/linux-show-player/linux-show-player-0.5.3-r1.ebuild
index 1c4fe7afe135..ad88223db828 100644
--- a/media-sound/linux-show-player/linux-show-player-0.5.3-r1.ebuild
+++ b/media-sound/linux-show-player/linux-show-player-0.5.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
diff --git a/media-sound/ncspot/ncspot-0.12.0.ebuild b/media-sound/ncspot/ncspot-0.12.0.ebuild
index 4ef95b901854..a391d8d52eab 100644
--- a/media-sound/ncspot/ncspot-0.12.0.ebuild
+++ b/media-sound/ncspot/ncspot-0.12.0.ebuild
@@ -406,7 +406,7 @@ LICENSE="BSD-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="clipboard cover mpris +notify"
 
diff --git a/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-fix-narrowing.patch b/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-fix-narrowing.patch
new file mode 100644
index 000000000000..96803ca9d692
--- /dev/null
+++ b/media-sound/nickvision-tagger/files/nickvision-tagger-2022.11.2-fix-narrowing.patch
@@ -0,0 +1,27 @@
+From a4c1dcc823d5294e32859a5b7f44d8dd31f7a43a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
+Date: Tue, 28 Feb 2023 18:57:14 +0100
+Subject: [PATCH] mediahelpers.cpp: use an explicit cast
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: https://bugs.gentoo.org/898372
+Signed-off-by: Maciej Barć <xgqt@gentoo.org>
+---
+ src/helpers/mediahelpers.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/helpers/mediahelpers.cpp b/src/helpers/mediahelpers.cpp
+index 47c563d..dbebf92 100644
+--- a/src/helpers/mediahelpers.cpp
++++ b/src/helpers/mediahelpers.cpp
+@@ -35,7 +35,7 @@ std::string MediaHelpers::durationToString(int durationInSeconds)
+ std::string MediaHelpers::fileSizeToString(std::uintmax_t fileSize)
+ {
+     std::vector<std::string> sizes{ _("B"), _("KB"), _("MB"), _("GB"), _("TB") };
+-    double size{ fileSize };
++    double size{ static_cast<double>(fileSize) };
+     int index{ 0 };
+     std::stringstream builder;
+     while (size >= 1024 && index < 4)
diff --git a/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild b/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild
index 851dbba8b770..c743b5be40e7 100644
--- a/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild
+++ b/media-sound/nickvision-tagger/nickvision-tagger-2022.11.2.ebuild
@@ -30,6 +30,9 @@ RDEPEND="
 	media-libs/chromaprint[tools]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-meson-install.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-narrowing.patch
+	"${FILESDIR}"/${P}-meson-install.patch
+)
 
 DOCS=( README.md )
diff --git a/media-sound/rescrobbled/rescrobbled-0.7.0.ebuild b/media-sound/rescrobbled/rescrobbled-0.7.0.ebuild
index bf6b90f9702e..2c060ed95ca1 100644
--- a/media-sound/rescrobbled/rescrobbled-0.7.0.ebuild
+++ b/media-sound/rescrobbled/rescrobbled-0.7.0.ebuild
@@ -114,7 +114,7 @@ LICENSE="GPL-3"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/openssl:=
 	sys-apps/dbus"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 1185c7b0a997..6a224170d44c 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/plex-media-server/plex-media-server-1.30.2.6563.ebuild b/media-tv/plex-media-server/plex-media-server-1.30.2.6563.ebuild
index 5da3a90f065b..efa23d2e7a1f 100644
--- a/media-tv/plex-media-server/plex-media-server-1.30.2.6563.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.30.2.6563.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"
 
 LICENSE="Plex"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm64 ~x86"
 RESTRICT="mirror bindist"
 
 DEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 01b51819c8fe..910f2e204de4 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index b74a6e409f8e..31de25e10b42 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -165,9 +165,9 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
 
 LICENSE="GPL-2"
 SLOT="0"
-#if [[ ${PV} != *9999* ]]; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-#fi
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 # faac codecs are nonfree
 # libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
diff --git a/media-video/mpv/mpv-0.35.1.ebuild b/media-video/mpv/mpv-0.35.1.ebuild
index 859d7bb46c7d..5ea6dc240af6 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 else
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="Media player for the command line"
@@ -147,11 +147,6 @@ src_configure() {
 		fi
 	fi
 
-	if use raspberry-pi; then
-		append-cflags -I"${ESYSROOT}"/opt/vc/include
-		append-ldflags -L"${ESYSROOT}"/opt/vc/lib
-	fi
-
 	mpv_feature_multi() {
 		local use set
 		for use in ${1} ${2}; do
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 11323310aeb0..34293c859ac9 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -147,11 +147,6 @@ src_configure() {
 		fi
 	fi
 
-	if use raspberry-pi; then
-		append-cflags -I"${ESYSROOT}"/opt/vc/include
-		append-ldflags -L"${ESYSROOT}"/opt/vc/lib
-	fi
-
 	mpv_feature_multi() {
 		local use set
 		for use in ${1} ${2}; do
diff --git a/media-video/pipewire/pipewire-0.3.63-r3.ebuild b/media-video/pipewire/pipewire-0.3.63-r3.ebuild
index e91c865b5b7e..7d5e71a8dcc3 100644
--- a/media-video/pipewire/pipewire-0.3.63-r3.ebuild
+++ b/media-video/pipewire/pipewire-0.3.63-r3.ebuild
@@ -267,6 +267,10 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
 multilib_src_install() {
 	# Our custom DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
diff --git a/media-video/pipewire/pipewire-0.3.64-r2.ebuild b/media-video/pipewire/pipewire-0.3.64-r2.ebuild
index ec34788a440c..f3ff9f1a1a72 100644
--- a/media-video/pipewire/pipewire-0.3.64-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.64-r2.ebuild
@@ -269,6 +269,10 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
 multilib_src_install() {
 	# Our custom DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
diff --git a/media-video/pipewire/pipewire-0.3.65-r3.ebuild b/media-video/pipewire/pipewire-0.3.65-r3.ebuild
index 478bc4c00ace..73c73b92d625 100644
--- a/media-video/pipewire/pipewire-0.3.65-r3.ebuild
+++ b/media-video/pipewire/pipewire-0.3.65-r3.ebuild
@@ -275,6 +275,10 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
 multilib_src_install() {
 	# Our custom DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
diff --git a/media-video/pipewire/pipewire-0.3.66-r1.ebuild b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
index b5a7f3a8ef16..9b7aaa447444 100644
--- a/media-video/pipewire/pipewire-0.3.66-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
@@ -262,6 +262,10 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
 multilib_src_install() {
 	# Our custom DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index b5a7f3a8ef16..9b7aaa447444 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -262,6 +262,10 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
 multilib_src_install() {
 	# Our custom DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a56f3a98e377..560442f6e260 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 d9eaa37e08af..ece81897432e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Feb 2023 20:09:59 +0000
+Thu, 02 Mar 2023 05:10:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d9eaa37e08af..2d4ec5b1defa 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Feb 2023 20:09:59 +0000
+Thu, 02 Mar 2023 05:10:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index db600e36ffd0..67cec5f5942a 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 56ab0cd7a6d3..971bb4104e2f 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/nginx-unit-0 b/metadata/md5-cache/acct-group/nginx-unit-0
new file mode 100644
index 000000000000..d03363618ddc
--- /dev/null
+++ b/metadata/md5-cache/acct-group/nginx-unit-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=A group for www-servers/nginx-unit
+EAPI=8
+INHERIT=acct-group
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	cddec248f22a6688789ed427b5d47ee4	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_md5_=24b3a654ef00e055354bdd16fcabe57a
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index dcc2a099b037..b667607c9d80 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/nginx-unit-0 b/metadata/md5-cache/acct-user/nginx-unit-0
new file mode 100644
index 000000000000..a92c74a0a5d5
--- /dev/null
+++ b/metadata/md5-cache/acct-user/nginx-unit-0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: nginx-unit
+EAPI=8
+INHERIT=acct-user
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/nginx-unit
+SLOT=0
+_eclasses_=acct-user	bdca122e03cd10755e7ed12b03562501	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_md5_=542cbf1964c7821f2b29a912548ac508
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 90bc26fc3c03..2df0ffb64839 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-7.3.0 b/metadata/md5-cache/app-admin/ansible-7.3.0
new file mode 100644
index 000000000000..bafb519fed30
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-7.3.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=8
+HOMEPAGE=https://www.ansible.com/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=>=app-admin/ansible-core-2.14.0 <app-admin/ansible-core-2.15 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-7.3.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a3c95775a98e56eef8c822081cb4092b
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.13.8 b/metadata/md5-cache/app-admin/ansible-core-2.13.8
new file mode 100644
index 000000000000..d8eccc2fb849
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-core-2.13.8
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/packaging-16.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/botocore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=8
+HOMEPAGE=https://www.ansible.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.13.8.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=26c4185c0b5fcadb15c55abf052bd005
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.14.3 b/metadata/md5-cache/app-admin/ansible-core-2.14.3
new file mode 100644
index 000000000000..bb0994f4cabf
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-core-2.14.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/packaging-16.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/botocore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=8
+HOMEPAGE=https://www.ansible.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.14.3.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=26c4185c0b5fcadb15c55abf052bd005
diff --git a/metadata/md5-cache/app-admin/ansible-molecule-4.0.4 b/metadata/md5-cache/app-admin/ansible-molecule-4.0.4
index bf0619be0aa0..befd3926bf34 100644
--- a/metadata/md5-cache/app-admin/ansible-molecule-4.0.4
+++ b/metadata/md5-cache/app-admin/ansible-molecule-4.0.4
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_10(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_10(-)] doc? ( app-admin/ansible-core[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_10(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_10(-)] dev-python/filelock[python_targets_python3_10(-)] <dev-python/pexpect-5[python_targets_python3_10(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_10(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_10(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_10(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_10(-)] dev-util/yamllint ) ) doc? ( python_single_target_python3_10? ( >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_10(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_10? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_10(-)] dev-python/cerberus[python_targets_python3_10(-)] >=dev-python/click-8.0[python_targets_python3_10(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_10(-)] >=dev-python/enrich-1.2.7[python_targets_python3_10(-)] >=dev-python/jinja-2.11.3[python_targets_python3_10(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] <dev-python/pluggy-2.0[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/rich-9.5.1[python_targets_python3_10(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_10(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] )
+BDEPEND=python_single_target_python3_10? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_10(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_10(-)] doc? ( app-admin/ansible-core[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_10(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_10(-)] dev-python/filelock[python_targets_python3_10(-)] <dev-python/pexpect-5[python_targets_python3_10(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_10(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_10(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_10(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_10(-)] dev-util/yamllint ) ) python_single_target_python3_11? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_11(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_11(-)] doc? ( app-admin/ansible-core[python_targets_python3_11(-)] dev-python/ansible-pygments[python_targets_python3_11(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_11(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_11(-)] dev-python/filelock[python_targets_python3_11(-)] <dev-python/pexpect-5[python_targets_python3_11(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_11(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_11(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_11(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_11(-)] dev-util/yamllint ) ) doc? ( python_single_target_python3_10? ( >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_10(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_11(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_10? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_10(-)] dev-python/cerberus[python_targets_python3_10(-)] >=dev-python/click-8.0[python_targets_python3_10(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_10(-)] >=dev-python/enrich-1.2.7[python_targets_python3_10(-)] >=dev-python/jinja-2.11.3[python_targets_python3_10(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] <dev-python/pluggy-2.0[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/rich-9.5.1[python_targets_python3_10(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_10(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_11(-)] dev-python/cerberus[python_targets_python3_11(-)] >=dev-python/click-8.0[python_targets_python3_11(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_11(-)] >=dev-python/enrich-1.2.7[python_targets_python3_11(-)] >=dev-python/jinja-2.11.3[python_targets_python3_11(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] <dev-python/pluggy-2.0[python_targets_python3_11(-)] >=dev-python/pyyaml-5.1[python_targets_python3_11(-)] >=dev-python/rich-9.5.1[python_targets_python3_11(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_11(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DESCRIPTION=A toolkit designed to aid in the development and testing of Ansible roles
 EAPI=8
 HOMEPAGE=https://pypi.org/project/molecule/ https://github.com/ansible-community/molecule/
 INHERIT=distutils-r1 optfeature
-IUSE=selinux doc test +python_single_target_python3_10
+IUSE=selinux doc test python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=python_single_target_python3_10? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_10(-)] dev-python/cerberus[python_targets_python3_10(-)] >=dev-python/click-8.0[python_targets_python3_10(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_10(-)] >=dev-python/enrich-1.2.7[python_targets_python3_10(-)] >=dev-python/jinja-2.11.3[python_targets_python3_10(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] <dev-python/pluggy-2.0[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/rich-9.5.1[python_targets_python3_10(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_10(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_10? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_10(-)] dev-python/cerberus[python_targets_python3_10(-)] >=dev-python/click-8.0[python_targets_python3_10(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_10(-)] >=dev-python/enrich-1.2.7[python_targets_python3_10(-)] >=dev-python/jinja-2.11.3[python_targets_python3_10(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] <dev-python/pluggy-2.0[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/rich-9.5.1[python_targets_python3_10(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_10(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_11(-)] dev-python/cerberus[python_targets_python3_11(-)] >=dev-python/click-8.0[python_targets_python3_11(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_11(-)] >=dev-python/enrich-1.2.7[python_targets_python3_11(-)] >=dev-python/jinja-2.11.3[python_targets_python3_11(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] <dev-python/pluggy-2.0[python_targets_python3_11(-)] >=dev-python/pyyaml-5.1[python_targets_python3_11(-)] >=dev-python/rich-9.5.1[python_targets_python3_11(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_11(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/molecule/molecule-4.0.4.tar.gz -> ansible-molecule-4.0.4.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b8f8b67528dedd49aebebba5e2920afd
+_md5_=d9a36908edb1df6f2154a1df3c4ecd82
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.80 b/metadata/md5-cache/app-admin/awscli-1.27.80
new file mode 100644
index 000000000000..c0b69e768a91
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.80
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.80.tar.gz -> aws-cli-1.27.80.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.81 b/metadata/md5-cache/app-admin/awscli-1.27.81
new file mode 100644
index 000000000000..168a1d928656
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.81
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.81.tar.gz -> aws-cli-1.27.81.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7 b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
index 58a889519427..2b419e158013 100644
--- a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
+++ b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
@@ -9,5 +9,5 @@ LICENSE=Amazon || ( Ruby GPL-2 )
 RDEPEND=|| ( dev-lang/ruby:2.7 ) virtual/rubygems virtual/ruby-ssl net-misc/rsync net-misc/curl
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.5.7.zip
-_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22
+_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=95b801c107d75f21353354ba75b7df07
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.17 b/metadata/md5-cache/app-admin/eselect-1.4.17
deleted file mode 100644
index d57a08f9d9a8..000000000000
--- a/metadata/md5-cache/app-admin/eselect-1.4.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/docutils )
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath )
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-INHERIT=bash-completion-r1
-IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )
-PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
-RDEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.17.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=67cce06bf2982a09d9f8befcf1a95741
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.21 b/metadata/md5-cache/app-admin/eselect-1.4.21
new file mode 100644
index 000000000000..f637bb4f4693
--- /dev/null
+++ b/metadata/md5-cache/app-admin/eselect-1.4.21
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/docutils )
+DEFINED_PHASES=compile install postinst
+DEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath )
+DESCRIPTION=Gentoo's multi-purpose configuration and management tool
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+INHERIT=bash-completion-r1
+IUSE=doc emacs vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )
+PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
+RDEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.21.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c0b8d7fa3d44fa8cf764ce6e2e958dd0
diff --git a/metadata/md5-cache/app-admin/fluentd-1.14.4 b/metadata/md5-cache/app-admin/fluentd-1.14.4
index 49b97de4489e..1f8c33fe6943 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.14.4
+++ b/metadata/md5-cache/app-admin/fluentd-1.14.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.14.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6b5a6dd25ff5b38cd203acecf6354e6b
diff --git a/metadata/md5-cache/app-admin/gopass-1.14.4 b/metadata/md5-cache/app-admin/gopass-1.14.4
deleted file mode 100644
index eb1dafcd5621..000000000000
--- a/metadata/md5-cache/app-admin/gopass-1.14.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=>=dev-lang/go-1.18
-DESCRIPTION=a simple but powerful password manager for the terminal
-EAPI=8
-HOMEPAGE=https://www.gopass.pw/
-INHERIT=go-module optfeature
-KEYWORDS=amd64 ~ppc64 ~riscv ~x86
-LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
-RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
-RESTRICT=strip test strip
-SLOT=0
-SRC_URI=mirror://goproxy//bitbucket.org/creachadair/stringset/@v/v0.0.10.zip -> bitbucket.org%2Fcreachadair%2Fstringset%2F@v%2Fv0.0.10.zip mirror://goproxy//bitbucket.org/creachadair/stringset/@v/v0.0.10.mod -> bitbucket.org%2Fcreachadair%2Fstringset%2F@v%2Fv0.0.10.mod mirror://goproxy//filippo.io/age/@v/v1.0.0.zip -> filippo.io%2Fage%2F@v%2Fv1.0.0.zip mirror://goproxy//filippo.io/age/@v/v1.0.0.mod -> filippo.io%2Fage%2F@v%2Fv1.0.0.mod mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0.zip -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0.zip mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0.mod -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.4.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!proton!mail/go-crypto/@v/v0.0.0-20220730123233-d6ffb7692adf.zip -> github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20220730123233-d6ffb7692adf.zip mirror://goproxy//github.com/!proton!mail/go-crypto/@v/v0.0.0-20220730123233-d6ffb7692adf.mod -> github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20220730123233-d6ffb7692adf.mod mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.4.zip -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/atotto/clipboard/@v/v0.1.4.mod -> github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.zip -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip mirror://goproxy//github.com/blang/semver/v4/@v/v4.0.0.mod -> github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.zip -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod mirror://goproxy//github.com/bwesterb/go-ristretto/@v/v1.2.0.mod -> github.com%2Fbwesterb%2Fgo-ristretto%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bwesterb/go-ristretto/@v/v1.2.1.mod -> github.com%2Fbwesterb%2Fgo-ristretto%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.zip -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.zip mirror://goproxy//github.com/caspr-io/yamlpath/@v/v0.0.0-20200722075116-502e8d113a9b.mod -> github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.2.1.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.2.1.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/chzyer/readline/@v/v1.5.1.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/chzyer/readline/@v/v1.5.1.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/chzyer/test/@v/v1.0.0.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/chzyer/test/@v/v1.0.0.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/cloudflare/circl/@v/v1.1.0.mod -> github.com%2Fcloudflare%2Fcircl%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cloudflare/circl/@v/v1.2.0.zip -> github.com%2Fcloudflare%2Fcircl%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/cloudflare/circl/@v/v1.2.0.mod -> github.com%2Fcloudflare%2Fcircl%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.3-0.20220203105225-a9a7ef127534.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.3-0.20220203105225-a9a7ef127534.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.2.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.2.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/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.13.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.13.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190623212516-8a1682060722.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.zip -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/gokyle/twofactor/@v/v1.0.1.mod -> github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.6.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.8.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.8.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.8.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.8.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.zip mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.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/go-querystring/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20220125093853-4d9895f5db73.zip -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20220125093853-4d9895f5db73.zip mirror://goproxy//github.com/jsimonetti/pwscheme/@v/v0.0.0-20220125093853-4d9895f5db73.mod -> github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20220125093853-4d9895f5db73.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pretty/@v/v0.3.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.3.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.3.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/martinhoefling/goxkcdpwgen/@v/v0.1.1.zip -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/martinhoefling/goxkcdpwgen/@v/v0.1.1.mod -> github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.12.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.12.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.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-tty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-ps/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.zip -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/muesli/crunchy/@v/v0.4.0.mod -> github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.zip -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.zip mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20210217022336-fa2cb2858354.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20210226163009-20ebb0f2a09e.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20210226163009-20ebb0f2a09e.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/pquerna/otp/@v/v1.3.0.zip -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/pquerna/otp/@v/v1.3.0.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.1.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.1-0.20210923151022-86f73c517451.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.1-0.20210923151022-86f73c517451.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.8.1-0.20210923151022-86f73c517451.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.8.1-0.20210923151022-86f73c517451.mod mirror://goproxy//github.com/rs/xid/@v/v1.3.0.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.27.0.zip -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.27.0.zip mirror://goproxy//github.com/rs/zerolog/@v/v1.27.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.zip -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip mirror://goproxy//github.com/schollz/closestmatch/@v/v0.0.0-20190308193919-1fbe626be92e.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.zip -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip mirror://goproxy//github.com/skip2/go-qrcode/@v/v0.0.0-20200617195104-da1b6568686e.mod -> github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.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/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.4.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.4.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.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.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.8.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.8.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/twpayne/go-pinentry/@v/v0.2.0.zip -> github.com%2Ftwpayne%2Fgo-pinentry%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/twpayne/go-pinentry/@v/v0.2.0.mod -> github.com%2Ftwpayne%2Fgo-pinentry%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.11.1.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.11.1.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.11.1.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.11.1.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20170218160415-a3153f7040e9.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.zip -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.zip mirror://goproxy//github.com/xrash/smetrics/@v/v0.0.0-20201216005158-039620a65673.mod -> github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.9.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.9.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.9.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.9.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.8.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.8.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.8.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.8.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-20210921155107-089bfa567519.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20220315160706-3147a52a75dd.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220315160706-3147a52a75dd.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20220722155217-630584e8d5aa.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220722155217-630584e8d5aa.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20220722155217-630584e8d5aa.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220722155217-630584e8d5aa.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20220722155223-a9213eeb770e.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20220722155223-a9213eeb770e.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20220722155223-a9213eeb770e.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-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20211112202133-69e39bad7dc2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20211112202133-69e39bad7dc2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20220728211354-c7608f3a8462.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220728211354-c7608f3a8462.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20220728211354-c7608f3a8462.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220728211354-c7608f3a8462.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20220722155238-128564f6959c.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20220722155238-128564f6959c.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20220722155238-128564f6959c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20220722155238-128564f6959c.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-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-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20211007075335-d3039528d8ac.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211007075335-d3039528d8ac.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220310020820-b874c991c1a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220310020820-b874c991c1a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220315194320-039c03cc5b86.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220315194320-039c03cc5b86.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220731174439-a90be440212d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220731174439-a90be440212d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220731174439-a90be440212d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220731174439-a90be440212d.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/term/@v/v0.0.0-20220722155259-a9ba230a4035.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20220722155259-a9ba230a4035.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20220722155259-a9ba230a4035.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20220722155259-a9ba230a4035.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.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.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-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.28.1.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.28.1.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.28.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.28.1.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.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.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.1.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.1.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.1.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.1.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//rsc.io/qr/@v/v0.2.0.zip -> rsc.io%2Fqr%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/qr/@v/v0.2.0.mod -> rsc.io%2Fqr%2F@v%2Fv0.2.0.mod https://github.com/gopasspw/gopass/archive/v1.14.4.tar.gz -> gopass-1.14.4.tar.gz
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=c2bdfb322519eb6bf519758fb2f2736e
diff --git a/metadata/md5-cache/app-admin/mcollective-2.12.5 b/metadata/md5-cache/app-admin/mcollective-2.12.5
index 14a0415c7182..1b05391cebe9 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.12.5
+++ b/metadata/md5-cache/app-admin/mcollective-2.12.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=|| ( ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.5.tar.gz -> mcollective-2.12.5.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b53984e7d27a37d90bba036d49352629
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22-r2 b/metadata/md5-cache/app-admin/puppet-5.5.22-r2
index 1082cab1583e..cfafb6c8d6ee 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.22-r2
+++ b/metadata/md5-cache/app-admin/puppet-5.5.22-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=002777aef21d1f6df8ee547411eeca84
diff --git a/metadata/md5-cache/app-admin/puppet-7.21.0-r1 b/metadata/md5-cache/app-admin/puppet-7.21.0-r1
index 29032c07c58c..b2b9ffff5b13 100644
--- a/metadata/md5-cache/app-admin/puppet-7.21.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-7.21.0-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2958414fc0f147ac35061be072ede401
diff --git a/metadata/md5-cache/app-admin/puppet-7.23.0 b/metadata/md5-cache/app-admin/puppet-7.23.0
index b703f906e360..4a7bddc6b8a9 100644
--- a/metadata/md5-cache/app-admin/puppet-7.23.0
+++ b/metadata/md5-cache/app-admin/puppet-7.23.0
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.23.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2827d36f9386868bbbce232ff1550104
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.5.2 b/metadata/md5-cache/app-admin/puppet-lint-2.5.2
index 5bc41c2a67a8..9b38b8bee562 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.5.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d478cc0ae53489ac200a3fbee5bae83a
diff --git a/metadata/md5-cache/app-admin/r10k-3.15.0 b/metadata/md5-cache/app-admin/r10k-3.15.0
index b52726c8e45b..739fab7fe49f 100644
--- a/metadata/md5-cache/app-admin/r10k-3.15.0
+++ b/metadata/md5-cache/app-admin/r10k-3.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/r10k-3.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9ca9968632373d9b8fab5ae817314479
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2206.0-r2 b/metadata/md5-cache/app-admin/rsyslog-8.2206.0-r2
index af07fc86c1a8..291eeecbbfb9 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2206.0-r2
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2206.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) 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:= dev-libs/libevent[threads(+)] ) 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] ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2206.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2206.0.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f96eba4e7849244c52d6dbfffda035b6
+_md5_=d24696e48707d8a57332a84e1b22c0b1
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2208.0-r2 b/metadata/md5-cache/app-admin/rsyslog-8.2208.0-r2
index 78ee210d8ed3..0f062fc783e1 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2208.0-r2
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2208.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) 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:= dev-libs/libevent[threads(+)] ) 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] ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2208.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2208.0.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f6db4fead805ad778c932dd3746aaf76
+_md5_=a22d1028a5ef060c4a47fa3b5a8cf164
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r2 b/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r2
index fbc8c4823ee2..35bcf69a9992 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r2
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2210.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) 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:= dev-libs/libevent[threads(+)] ) 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] ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2210.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2210.0.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=59328e3b5fea9598780eba7e5d97a34d
+_md5_=6b5ca6671f11e6c37cc3e288b871afc8
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2212.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2212.0-r1
index ed173d32212d..be2487fb4319 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2212.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2212.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) 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:= dev-libs/libevent[threads(+)] ) 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] ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2212.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2212.0.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=97269e9931dd88855887bd6c60a22849
+_md5_=374fe18711fb36b65fa63e9b2934a5bf
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2302.0 b/metadata/md5-cache/app-admin/rsyslog-8.2302.0
index 4cd6cde42d07..ace313b49391 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2302.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2302.0
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) 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:= dev-libs/libevent[threads(+)] ) 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] ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2302.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2302.0.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=97269e9931dd88855887bd6c60a22849
+_md5_=374fe18711fb36b65fa63e9b2934a5bf
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.13_p2 b/metadata/md5-cache/app-admin/sudo-1.9.13_p2
new file mode 100644
index 000000000000..d34782163333
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.13_p2
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=8
+HOMEPAGE=https://www.sudo.ws/
+INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
+IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.13p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p2.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.13p2.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p2.tar.gz.sig )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=7a809f42ea7e6074f65d53de1fa5aa1e
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r5 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r5
index dd7da5d09be0..dc5cfaf0957e 100644
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14-r5
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r5
@@ -3,12 +3,12 @@ DESCRIPTION=Summarizes the contents of a syslog log file
 EAPI=7
 HOMEPAGE=https://github.com/dpaleino/syslog-summary
 INHERIT=python-single-r1
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/downloads/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=08061e4091c8846584cfc8c9b3f15b1c
+_md5_=f852bda641de0986316cde168c4a4842
diff --git a/metadata/md5-cache/app-admin/yadm-3.2.2 b/metadata/md5-cache/app-admin/yadm-3.2.2
new file mode 100644
index 000000000000..f22e14242d1e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/yadm-3.2.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-crypt/gnupg app-shells/bash dev-vcs/git || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] ) ) dev-tcltk/expect )
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=Git based tool for managing dotfiles
+EAPI=8
+HOMEPAGE=https://github.com/TheLocehiliosan/yadm
+INHERIT=bash-completion-r1 python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-crypt/gnupg app-shells/bash dev-vcs/git
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/TheLocehiliosan/yadm/archive/3.2.2.tar.gz -> yadm-3.2.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8b34259439e23518c673067f565f55f6
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 3ace5808bba8..d785a1b47c70 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/libarchive-3.6.1-r1 b/metadata/md5-cache/app-arch/libarchive-3.6.1-r1
index 315b17bf3bd3..174a0f67907d 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.6.1-r1
+++ b/metadata/md5-cache/app-arch/libarchive-3.6.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install test unpack
+BDEPEND=verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs[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=Multi-format archive and compression library
 EAPI=8
 HOMEPAGE=https://www.libarchive.org/
-INHERIT=multilib-minimal toolchain-funcs verify-sig
+INHERIT=autotools multilib-minimal toolchain-funcs verify-sig
 IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 BSD-4 public-domain
 RDEPEND=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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=https://www.libarchive.de/downloads/libarchive-3.6.1.tar.xz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.6.1.tar.xz.asc )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=67af8dfb28d13152edee0baaa1d1c673
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=f0e384d238ad521d590be26336233865
diff --git a/metadata/md5-cache/app-arch/libarchive-3.6.2 b/metadata/md5-cache/app-arch/libarchive-3.6.2
deleted file mode 100644
index 0ac7d385eb82..000000000000
--- a/metadata/md5-cache/app-arch/libarchive-3.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs[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=Multi-format archive and compression library
-EAPI=8
-HOMEPAGE=https://www.libarchive.org/
-INHERIT=multilib-minimal toolchain-funcs verify-sig
-IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD BSD-2 BSD-4 public-domain
-RDEPEND=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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/13
-SRC_URI=https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz.asc )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=bba731fc886acea41fa79eeba5215406
diff --git a/metadata/md5-cache/app-arch/libarchive-3.6.2-r1 b/metadata/md5-cache/app-arch/libarchive-3.6.2-r1
new file mode 100644
index 000000000000..ee5360bb09cc
--- /dev/null
+++ b/metadata/md5-cache/app-arch/libarchive-3.6.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs[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=Multi-format archive and compression library
+EAPI=8
+HOMEPAGE=https://www.libarchive.org/ https://github.com/libarchive/libarchive/
+INHERIT=multilib-minimal toolchain-funcs verify-sig
+IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 BSD-4 public-domain
+RDEPEND=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(-)?] acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/13
+SRC_URI=https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz.asc )
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=654338f77ad80b4784edfe6d7835ca2d
diff --git a/metadata/md5-cache/app-arch/p7zip-17.05 b/metadata/md5-cache/app-arch/p7zip-17.05
new file mode 100644
index 000000000000..bbd26ac6b57d
--- /dev/null
+++ b/metadata/md5-cache/app-arch/p7zip-17.05
@@ -0,0 +1,16 @@
+BDEPEND=abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )
+DEFINED_PHASES=compile install postinst postrm preinst prepare test
+DEPEND=wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Port of 7-Zip archiver for Unix
+EAPI=7
+HOMEPAGE=https://github.com/p7zip-project/p7zip
+INHERIT=multilib toolchain-funcs wrapper wxwidgets xdg
+IUSE=abi_x86_x32 doc kde +pch rar static wxwidgets
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+LICENSE=LGPL-2.1 rar? ( unRAR )
+RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] )
+REQUIRED_USE=kde? ( wxwidgets )
+SLOT=0
+SRC_URI=https://github.com/p7zip-project/p7zip/archive/v17.05.tar.gz -> p7zip-17.05.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d2216c831ceb94b2b123f7a138a222b4
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 2abd017741ae..392a13db80cc 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/bareos-21.1.2 b/metadata/md5-cache/app-backup/bareos-21.1.2
deleted file mode 100644
index b2b8b15853b4..000000000000
--- a/metadata/md5-cache/app-backup/bareos-21.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) test? ( dev-cpp/gtest dev-db/postgresql:*[server,threads] dev-db/mariadb:*[server] ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.org/
-INHERIT=python-any-r1 systemd cmake tmpfiles
-IUSE=X acl ceph clientonly +director glusterfs ipv6 lmdb logwatch ndmp readline scsi-crypto static +storage-daemon systemd tcpd test vim-syntax vmware xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
-REQUIRED_USE=static? ( clientonly ) x86? ( !ceph )
-RESTRICT=mirror test
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/21.1.2.tar.gz -> bareos-21.1.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2b95c49a21c2bab180afcdfc1e9316f2
diff --git a/metadata/md5-cache/app-backup/bareos-21.1.5-r2 b/metadata/md5-cache/app-backup/bareos-21.1.5-r2
deleted file mode 100644
index 0cb7ee9625f1..000000000000
--- a/metadata/md5-cache/app-backup/bareos-21.1.5-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) test? ( dev-cpp/gtest dev-db/postgresql:*[server,threads] dev-db/mariadb:*[server] ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
-DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.org/
-INHERIT=python-any-r1 systemd cmake tmpfiles
-IUSE=X acl ceph clientonly +director glusterfs ipv6 lmdb logwatch ndmp readline scsi-crypto split-usr static +storage-daemon systemd tcpd test vim-syntax vmware xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
-REQUIRED_USE=static? ( clientonly ) x86? ( !ceph )
-RESTRICT=mirror test
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/21.1.5.tar.gz -> bareos-21.1.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2d15ab9383673fcfbf52e221b399e7e7
diff --git a/metadata/md5-cache/app-backup/bareos-21.1.6 b/metadata/md5-cache/app-backup/bareos-21.1.6
new file mode 100644
index 000000000000..a050ac82fa7a
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-21.1.6
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) test? ( dev-cpp/gtest dev-db/postgresql:*[server,threads] dev-db/mariadb:*[server] ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
+DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+INHERIT=python-any-r1 systemd cmake tmpfiles
+IUSE=X acl ceph clientonly +director glusterfs ipv6 lmdb logwatch ndmp readline scsi-crypto split-usr static +storage-daemon systemd tcpd test vim-syntax vmware xattr
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
+REQUIRED_USE=static? ( clientonly ) x86? ( !ceph )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/21.1.6.tar.gz -> bareos-21.1.6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2d15ab9383673fcfbf52e221b399e7e7
diff --git a/metadata/md5-cache/app-backup/bareos-22.0.2 b/metadata/md5-cache/app-backup/bareos-22.0.2
new file mode 100644
index 000000000000..ea718836d356
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bareos-22.0.2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) test? ( dev-cpp/gtest dev-db/postgresql:*[server,threads] dev-db/mariadb:*[server] ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
+DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+INHERIT=python-any-r1 systemd cmake tmpfiles
+IUSE=X acl ceph clientonly +director glusterfs ipv6 lmdb logwatch ndmp readline scsi-crypto split-usr static +storage-daemon systemd tcpd test vim-syntax vmware xattr
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos dev-db/postgresql:*[threads] director? ( virtual/mta ) ) logwatch? ( sys-apps/logwatch ) ndmp? ( net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) dev-libs/jansson:=[static-libs] dev-libs/lzo[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/jansson:= dev-libs/lzo dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/tmpfiles
+REQUIRED_USE=static? ( clientonly ) x86? ( !ceph )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/22.0.2.tar.gz -> bareos-22.0.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=444455ef0de39fa73a9c9a31de558e5e
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index d8156b99de04..938db5a35397 100644
Binary files a/metadata/md5-cache/app-containers/Manifest.gz and b/metadata/md5-cache/app-containers/Manifest.gz differ
diff --git a/metadata/md5-cache/app-containers/crun-1.8.1 b/metadata/md5-cache/app-containers/crun-1.8.1
new file mode 100644
index 000000000000..b77342ac88fe
--- /dev/null
+++ b/metadata/md5-cache/app-containers/crun-1.8.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/libgcrypt:= dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
+EAPI=8
+HOMEPAGE=https://github.com/containers/crun
+INHERIT=autotools python-any-r1
+IUSE=+bpf +caps criu +seccomp selinux systemd static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/libgcrypt:= dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= ) selinux? ( sec-policy/selinux-container )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/crun/releases/download/1.8.1/crun-1.8.1.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=33531156c69ffc7445904dbd9cd8496a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e7f7ed1956f9..df60c299af35 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/certbot-dns-dnsimple-1.31.0 b/metadata/md5-cache/app-crypt/certbot-dns-dnsimple-1.31.0
index a81b5180e6cc..dcdffe38f24b 100644
--- a/metadata/md5-cache/app-crypt/certbot-dns-dnsimple-1.31.0
+++ b/metadata/md5-cache/app-crypt/certbot-dns-dnsimple-1.31.0
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( >=app-crypt/certbot-1.31.0[python_targets_python3_10(-)?] >=app-crypt/acme-1.31.0[python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_10(-)?] >=dev-python/dns-lexicon-3.2.1[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( >=app-crypt/certbot-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/acme-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dns-lexicon-3.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=DNSimple Authenticator plugin for Certbot (Let's Encrypt Client)
 EAPI=8
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_10
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-1.31.0[python_targets_python3_10(-)?] >=app-crypt/acme-1.31.0[python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_10(-)?] >=dev-python/dns-lexicon-3.2.1[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
+RDEPEND=>=app-crypt/certbot-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/acme-1.31.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dns-lexicon-3.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.31.0.tar.gz -> certbot-dns-dnsimple-1.31.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0a44cf73c6540c650faf90a28e9ca664
+_md5_=60574d6e6b0602f997ca9cd63be5073d
diff --git a/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1 b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
index b6407159e035..4996d1fd0765 100644
--- a/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
+++ b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/jonelo/jacksum/archive/v3.4.0.tar.gz -> jacksum-3.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e019ae46076724dc6101a41bd8218343
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.24.1-r1 b/metadata/md5-cache/app-crypt/p11-kit-0.24.1-r1
index 0c2795749550..1fd8548d9608 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.24.1-r1
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.24.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://p11-glue.github.io/p11-glue/p11-kit.html
 INHERIT=autotools multilib-minimal
 IUSE=+asn1 debug +libffi systemd +trust 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 ~loong ~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 ~loong ~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=MIT
 RDEPEND=asn1? ( >=dev-libs/libtasn1-3.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(-)?] ) libffi? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) trust? ( app-misc/ca-certificates )
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5a6aecc8801411dc94d347fa906d44c3
+_md5_=b3cd049f91f5430032c719efbc2380d7
diff --git a/metadata/md5-cache/app-crypt/seahorse-43.0-r1 b/metadata/md5-cache/app-crypt/seahorse-43.0-r1
new file mode 100644
index 000000000000..88f0dc410a4d
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/seahorse-43.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxslt 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.62.2 >=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:2 >=app-crypt/gcr-3.38:0= >=app-crypt/gpgme-1.14.0:= >=x11-libs/gtk+-3.24.0:3 >=app-crypt/gnupg-2.2 >=gui-libs/libhandy-1.6.0:1 >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) net-libs/libsoup:3.0 zeroconf? ( >=net-dns/avahi-0.6[dbus] ) || ( dev-lang/vala:0.56 ) dev-libs/libxml2:2 app-crypt/gcr:0[vala] app-crypt/libsecret[vala] gui-libs/libhandy:1[vala]
+DESCRIPTION=Manage your passwords and encryption keys
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
+IUSE=ldap zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.66:2 >=app-crypt/gcr-3.38:0= >=app-crypt/gpgme-1.14.0:= >=x11-libs/gtk+-3.24.0:3 >=app-crypt/gnupg-2.2 >=gui-libs/libhandy-1.6.0:1 >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) net-libs/libsoup:3.0 zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+SLOT=0
+SRC_URI=mirror://gnome/sources/seahorse/43/seahorse-43.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=269e74c5432a307087afd722daf81988
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.8-r2 b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.8-r2
new file mode 100644
index 000000000000..aa912080c318
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.8-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/makefun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-crypt/ccid dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fido2:0/0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyscard[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ssl? ( >=dev-python/pyopenssl-0.15.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=8
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+INHERIT=distutils-r1
+IUSE=ssl test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD-2
+RDEPEND=app-crypt/ccid dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fido2:0/0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyscard[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ssl? ( >=dev-python/pyopenssl-0.15.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-4.0.8.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=60fcfcecf5f1c7e91ff92f0db1ca152a
diff --git a/metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r3 b/metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r3
index 2970c6e251a6..0f212e695805 100644
--- a/metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r3
+++ b/metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r3
@@ -1,16 +1,16 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtquickcontrols2:5 dev-qt/qtdeclarative:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-libs/libdrm
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtquickcontrols2:5 dev-qt/qtdeclarative:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-libs/libdrm
 DESCRIPTION=Library and tool for personalization of Yubico's YubiKey NEO
 EAPI=8
 HOMEPAGE=https://developers.yubico.com/yubioath-desktop/ https://github.com/Yubico/yubioath-desktop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop python-single-r1 qmake-utils xdg
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~riscv
 LICENSE=BSD-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtquickcontrols2:5 dev-qt/qtdeclarative:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-libs/libdrm python_single_target_python3_9? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_9(-)] <app-crypt/yubikey-manager-5.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_10(-)] <app-crypt/yubikey-manager-5.0.0[python_targets_python3_10(-)] ) dev-python/pyotherside[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtquickcontrols2:5 dev-qt/qtdeclarative:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-libs/libdrm python_single_target_python3_9? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_9(-)] <app-crypt/yubikey-manager-5.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_10(-)] <app-crypt/yubikey-manager-5.0.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=app-crypt/yubikey-manager-4.0.0[python_targets_python3_11(-)] <app-crypt/yubikey-manager-5.0.0[python_targets_python3_11(-)] ) dev-python/pyotherside[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?]
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubioath-desktop/archive/yubioath-desktop-5.1.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=390fd69d06bda8ed60c6d79da4ea20a7
+_md5_=193a501d5212e940da718d2e17d1a90c
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 409180c163b4..0b516a236d2f 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/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index 9495022e9883..476e350d485a 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=https://prime-dict.osdn.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5bb0c79b712311c8117b619480e9f3f2
diff --git a/metadata/md5-cache/app-dicts/sword-2BabDict-1.0 b/metadata/md5-cache/app-dicts/sword-2BabDict-1.0
deleted file mode 100644
index 1ec84cb4af98..000000000000
--- a/metadata/md5-cache/app-dicts/sword-2BabDict-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Definitions and Symbols from The Two Babylons
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=2BabDict
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/2BabDict.zip -> 2BabDict-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=18400f409d4d72bb25f541cbc19d34fc
diff --git a/metadata/md5-cache/app-dicts/sword-AB-1.3.1 b/metadata/md5-cache/app-dicts/sword-AB-1.3.1
deleted file mode 100644
index 130b846bcb89..000000000000
--- a/metadata/md5-cache/app-dicts/sword-AB-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Apostles' Bible
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.8
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AB.zip -> AB-1.3.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b14b243d9392d765c650800ce34f503e
diff --git a/metadata/md5-cache/app-dicts/sword-ABP-1.2 b/metadata/md5-cache/app-dicts/sword-ABP-1.2
deleted file mode 100644
index 4816ab8fa8f9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ABP-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Apostolic Bible Polyglot English Text
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABP
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ABP.zip -> ABP-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=65fc7ca9ee41ea2af5a17545d242436c
diff --git a/metadata/md5-cache/app-dicts/sword-ABPGRK-1.2 b/metadata/md5-cache/app-dicts/sword-ABPGRK-1.2
deleted file mode 100644
index dc8f5e495903..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ABPGRK-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Apostolic Bible Polyglot Greek Text
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABPGRK
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ABPGRK.zip -> ABPGRK-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f3a4709a90a20661c48453ddebd2a7c7
diff --git a/metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.0 b/metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.0
deleted file mode 100644
index eae25ceb78e0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Essays on The Good Samaritan: Violence on the Road, Social World of Bandits
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABS_Essay_GoodSam_SWB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.3
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ABS_Essay_GoodSam_SWB.zip -> ABS_Essay_GoodSam_SWB-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=35e58ce887bdcf0173617f8a63a0085c
diff --git a/metadata/md5-cache/app-dicts/sword-ACV-2.0-r1 b/metadata/md5-cache/app-dicts/sword-ACV-2.0-r1
deleted file mode 100644
index 205bbb939fca..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ACV-2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=A Conservative Version
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ACV.zip -> ACV-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=27590e506dea40c2ebbec276822f69e9
diff --git a/metadata/md5-cache/app-dicts/sword-AKJV-1.4-r1 b/metadata/md5-cache/app-dicts/sword-AKJV-1.4-r1
deleted file mode 100644
index d1bef4b8f0c6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-AKJV-1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=American King James Version
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AKJV.zip -> AKJV-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b31e8cbd4ac5dd434d675e1447acbaeb
diff --git a/metadata/md5-cache/app-dicts/sword-ASV-2.0 b/metadata/md5-cache/app-dicts/sword-ASV-2.0
deleted file mode 100644
index 8d764f1538d0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ASV-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=American Standard Version (1901)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ASV.zip -> ASV-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9dd431af8601cb66edb2507e6325295d
diff --git a/metadata/md5-cache/app-dicts/sword-Abbott-1.1-r1 b/metadata/md5-cache/app-dicts/sword-Abbott-1.1-r1
deleted file mode 100644
index 7dc5de885d84..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Abbott-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Illustrated New Testament
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Abbott.zip -> Abbott-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a131cdfac794e78bebd12981b7f131bb
diff --git a/metadata/md5-cache/app-dicts/sword-AbbottSmith-3.1 b/metadata/md5-cache/app-dicts/sword-AbbottSmith-3.1
deleted file mode 100644
index eb2bafbbfdac..000000000000
--- a/metadata/md5-cache/app-dicts/sword-AbbottSmith-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=G. Abbott-Smith's A Manual Greek Lexicon of the New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AbbottSmith
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AbbottSmith.zip -> AbbottSmith-3.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1c223bfd7439b7bdbe54b7ae57e1c354
diff --git a/metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.1 b/metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.1
deleted file mode 100644
index 9f673b3fa2c6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=G. Abbott-Smith's A Manual Greek Lexicon of the New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AbbottSmithStrongs
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AbbottSmithStrongs.zip -> AbbottSmithStrongs-3.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7af008846b939db2cc53727e42b243ac
diff --git a/metadata/md5-cache/app-dicts/sword-Afr1953-1.3.2 b/metadata/md5-cache/app-dicts/sword-Afr1953-1.3.2
deleted file mode 100644
index 68ea45302146..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Afr1953-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1933/1953 Afrikaans Bybel
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Afr1953.zip -> Afr1953-1.3.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=edc68cbdfb1577d2cc88969bfec1b584
diff --git a/metadata/md5-cache/app-dicts/sword-Alb-2.0 b/metadata/md5-cache/app-dicts/sword-Alb-2.0
deleted file mode 100644
index 8a0ec272a95a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Alb-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Albanian Bible
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Alb.zip -> Alb-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f6717388011de050fad0cce7187be799
diff --git a/metadata/md5-cache/app-dicts/sword-Aleppo-2.0 b/metadata/md5-cache/app-dicts/sword-Aleppo-2.0
deleted file mode 100644
index 206feb2adfdb..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Aleppo-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Aleppo Codex
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Aleppo.zip -> Aleppo-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=611d343063223240f840a65c4a65455d
diff --git a/metadata/md5-cache/app-dicts/sword-AmTract-1.1-r1 b/metadata/md5-cache/app-dicts/sword-AmTract-1.1-r1
deleted file mode 100644
index c15caee914b8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-AmTract-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=American Tract Society Bible Dictionary
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AmTract.zip -> AmTract-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f1848420e9b5fdf262f68792f5f1807a
diff --git a/metadata/md5-cache/app-dicts/sword-Anderson-1.0 b/metadata/md5-cache/app-dicts/sword-Anderson-1.0
deleted file mode 100644
index 87cf51bfd250..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Anderson-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Henry Tompkins Anderson's 1864 New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Anderson
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Anderson.zip -> Anderson-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a6f8a4332afb473faa5f6cb36f27daf2
diff --git a/metadata/md5-cache/app-dicts/sword-Antoniades-1.4 b/metadata/md5-cache/app-dicts/sword-Antoniades-1.4
deleted file mode 100644
index d2d1ecff7304..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Antoniades-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Antoniades Patriarchal Edition (1904/1912)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Antoniades
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Antoniades.zip -> Antoniades-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a4c0bca754f5cb45d79c9a4fa0143ca7
diff --git a/metadata/md5-cache/app-dicts/sword-AraNAV-2.0.1 b/metadata/md5-cache/app-dicts/sword-AraNAV-2.0.1
deleted file mode 100644
index 0def818d5c59..000000000000
--- a/metadata/md5-cache/app-dicts/sword-AraNAV-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New Arabic Version (Ketab El Hayat)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AraNAV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AraNAV.zip -> AraNAV-2.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d903b0b598935d9885ea13949ee78b45
diff --git a/metadata/md5-cache/app-dicts/sword-AraSVD-2.2 b/metadata/md5-cache/app-dicts/sword-AraSVD-2.2
deleted file mode 100644
index 790016ae11ae..000000000000
--- a/metadata/md5-cache/app-dicts/sword-AraSVD-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AraSVD.zip -> AraSVD-2.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6dbee3a02b1bd79151cca66b281dc8d2
diff --git a/metadata/md5-cache/app-dicts/sword-ArmEastern-1.1-r1 b/metadata/md5-cache/app-dicts/sword-ArmEastern-1.1-r1
deleted file mode 100644
index 56a72c2aa0e2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ArmEastern-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Eastern Armenian Bible
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ArmEastern.zip -> ArmEastern-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=87c7882d6123acab2d5b48b45e8dfc2c
diff --git a/metadata/md5-cache/app-dicts/sword-ArmWestern-1.1 b/metadata/md5-cache/app-dicts/sword-ArmWestern-1.1
deleted file mode 100644
index d05b7de3289c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ArmWestern-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1853 Western Armenian NT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ArmWestern.zip -> ArmWestern-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f16961a9acdc56d8529d5270d9f4ad90
diff --git a/metadata/md5-cache/app-dicts/sword-Azeri-2.5.1 b/metadata/md5-cache/app-dicts/sword-Azeri-2.5.1
deleted file mode 100644
index 55663cc03874..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Azeri-2.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Southern Azeri translation of the Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Azeri
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Azeri.zip -> Azeri-2.5.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a03e4a3cfbcb69a7f1c477d65a69fdd8
diff --git a/metadata/md5-cache/app-dicts/sword-BBE-1.3 b/metadata/md5-cache/app-dicts/sword-BBE-1.3
deleted file mode 100644
index 658b10875577..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BBE-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible in Basic English (1949/1964)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BBE.zip -> BBE-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9fbd00858f2ecc09f3b4a93e57f61ae5
diff --git a/metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.1 b/metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.1
deleted file mode 100644
index b13f079f1c1f..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=BDB Glosses keyed to Strong's numbers
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BDBGlosses_Strongs
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BDBGlosses_Strongs.zip -> BDBGlosses_Strongs-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=706a2019931bfe1dbde34ec97e7dbabc
diff --git a/metadata/md5-cache/app-dicts/sword-BWE-1.0 b/metadata/md5-cache/app-dicts/sword-BWE-1.0
deleted file mode 100644
index 5f6007bc8474..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BWE-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible in Worldwide English
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BWE
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BWE.zip -> BWE-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4d81344ab3ec2bedaa260da90bcac275
diff --git a/metadata/md5-cache/app-dicts/sword-BaptistConfession1646-1.1 b/metadata/md5-cache/app-dicts/sword-BaptistConfession1646-1.1
deleted file mode 100644
index 04cc85c17d8c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BaptistConfession1646-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=First Baptist Confession of Faith, London 1646 Edition with an Addendum by B.Cox
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BaptistConfession1646
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BaptistConfession1646.zip -> BaptistConfession1646-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1bb9a3ca8755ebe21729fa1b11d8bbc1
diff --git a/metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.2 b/metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.2
deleted file mode 100644
index 54b36612f7d7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Baptist Confession of Faith of 1689
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BaptistConfession1689
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BaptistConfession1689.zip -> BaptistConfession1689-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f02914c9cfc4a3abcaeabe6b417036dd
diff --git a/metadata/md5-cache/app-dicts/sword-Barnes-1.1 b/metadata/md5-cache/app-dicts/sword-Barnes-1.1
deleted file mode 100644
index 8f84b492f38d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Barnes-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Barnes' New Testament Notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Barnes.zip -> Barnes-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=97d369a20227f07c0945e1fbbe6e7a73
diff --git a/metadata/md5-cache/app-dicts/sword-BasHautin-1.5 b/metadata/md5-cache/app-dicts/sword-BasHautin-1.5
deleted file mode 100644
index ba323baab6ce..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BasHautin-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1571 Navarro-Labourdin Basque NT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BasHautin.zip -> BasHautin-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=518bfca6275091add57f9f3167c190fb
diff --git a/metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.1 b/metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.1
deleted file mode 100644
index 64dc453dc640..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Gospel of Mark in Beaver (Danezaa)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BeaMRK
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BeaMRK.zip -> BeaMRK-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=886c3fa7257091211f1ed16440f751aa
diff --git a/metadata/md5-cache/app-dicts/sword-Bela-1.1 b/metadata/md5-cache/app-dicts/sword-Bela-1.1
deleted file mode 100644
index d06a4d9bd219..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Bela-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Belarusian Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Bela
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Bela.zip -> Bela-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=fa342ed6e53a93563389a0e9def25884
diff --git a/metadata/md5-cache/app-dicts/sword-BretonNT-1.1.1 b/metadata/md5-cache/app-dicts/sword-BretonNT-1.1.1
deleted file mode 100644
index 2bb9bee0901d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BretonNT-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Breton New Testament (Koad 21)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BretonNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BretonNT.zip -> BretonNT-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e68657a6b5cb0fe2482f5144cedf8c64
diff --git a/metadata/md5-cache/app-dicts/sword-BulCarigradNT-1.0.1 b/metadata/md5-cache/app-dicts/sword-BulCarigradNT-1.0.1
deleted file mode 100644
index 421b020c8f31..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BulCarigradNT-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bulgarian New Testament from 1914, known as 'Tsarigrad Edition'
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BulCarigradNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.6
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BulCarigradNT.zip -> BulCarigradNT-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=61773b5c7ec2176fbb431e5ecfd3ebff
diff --git a/metadata/md5-cache/app-dicts/sword-BulVeren-1.1 b/metadata/md5-cache/app-dicts/sword-BulVeren-1.1
deleted file mode 100644
index 1820b28b90ad..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BulVeren-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Veren's Contemporary Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BulVeren.zip -> BulVeren-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9f0d9a652a8279d2d370896fd7f6c318
diff --git a/metadata/md5-cache/app-dicts/sword-BurCBCM-1.2 b/metadata/md5-cache/app-dicts/sword-BurCBCM-1.2
deleted file mode 100644
index 55366cb49053..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BurCBCM-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Catholic Myanmar Bible (CBCM)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BurCBCM
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BurCBCM.zip -> BurCBCM-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=91c4cae2327d3595f72424aff74b86f3
diff --git a/metadata/md5-cache/app-dicts/sword-BurJudson-1.3 b/metadata/md5-cache/app-dicts/sword-BurJudson-1.3
deleted file mode 100644
index 6cdc1f9c0aaa..000000000000
--- a/metadata/md5-cache/app-dicts/sword-BurJudson-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1835 Judson Burmese Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=media-fonts/sil-padauk >=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/BurJudson.zip -> BurJudson-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6c9af02b2885a319eff2c81b43a513b3
diff --git a/metadata/md5-cache/app-dicts/sword-Burkitt-1.0 b/metadata/md5-cache/app-dicts/sword-Burkitt-1.0
deleted file mode 100644
index ce137fdbb8a8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Burkitt-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Burkitt's Expository Notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Burkitt
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Burkitt.zip -> Burkitt-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=59ebb4bded256c62577371eff7393915
diff --git a/metadata/md5-cache/app-dicts/sword-Byz-3.0 b/metadata/md5-cache/app-dicts/sword-Byz-3.0
deleted file mode 100644
index 73fe2973e475..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Byz-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The New Testament in Original Greek: Byzantine Textform 2005
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Byz.zip -> Byz-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=24c8a0421522e135fbefb29519b62df8
diff --git a/metadata/md5-cache/app-dicts/sword-CBC-1.1 b/metadata/md5-cache/app-dicts/sword-CBC-1.1
deleted file mode 100644
index 89f4d666f70f..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CBC-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Condensed Biblical Cyclopedia
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CBC.zip -> CBC-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=52cdb87973ee1022554f75a1af84340e
diff --git a/metadata/md5-cache/app-dicts/sword-CPDV-2.1.1 b/metadata/md5-cache/app-dicts/sword-CPDV-2.1.1
deleted file mode 100644
index b3e3416690b2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CPDV-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Catholic Public Domain Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CPDV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CPDV.zip -> CPDV-2.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5e4bb7bb2282ec81eed20e65dc7b00e9
diff --git a/metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.1 b/metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.1
deleted file mode 100644
index 357a7bdf5a09..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1757 Church Slavonic Elizabeth Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CSlElizabeth
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CSlElizabeth.zip -> CSlElizabeth-1.5.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=cd3a8fcfae41ded3364d47ed3d3c4ab9
diff --git a/metadata/md5-cache/app-dicts/sword-Calo-1.0 b/metadata/md5-cache/app-dicts/sword-Calo-1.0
deleted file mode 100644
index 5e2566761546..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Calo-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Gospel of Luke in the Caló language
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Calo
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Calo.zip -> Calo-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9d822112ad877cfa9b7e08dec0818498
diff --git a/metadata/md5-cache/app-dicts/sword-Catena-1.0 b/metadata/md5-cache/app-dicts/sword-Catena-1.0
deleted file mode 100644
index c34a3ffd5d79..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Catena-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Catena Aurea (Thomas Aquinas)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Catena
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Catena.zip -> Catena-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1b106f879ed9cd27d51626fa5be4b556
diff --git a/metadata/md5-cache/app-dicts/sword-Cawdrey-1.0 b/metadata/md5-cache/app-dicts/sword-Cawdrey-1.0
deleted file mode 100644
index b9f1cb7ccbf8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Cawdrey-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=A Table Alphabeticall by Robert Cawdrey (1604)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Cawdrey
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Cawdrey.zip -> Cawdrey-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2f5a2fe0784ef2b24a0d5d91d1e1db6f
diff --git a/metadata/md5-cache/app-dicts/sword-CebPinadayag-1.0.1 b/metadata/md5-cache/app-dicts/sword-CebPinadayag-1.0.1
deleted file mode 100644
index ae9bea076ee4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CebPinadayag-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Cebuano Pinadayag
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CebPinadayag
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CebPinadayag.zip -> CebPinadayag-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c5d77d12d1502f93bc28ae6767a66aac
diff --git a/metadata/md5-cache/app-dicts/sword-Chamorro-2.7.2 b/metadata/md5-cache/app-dicts/sword-Chamorro-2.7.2
deleted file mode 100644
index 3f53cbab5fd5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Chamorro-2.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Chamorro: Y Santa Biblia (1908)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Chamorro.zip -> Chamorro-2.7.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c47f080f4b799155c66f284586e42286
diff --git a/metadata/md5-cache/app-dicts/sword-Che1860-2.0 b/metadata/md5-cache/app-dicts/sword-Che1860-2.0
deleted file mode 100644
index 37db48a9b871..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Che1860-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Cherokee New Testament (1860) with Sequoyah transliterated forms
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Che1860
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Che1860.zip -> Che1860-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3e5cf252989bb2d150717fc5394a9898
diff --git a/metadata/md5-cache/app-dicts/sword-ChiNCVs-1.1 b/metadata/md5-cache/app-dicts/sword-ChiNCVs-1.1
deleted file mode 100644
index 772c32eb5c9e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ChiNCVs-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New Chinese Version of the Bible, simplified script
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVs
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiNCVs.zip -> ChiNCVs-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=25d5192a57fc2a6ab3253491f8c8a973
diff --git a/metadata/md5-cache/app-dicts/sword-ChiNCVt-1.1 b/metadata/md5-cache/app-dicts/sword-ChiNCVt-1.1
deleted file mode 100644
index b090a08508f7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ChiNCVt-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New Chinese Version of the Bible, traditional script
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVt
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiNCVt.zip -> ChiNCVt-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=fb1f57f8e1d7d686a95b627f50e5f4bf
diff --git a/metadata/md5-cache/app-dicts/sword-ChiSB-1.0 b/metadata/md5-cache/app-dicts/sword-ChiSB-1.0
deleted file mode 100644
index e8b019375ac4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ChiSB-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Studium Biblicum Version in traditional Chinese
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiSB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiSB.zip -> ChiSB-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3ba13d837170c7f30f6def4b2ad5bd16
diff --git a/metadata/md5-cache/app-dicts/sword-ChiUn-3.0 b/metadata/md5-cache/app-dicts/sword-ChiUn-3.0
deleted file mode 100644
index 36b4f93064a5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ChiUn-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Chinese Union Version of the Bible, traditional script
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUn
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiUn.zip -> ChiUn-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=86a554ceae75f15760a9a5f43f5c6dff
diff --git a/metadata/md5-cache/app-dicts/sword-ChiUnL-1.0 b/metadata/md5-cache/app-dicts/sword-ChiUnL-1.0
deleted file mode 100644
index 941d862e651b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ChiUnL-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Chinese Union Version of the Bible, classical (literary) script
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUnL
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiUnL.zip -> ChiUnL-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c3f17a20b9aeccbff588cf448511ed18
diff --git a/metadata/md5-cache/app-dicts/sword-ChiUns-3.0 b/metadata/md5-cache/app-dicts/sword-ChiUns-3.0
deleted file mode 100644
index d5dd4a60d623..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ChiUns-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Chinese Union Version of the Bible, simplified script
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUns
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiUns.zip -> ChiUns-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8d14fbd6e9c0e5ae134209c672fc7b27
diff --git a/metadata/md5-cache/app-dicts/sword-Clarke-2.0 b/metadata/md5-cache/app-dicts/sword-Clarke-2.0
deleted file mode 100644
index 5bb6a619f6f8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Clarke-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Adam Clarke's Commentary and critical notes on the Bible
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Clarke.zip -> Clarke-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1c160a3f180281b716dc95bd8b8f7493
diff --git a/metadata/md5-cache/app-dicts/sword-Common-1.3 b/metadata/md5-cache/app-dicts/sword-Common-1.3
deleted file mode 100644
index 6125aa7fd3fb..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Common-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Common Edition: New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Common
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Common.zip -> Common-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=88ed610c0b8fe949ee885b6a8d41711c
diff --git a/metadata/md5-cache/app-dicts/sword-Concord-2.4.1 b/metadata/md5-cache/app-dicts/sword-Concord-2.4.1
deleted file mode 100644
index 534078599f5a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Concord-2.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Book of Concord: The Symbolical Books of the Ev. Lutheran Church
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Concord
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Concord.zip -> Concord-2.4.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c912ab4c82b036f90b63d8b153f508c2
diff --git a/metadata/md5-cache/app-dicts/sword-CopNT-1.0.1 b/metadata/md5-cache/app-dicts/sword-CopNT-1.0.1
deleted file mode 100644
index 8ec8c1a194ed..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CopNT-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Coptic New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CopNT.zip -> CopNT-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=31ae64b4680609400309f9b3f92c974f
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahBible2-1.3 b/metadata/md5-cache/app-dicts/sword-CopSahBible2-1.3
deleted file mode 100644
index 31beb48519bf..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CopSahBible2-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Sahidic Bible 2
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahBible2
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CopSahBible2.zip -> CopSahBible2-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c183511ffc79467e7a72f3fa166ec9e0
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahHorner-1.5 b/metadata/md5-cache/app-dicts/sword-CopSahHorner-1.5
deleted file mode 100644
index b0fe621aef06..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CopSahHorner-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Sahidic Coptic New Testament, ed. by G. W. Horner
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahHorner
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CopSahHorner.zip -> CopSahHorner-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=def392d2bbd4960f7c9ddad1599b08ab
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.0 b/metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.0
deleted file mode 100644
index afc703b07ec0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Sahidica Manuscripts
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahidicMSS
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CopSahidicMSS.zip -> CopSahidicMSS-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b62d4d9bae3d9ba704dde88480ebf796
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahidica-1.0 b/metadata/md5-cache/app-dicts/sword-CopSahidica-1.0
deleted file mode 100644
index 34535d586231..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CopSahidica-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Sahidica - A New Edition of the New Testament in Sahidic Coptic
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahidica
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CopSahidica.zip -> CopSahidica-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6cc64e3c8c417e9a0aab3f1de704ea69
diff --git a/metadata/md5-cache/app-dicts/sword-CroSaric-2.0 b/metadata/md5-cache/app-dicts/sword-CroSaric-2.0
deleted file mode 100644
index 611a26b49f4a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CroSaric-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Croatian Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CroSaric
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CroSaric.zip -> CroSaric-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b6684c4738205c6a24d92e7b83d8c977
diff --git a/metadata/md5-cache/app-dicts/sword-CzeB21-1.5 b/metadata/md5-cache/app-dicts/sword-CzeB21-1.5
deleted file mode 100644
index 677ea6f9f094..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CzeB21-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Czech Bible, Překlad 21. století včetně deuterokanonických knih
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeB21
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CzeB21.zip -> CzeB21-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=72ed2e3ebb2309c1a0350854e15defcb
diff --git a/metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.1 b/metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.1
deleted file mode 100644
index 0ea782ca5998..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Czech Bible Kralicka
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeBKR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CzeBKR.zip -> CzeBKR-1.3.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9c02eabdbe013874d158f0ffac2059eb
diff --git a/metadata/md5-cache/app-dicts/sword-CzeCEP-1.8 b/metadata/md5-cache/app-dicts/sword-CzeCEP-1.8
deleted file mode 100644
index bc7acfce2d01..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CzeCEP-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Czech Ekumenicky Cesky preklad
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCEP
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CzeCEP.zip -> CzeCEP-1.8.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2301b2b54564b4f7b80b42a056be9238
diff --git a/metadata/md5-cache/app-dicts/sword-CzeCSP-1.4 b/metadata/md5-cache/app-dicts/sword-CzeCSP-1.4
deleted file mode 100644
index a35d4065cffa..000000000000
--- a/metadata/md5-cache/app-dicts/sword-CzeCSP-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Czech Český studijní překlad
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCSP
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-ND-4.0
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/CzeCSP.zip -> CzeCSP-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8fd9d06cb9e1a60af5878085cb3a88b9
diff --git a/metadata/md5-cache/app-dicts/sword-DBD-1.4 b/metadata/md5-cache/app-dicts/sword-DBD-1.4
deleted file mode 100644
index 3bc5e46d6ad8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DBD-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Day By Day By Grace - Bob Hoekstra
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DBD
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DBD.zip -> DBD-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6b03b75cfb74cb3fb9feb6bbe0db2882
diff --git a/metadata/md5-cache/app-dicts/sword-DRC-2.0 b/metadata/md5-cache/app-dicts/sword-DRC-2.0
deleted file mode 100644
index a5dd50f741e9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DRC-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Douay-Rheims Bible, Challoner Revision
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DRC
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DRC.zip -> DRC-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f49c9e4b081bbe8c0917da2db1e88e0f
diff --git a/metadata/md5-cache/app-dicts/sword-DTN-1.0 b/metadata/md5-cache/app-dicts/sword-DTN-1.0
deleted file mode 100644
index f65f792134d9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DTN-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Darby Translation Notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DTN
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DTN.zip -> DTN-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2c29a21e0a3a4b388ded54c2ae35f8d1
diff --git a/metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.1 b/metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.1
deleted file mode 100644
index 16db9d533f22..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Danish New Testament from 1819 with original orthography
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaNT1819
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DaNT1819.zip -> DaNT1819-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=de0a4bef048b9e8585c480df15b51fb9
diff --git a/metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.0 b/metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.0
deleted file mode 100644
index 021410f4cdb1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Danish OT1871 + NT1907 with original orthography
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaOT1871NT1907
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DaOT1871NT1907.zip -> DaOT1871NT1907-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7797197fa57f83a071e7650fb78b523f
diff --git a/metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.01 b/metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.01
deleted file mode 100644
index a4ce3a545a53..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.01
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Danish OT1931 + NT1907 with original orthography
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaOT1931NT1907
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DaOT1931NT1907.zip -> DaOT1931NT1907-1.01.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1a2e3e8f5300c95e56ec8807fce474a8
diff --git a/metadata/md5-cache/app-dicts/sword-Daily-1.0 b/metadata/md5-cache/app-dicts/sword-Daily-1.0
deleted file mode 100644
index c5cfba1e98c8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Daily-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Jonathan Bagster's Daily Light on the Daily Path
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Daily
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Daily.zip -> Daily-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=23eb094daae9c7627af756440b9f8335
diff --git a/metadata/md5-cache/app-dicts/sword-Darby-2.0 b/metadata/md5-cache/app-dicts/sword-Darby-2.0
deleted file mode 100644
index 3148961b8ced..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Darby-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Darby Bible (1889)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Darby
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Darby.zip -> Darby-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=12d0c5487f2b7e05798aa9d8d3ddc242
diff --git a/metadata/md5-cache/app-dicts/sword-Dari-1.0.2 b/metadata/md5-cache/app-dicts/sword-Dari-1.0.2
deleted file mode 100644
index 3ee85dc16ba0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Dari-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dari Translation
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Dari
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Dari.zip -> Dari-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5b39e7bd30d8d014b811518be6ff5acf
diff --git a/metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.0 b/metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.0
deleted file mode 100644
index b43802a39555..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION='The Dark Night of the Soul' by St. John of the Cross
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DarkNightOfTheSoul
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DarkNightOfTheSoul.zip -> DarkNightOfTheSoul-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c5d16b7ec3c67d732e1b4a02a3aff4d7
diff --git a/metadata/md5-cache/app-dicts/sword-Diaglott-1.1 b/metadata/md5-cache/app-dicts/sword-Diaglott-1.1
deleted file mode 100644
index b15a7baa70f1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Diaglott-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Emphatic Diaglott
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Diaglott
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Diaglott.zip -> Diaglott-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a92f249b0f8716306de67e0bc523d47a
diff --git a/metadata/md5-cache/app-dicts/sword-Dodson-1.0 b/metadata/md5-cache/app-dicts/sword-Dodson-1.0
deleted file mode 100644
index 24db99072005..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Dodson-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dodson Greek-English Lexicon
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Dodson
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Dodson.zip -> Dodson-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=40dd5e2f71efe7bef529b7861e8fec84
diff --git a/metadata/md5-cache/app-dicts/sword-DutKant-1.1 b/metadata/md5-cache/app-dicts/sword-DutKant-1.1
deleted file mode 100644
index ad32141b7ab5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DutKant-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Kanttekeningen Statenvertaling
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKant
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DutKant.zip -> DutKant-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e7547f6f06109ba4a4454d3a9d06c439
diff --git a/metadata/md5-cache/app-dicts/sword-DutKingComm-1.0 b/metadata/md5-cache/app-dicts/sword-DutKingComm-1.0
deleted file mode 100644
index 011004eb05ff..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DutKingComm-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Kingcomments-NL, Commentaar op de hele Bijbel
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKingComm
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DutKingComm.zip -> DutKingComm-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8d3e5c3647cbc82e473a84aa302dcc0c
diff --git a/metadata/md5-cache/app-dicts/sword-DutSVV-2.1 b/metadata/md5-cache/app-dicts/sword-DutSVV-2.1
deleted file mode 100644
index c7aaec90aa54..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DutSVV-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dutch Statenvertaling Bijbel, including footnotes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DutSVV.zip -> DutSVV-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=da2d71e1e524bfc73e56f54ec977df1c
diff --git a/metadata/md5-cache/app-dicts/sword-DutSVVA-1.0 b/metadata/md5-cache/app-dicts/sword-DutSVVA-1.0
deleted file mode 100644
index fea263df4007..000000000000
--- a/metadata/md5-cache/app-dicts/sword-DutSVVA-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dutch Statenvertaling Bijbel including deuterocanonical books
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVVA
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/DutSVVA.zip -> DutSVVA-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4fe2229409db1d88eec0d98f2091142e
diff --git a/metadata/md5-cache/app-dicts/sword-EMBReality-0.5 b/metadata/md5-cache/app-dicts/sword-EMBReality-0.5
deleted file mode 100644
index 2cb959b2b6fb..000000000000
--- a/metadata/md5-cache/app-dicts/sword-EMBReality-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Reality of Prayer by E.M. Bounds
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=EMBReality
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/EMBReality.zip -> EMBReality-0.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=cf1028f02ed504e3caaff4f5229a728a
diff --git a/metadata/md5-cache/app-dicts/sword-EMTV-2.2 b/metadata/md5-cache/app-dicts/sword-EMTV-2.2
deleted file mode 100644
index d2e53b90ea7a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-EMTV-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=English Majority Text Version, 2012 Edition with Greek Explanatory Notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=EMTV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/EMTV.zip -> EMTV-2.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e290602450776231f95e1b3b10782153
diff --git a/metadata/md5-cache/app-dicts/sword-Easton-2.0 b/metadata/md5-cache/app-dicts/sword-Easton-2.0
deleted file mode 100644
index c96eaca4e4fa..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Easton-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Easton's Bible Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Easton
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Easton.zip -> Easton-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ac162fde439ef1169599d32bdfe8f36c
diff --git a/metadata/md5-cache/app-dicts/sword-Elzevir-1.3 b/metadata/md5-cache/app-dicts/sword-Elzevir-1.3
deleted file mode 100644
index c65c9311ca75..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Elzevir-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Elzevir Textus Receptus (1624)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Elzevir
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Elzevir.zip -> Elzevir-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9dee3f8e27c19a9c97fee811b1acdacd
diff --git a/metadata/md5-cache/app-dicts/sword-Esperanto-2.1 b/metadata/md5-cache/app-dicts/sword-Esperanto-2.1
deleted file mode 100644
index b3e694bdbf05..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Esperanto-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Esperanto Londona Biblio
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Esperanto
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Esperanto.zip -> Esperanto-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d1b25b34272d1dac266ecded8ea2459a
diff --git a/metadata/md5-cache/app-dicts/sword-Est-1.1 b/metadata/md5-cache/app-dicts/sword-Est-1.1
deleted file mode 100644
index 54214704dbfe..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Est-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Estonian Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Est
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Est.zip -> Est-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4f9ef9acdd64ab87408d142c6a55263b
diff --git a/metadata/md5-cache/app-dicts/sword-Etheridge-1.1 b/metadata/md5-cache/app-dicts/sword-Etheridge-1.1
deleted file mode 100644
index 9d0f081f9318..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Etheridge-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Peschito Syriac New Testament: Translated into English
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Etheridge
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Etheridge.zip -> Etheridge-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=37ae1c63d3c9bbae1ce3ee0c51d441b0
diff --git a/metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1 b/metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1
deleted file mode 100644
index 44e99af8e9d4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Eusebian Numbers
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Eusebian_num
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=!app-dicts/sword-Eusebian_vs >=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Eusebian_num.zip -> Eusebian_num-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a9687bd32434ad97f9457fb02c79ad7d
diff --git a/metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1 b/metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1
deleted file mode 100644
index 6cdb0c7bc0b9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Eusebian Numbers By Verse
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Eusebian_vs
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=!app-dicts/sword-Eusebian_num >=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Eusebian_vs.zip -> Eusebian_vs-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4be88004bb590cc818b05286110b702d
diff --git a/metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.1 b/metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.1
deleted file mode 100644
index ee57c4ac43d8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=FVDP Vietnamese-English Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FVDPVietAnh
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=GPL-3+
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FVDPVietAnh.zip -> FVDPVietAnh-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=96b0ea6c6a4449046a630719fa605add
diff --git a/metadata/md5-cache/app-dicts/sword-Family-1.1 b/metadata/md5-cache/app-dicts/sword-Family-1.1
deleted file mode 100644
index 2650ddd485d7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Family-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Family Bible Notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Family
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Family.zip -> Family-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ade6f73261cd372f857ccaecec9d1656
diff --git a/metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.2 b/metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.2
deleted file mode 100644
index 9c55c74e936c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Tarjumeh-ye Hezare Noh
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarHezareNoh
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.10
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FarHezareNoh.zip -> FarHezareNoh-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=92d926423b1237bb948f46bb7f309f89
diff --git a/metadata/md5-cache/app-dicts/sword-FarOPV-1.5.1 b/metadata/md5-cache/app-dicts/sword-FarOPV-1.5.1
deleted file mode 100644
index 1ac8ff96da0b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FarOPV-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Persian Holy Bible (Tarjumeh-ye Ghadeem)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarOPV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FarOPV.zip -> FarOPV-1.5.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=635cf098e1a2e43e4dc455dfb2d36f80
diff --git a/metadata/md5-cache/app-dicts/sword-FarTPV-1.1.2 b/metadata/md5-cache/app-dicts/sword-FarTPV-1.1.2
deleted file mode 100644
index f1a74da1a34f..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FarTPV-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Today's Persian Version (Mojdeh Baraye Asre Jadid)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarTPV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FarTPV.zip -> FarTPV-1.1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e9a4e47154bef25f892c9f78cd98a61e
diff --git a/metadata/md5-cache/app-dicts/sword-FinBiblia-2.1 b/metadata/md5-cache/app-dicts/sword-FinBiblia-2.1
deleted file mode 100644
index d57c0c09a7b7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FinBiblia-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Finnish Biblia (1776)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinBiblia
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FinBiblia.zip -> FinBiblia-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e12a7dec8337068be46b8144d59104f0
diff --git a/metadata/md5-cache/app-dicts/sword-FinPR-1.2.2 b/metadata/md5-cache/app-dicts/sword-FinPR-1.2.2
deleted file mode 100644
index f4d540fb7d16..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FinPR-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Finnish Pyhä Raamattu (1933/1938)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FinPR.zip -> FinPR-1.2.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6d6aa6fe605d04705045077af4cee8c7
diff --git a/metadata/md5-cache/app-dicts/sword-FinPR92-1.1.1 b/metadata/md5-cache/app-dicts/sword-FinPR92-1.1.1
deleted file mode 100644
index a427dbf2e030..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FinPR92-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Finnish Pyhä Raamattu (1992)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR92
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FinPR92.zip -> FinPR92-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=fb465e0538a3309d94161f0224f52140
diff --git a/metadata/md5-cache/app-dicts/sword-FinRK-1.8.3 b/metadata/md5-cache/app-dicts/sword-FinRK-1.8.3
deleted file mode 100644
index cea20341abd2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FinRK-1.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Raamattu Kansalle (2012)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinRK
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FinRK.zip -> FinRK-1.8.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e87d24f45ab91b5d9312cda84cf91134
diff --git a/metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.3 b/metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.3
deleted file mode 100644
index ee7f97d90217..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Pyhä Raamattu (STLK 2017)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinSTLK2017
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-ND-4.0
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FinSTLK2017.zip -> FinSTLK2017-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7de16a2c52c0e239427bd0b816ebf2b2
diff --git a/metadata/md5-cache/app-dicts/sword-Finney-1.1 b/metadata/md5-cache/app-dicts/sword-Finney-1.1
deleted file mode 100644
index f0e1633a67ac..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Finney-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Sermons on Gospel Themes by Charles G. Finney (1792-1875)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Finney
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Finney.zip -> Finney-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4144e41dcdebbb7580b766f857672335
diff --git a/metadata/md5-cache/app-dicts/sword-FreAug-1.0 b/metadata/md5-cache/app-dicts/sword-FreAug-1.0
deleted file mode 100644
index 7a32e52a5b1d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreAug-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Commentaires de la Bible par Saint Augustin
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreAug
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreAug.zip -> FreAug-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ad5082e232faa5cba2a4c5977001554d
diff --git a/metadata/md5-cache/app-dicts/sword-FreBBB-1.3 b/metadata/md5-cache/app-dicts/sword-FreBBB-1.3
deleted file mode 100644
index 74672e063679..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreBBB-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=French Bible Bovet Bonnet (1900)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBBB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreBBB.zip -> FreBBB-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8a04a5eace94b2d393a33e5b2143f539
diff --git a/metadata/md5-cache/app-dicts/sword-FreBDM1707-1.1 b/metadata/md5-cache/app-dicts/sword-FreBDM1707-1.1
deleted file mode 100644
index 9d670a85d61b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreBDM1707-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=French Bible David Martin (1707)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBDM1707
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreBDM1707.zip -> FreBDM1707-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0dfe0fc707cc10ade6deb69aeb31eb7b
diff --git a/metadata/md5-cache/app-dicts/sword-FreBDM1744-2.0 b/metadata/md5-cache/app-dicts/sword-FreBDM1744-2.0
deleted file mode 100644
index f5b779d439a2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreBDM1744-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible David Martin (1744)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBDM1744
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreBDM1744.zip -> FreBDM1744-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=721ebbfcff67dbd19192e6a28e5c28c8
diff --git a/metadata/md5-cache/app-dicts/sword-FreBailly-1.3 b/metadata/md5-cache/app-dicts/sword-FreBailly-1.3
deleted file mode 100644
index 5f1fc94fef61..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreBailly-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Abbreviated Greek-French Dictionary by A. Bailly
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBailly
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreBailly.zip -> FreBailly-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c5d1d9a872c40c343d760ad7fc926819
diff --git a/metadata/md5-cache/app-dicts/sword-FreCJE-2.0.1 b/metadata/md5-cache/app-dicts/sword-FreCJE-2.0.1
deleted file mode 100644
index 6615bb5bac19..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreCJE-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Chaque jour les Écritures
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCJE
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreCJE.zip -> FreCJE-2.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a7c2b5f93a5d36fba16b7f1738f00b7b
diff --git a/metadata/md5-cache/app-dicts/sword-FreChry-1.0 b/metadata/md5-cache/app-dicts/sword-FreChry-1.0
deleted file mode 100644
index 07eb6e80ef5d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreChry-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Commentaires de la Bible par Saint Jean Chrysostome
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreChry
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreChry.zip -> FreChry-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3e7e2084687f4ee37b0fde4896a21a54
diff --git a/metadata/md5-cache/app-dicts/sword-FreCrampon-3.0 b/metadata/md5-cache/app-dicts/sword-FreCrampon-3.0
deleted file mode 100644
index 7850d63fb884..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreCrampon-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=La Bible Augustin Crampon 1923
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrampon
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreCrampon.zip -> FreCrampon-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=bb6ff373d553ae2735478b3717b9e8d9
diff --git a/metadata/md5-cache/app-dicts/sword-FreDAW-1.2.1 b/metadata/md5-cache/app-dicts/sword-FreDAW-1.2.1
deleted file mode 100644
index 3b0a83623568..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreDAW-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dictionnaire encyclopédique de la Bible A. Westphal (1932)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreDAW
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreDAW.zip -> FreDAW-1.2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d3b64faaddb2b70639b16e2c3349cb32
diff --git a/metadata/md5-cache/app-dicts/sword-FreGBM-1.0 b/metadata/md5-cache/app-dicts/sword-FreGBM-1.0
deleted file mode 100644
index 113cbd0fcb19..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreGBM-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Glossary of the Bible David Martin 1744
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreGBM
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreGBM.zip -> FreGBM-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5b93527957434695561dc8a61abb2b56
diff --git a/metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.3 b/metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.3
deleted file mode 100644
index 8762ffac3b6a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Le Nouveau Testament de la Bible de Genève de 1669
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreGeneve1669
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreGeneve1669.zip -> FreGeneve1669-1.0.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=31debff0d0eb1e4b459816c9c1c46f88
diff --git a/metadata/md5-cache/app-dicts/sword-FreJND-1.24 b/metadata/md5-cache/app-dicts/sword-FreJND-1.24
deleted file mode 100644
index b72667482308..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreJND-1.24
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible J.N.Darby en français (1975)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreJND
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreJND.zip -> FreJND-1.24.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=42e4bd1bab4b96e17579a5de1e868984
diff --git a/metadata/md5-cache/app-dicts/sword-FreKhan-1.0.2 b/metadata/md5-cache/app-dicts/sword-FreKhan-1.0.2
deleted file mode 100644
index 800170ec7115..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreKhan-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=La Bible de Zadoc Khan
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreKhan
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreKhan.zip -> FreKhan-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0b368fe1d9f2544db6cb50bb24d6297e
diff --git a/metadata/md5-cache/app-dicts/sword-FreLSN1872-1.0 b/metadata/md5-cache/app-dicts/sword-FreLSN1872-1.0
deleted file mode 100644
index 1e76e6f9c3e6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreLSN1872-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible de Lausanne (1872)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSN1872
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreLSN1872.zip -> FreLSN1872-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=82e78c4b0f00e3d0e7df99c4636cd30a
diff --git a/metadata/md5-cache/app-dicts/sword-FreLXX-1.1 b/metadata/md5-cache/app-dicts/sword-FreLXX-1.1
deleted file mode 100644
index ea6e38e411dc..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreLXX-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Traduction de la LXX par P. GIGUET et autres traducteurs, 1872
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLXX
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreLXX.zip -> FreLXX-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b8d044012f01d0b6072b3f42f8551306
diff --git a/metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.3 b/metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.3
deleted file mode 100644
index ede86aa50494..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Le Nouveau Testament Version Oltramare 1874
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreOltramare1874
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreOltramare1874.zip -> FreOltramare1874-1.0.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=978b71c74f897f01e2e3759b06d43f4e
diff --git a/metadata/md5-cache/app-dicts/sword-FrePGR-1.2 b/metadata/md5-cache/app-dicts/sword-FrePGR-1.2
deleted file mode 100644
index 01928a2c943f..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FrePGR-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible Perret-Gentil et Rilliet
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FrePGR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FrePGR.zip -> FrePGR-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=613397a73f8e8bbae86c4aa4d7f1dc1f
diff --git a/metadata/md5-cache/app-dicts/sword-FrePilgrim-1.0 b/metadata/md5-cache/app-dicts/sword-FrePilgrim-1.0
deleted file mode 100644
index c845c18bb46b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FrePilgrim-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Pilgrim's Progress in French
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FrePilgrim
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FrePilgrim.zip -> FrePilgrim-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f14bf8be25fcabd90e0c4124819c57a5
diff --git a/metadata/md5-cache/app-dicts/sword-FreSegond1910-3.1 b/metadata/md5-cache/app-dicts/sword-FreSegond1910-3.1
deleted file mode 100644
index 6824e8bb2453..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreSegond1910-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=French Bible Louis Segond (1910)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSegond1910
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreSegond1910.zip -> FreSegond1910-3.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9074f56f0c90bef5e9b1f07ed489a15b
diff --git a/metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.2 b/metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.2
deleted file mode 100644
index 9576c56cc72c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Le Nouveau Testament traduction de Stapfer - 1889
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreStapfer1889
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreStapfer1889.zip -> FreStapfer1889-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=655bc16d3734da0c9e1ef54686b873af
diff --git a/metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.3 b/metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.3
deleted file mode 100644
index e0ea9f8916e5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Le Nouveau Testament Version Synodale 1921 et le livre des Psaumes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSynodale1921
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreSynodale1921.zip -> FreSynodale1921-1.0.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1cb204214c4960f90d8a077bfdfdd24a
diff --git a/metadata/md5-cache/app-dicts/sword-Geez-1.0.1 b/metadata/md5-cache/app-dicts/sword-Geez-1.0.1
deleted file mode 100644
index 12fbb7371d4a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Geez-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Ge’ez Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geez
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Geez.zip -> Geez-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f29d6e060ca5be5bd6acc9e29657603a
diff --git a/metadata/md5-cache/app-dicts/sword-Geneva-1.1 b/metadata/md5-cache/app-dicts/sword-Geneva-1.1
deleted file mode 100644
index 48dfa2004499..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Geneva-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Geneva Bible Translation Notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Geneva.zip -> Geneva-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c60efe34996ba374e9a98802604f07b3
diff --git a/metadata/md5-cache/app-dicts/sword-Geneva1599-2.0 b/metadata/md5-cache/app-dicts/sword-Geneva1599-2.0
deleted file mode 100644
index b31d897ef493..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Geneva1599-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Geneva Bible (1599)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva1599
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Geneva1599.zip -> Geneva1599-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=54569a631c5e57c69bbb6d12358b7c58
diff --git a/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5 b/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
deleted file mode 100644
index 2ebd4ce14ecd..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=German Albrecht Neues Testament und Psalmen
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAlbrecht
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerAlbrecht.zip -> GerAlbrecht-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ff3b20e7e73e828531af1db76c17d363
diff --git a/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5 b/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
deleted file mode 100644
index 407d0881c4b6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Augustines Confessions (German)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAugustinus
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.3
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerAugustinus.zip -> GerAugustinus-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=84fd94e45bf97cf0d3ffd71fcf19f797
diff --git a/metadata/md5-cache/app-dicts/sword-GerBoLut-3.0 b/metadata/md5-cache/app-dicts/sword-GerBoLut-3.0
deleted file mode 100644
index 73c0e54848f5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerBoLut-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Deutsch Bolsingerߴs Luther 1545 Bibel (moderne Rechtschreibung)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerBoLut
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerBoLut.zip -> GerBoLut-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e1afd94e097ab51c6745f92b0279b8ca
diff --git a/metadata/md5-cache/app-dicts/sword-GerElb1871-1.2 b/metadata/md5-cache/app-dicts/sword-GerElb1871-1.2
deleted file mode 100644
index 639d6e6cad2e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerElb1871-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=German Elberfelder (1871)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1871
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerElb1871.zip -> GerElb1871-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3f4329153935b66756b3d9fb13139a39
diff --git a/metadata/md5-cache/app-dicts/sword-GerElb1905-1.6 b/metadata/md5-cache/app-dicts/sword-GerElb1905-1.6
deleted file mode 100644
index abc9b4ccd31d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerElb1905-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=German Darby Unrevidierte Elberfelder (1905)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1905
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerElb1905.zip -> GerElb1905-1.6.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0cf2378ed7bb5811524ba429c1974daf
diff --git a/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5 b/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
deleted file mode 100644
index 6f6c99e89756..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1924 Grünewaldbibel
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerGruenewald
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerGruenewald.zip -> GerGruenewald-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4397a8cc25bc810efc4cdac112a2dd3d
diff --git a/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1 b/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
deleted file mode 100644
index ddcf33b62825..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst
-DESCRIPTION=Hoffnung fuer alle - Die Bibel
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfa2002
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=sword-GerHfa2002
-RDEPEND=>=app-text/sword-1.5.6
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerHfa2002.zip -> GerHfa2002-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6c30bcdbc9862077135354c23ece7d50
diff --git a/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1 b/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
deleted file mode 100644
index 909be1ea95c4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst
-DESCRIPTION=Hoffnung fuer alle - Worterklaerungen
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfaLex2002
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=sword-GerHfa2002
-RDEPEND=>=app-text/sword-1.5.6
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerHfaLex2002.zip -> GerHfaLex2002-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=337454f814ab829d00702e12263cf97d
diff --git a/metadata/md5-cache/app-dicts/sword-GerKingComm-1.0 b/metadata/md5-cache/app-dicts/sword-GerKingComm-1.0
deleted file mode 100644
index e06e5d595e3c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerKingComm-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Kingcomments (German), Kommentar zur ganzen Bibel
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerKingComm
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerKingComm.zip -> GerKingComm-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f4caab75885dd4313269e915b47c12d2
diff --git a/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1 b/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
deleted file mode 100644
index 0d4009a1a943..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Leonberger Bibel, NT (NA28)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoNA28
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-ND-4.0
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLeoNA28.zip -> GerLeoNA28-1.2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=93b446fd51bdfeea0794af065d88bdcf
diff --git a/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2 b/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
deleted file mode 100644
index 6d3cdcaa9e83..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Leonberger Bibel, NT (RP19)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoRP18
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-ND-4.0
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLeoRP18.zip -> GerLeoRP18-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9ccbd96fe0f365b56e84bdbfc4436fc8
diff --git a/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7 b/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
deleted file mode 100644
index bd1284dd52db..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Eine Sammlung von Lutherpredigten
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLutherpredigten
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.4
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLutherpredigten.zip -> GerLutherpredigten-1.7.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a4102f8d0993da7954ac92833cba1fed
diff --git a/metadata/md5-cache/app-dicts/sword-GerMenge-1.1 b/metadata/md5-cache/app-dicts/sword-GerMenge-1.1
deleted file mode 100644
index 8cb11256aed2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerMenge-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Menge-Bibel (1939)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerMenge
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerMenge.zip -> GerMenge-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=54f140162c0f67bfcb087623f29340b2
diff --git a/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7 b/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
deleted file mode 100644
index 78a1421f0984..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Neue evangelistische Übersetzung der Bibel
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerNeUe
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerNeUe.zip -> GerNeUe-2.7.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=96e7b5ce84f75cabcf732027ad9a6a5e
diff --git a/metadata/md5-cache/app-dicts/sword-GerOffBiSt-1.0 b/metadata/md5-cache/app-dicts/sword-GerOffBiSt-1.0
deleted file mode 100644
index a747de00b1a8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerOffBiSt-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Offene Bibel - Studienfassung
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerOffBiSt
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerOffBiSt.zip -> GerOffBiSt-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1958de76b950b6d7bae28188df031ee3
diff --git a/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6 b/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
deleted file mode 100644
index 57fe67cb9b27..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=German Reinhardt Evangelien
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerReinhardt
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerReinhardt.zip -> GerReinhardt-1.6.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ba94aa94c616e68f8b29560641e407bd
diff --git a/metadata/md5-cache/app-dicts/sword-GerSch-1.1.1 b/metadata/md5-cache/app-dicts/sword-GerSch-1.1.1
deleted file mode 100644
index b01bd8d6cdb9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerSch-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=German Schlachter Bibel (1951)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerSch
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerSch.zip -> GerSch-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f76a77edad2ebf66da4aec6a55f18af0
diff --git a/metadata/md5-cache/app-dicts/sword-GerTafel-1.1 b/metadata/md5-cache/app-dicts/sword-GerTafel-1.1
deleted file mode 100644
index fc90445b898d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerTafel-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=German Tafelbibel (1911)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTafel
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerTafel.zip -> GerTafel-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=57b31e3a475c87eb38810a6228a12d59
diff --git a/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1 b/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
deleted file mode 100644
index f4df4ff64c4a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=German Textbibel AT (1906)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTextbibel
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerTextbibel.zip -> GerTextbibel-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a75583a121ddc2d1ecdac52b98dc1db7
diff --git a/metadata/md5-cache/app-dicts/sword-GerZurcher-1.0 b/metadata/md5-cache/app-dicts/sword-GerZurcher-1.0
deleted file mode 100644
index 5b7e98cf2fc1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GerZurcher-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Deutsche Zürcher Bibel von 1931
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerZurcher
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerZurcher.zip -> GerZurcher-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b2743ee3aa9012b7c629375d143d336d
diff --git a/metadata/md5-cache/app-dicts/sword-Godbey-1.0 b/metadata/md5-cache/app-dicts/sword-Godbey-1.0
deleted file mode 100644
index c7fdc80809db..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Godbey-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1902 William Baxter Godbey NT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Godbey
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Godbey.zip -> Godbey-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=22b5b634e7a709521ed75e9b24cff1c4
diff --git a/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1 b/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
deleted file mode 100644
index 9118f48b80cf..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=God'S Word to the Nations
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GodsWord
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GodsWord.zip -> GodsWord-1.3.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=021a7a82f8cbdffcb75b5c584225d44d
diff --git a/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2 b/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
deleted file mode 100644
index 21af76449965..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Neophytos Vamvas's translation of the Holy Bible into modern Greek (1850)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreVamvas
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GreVamvas.zip -> GreVamvas-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=fc50fe965cc1b66f86a7e1e8c3ed88db
diff --git a/metadata/md5-cache/app-dicts/sword-GreekHebrew-1.1 b/metadata/md5-cache/app-dicts/sword-GreekHebrew-1.1
deleted file mode 100644
index 2c7662c8e431..000000000000
--- a/metadata/md5-cache/app-dicts/sword-GreekHebrew-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Greek to Hebrew Dictionary of Septuagint Words
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreekHebrew
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GreekHebrew.zip -> GreekHebrew-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d7784516a315d6dc2b7c7669eec017e7
diff --git a/metadata/md5-cache/app-dicts/sword-Haitian-1.5 b/metadata/md5-cache/app-dicts/sword-Haitian-1.5
deleted file mode 100644
index 4e782bdb0b78..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Haitian-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Haitian Creole Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Haitian
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Haitian.zip -> Haitian-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=416e41ce8401adf5bf7fe26e6e98aadc
diff --git a/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2 b/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
deleted file mode 100644
index b7f1872c4cce..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Hebrew New Testament with Niqqud, based on Delitzsch's translation
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebDelitzsch
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HebDelitzsch.zip -> HebDelitzsch-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=94c909d9bcbd1e082d70ef61ac9ea0a6
diff --git a/metadata/md5-cache/app-dicts/sword-HebModern-1.2 b/metadata/md5-cache/app-dicts/sword-HebModern-1.2
deleted file mode 100644
index 81ed2534a5c9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HebModern-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Modern Hebrew Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HebModern.zip -> HebModern-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=00c6b649f3118feb86c95624cdebc499
diff --git a/metadata/md5-cache/app-dicts/sword-HebrewGreek-1.1 b/metadata/md5-cache/app-dicts/sword-HebrewGreek-1.1
deleted file mode 100644
index 56e33a00c051..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HebrewGreek-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Hebrew to Greek Dictionary of Septuagint Words
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebrewGreek
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HebrewGreek.zip -> HebrewGreek-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=60d6e6a6d0401bf0e2e5e3199dba5f60
diff --git a/metadata/md5-cache/app-dicts/sword-Heretics-1.1 b/metadata/md5-cache/app-dicts/sword-Heretics-1.1
deleted file mode 100644
index 7c0d3484d5f7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Heretics-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Heretics by Gilbert K. Chesterton (1874-1936)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Heretics
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Heretics.zip -> Heretics-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=97bf77e23b652ab9504696c2faac3b35
diff --git a/metadata/md5-cache/app-dicts/sword-HinERV-2.0 b/metadata/md5-cache/app-dicts/sword-HinERV-2.0
deleted file mode 100644
index 592c9c2393dc..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HinERV-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Holy Bible: Easy-to-Read Version (Hindi ERV)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HinERV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HinERV.zip -> HinERV-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e7452d8545af0f1602d2966efb2c922a
diff --git a/metadata/md5-cache/app-dicts/sword-Hitchcock-1.3 b/metadata/md5-cache/app-dicts/sword-Hitchcock-1.3
deleted file mode 100644
index edf7b38182e0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Hitchcock-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Hitchcock's Bible Names
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Hitchcock
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Hitchcock.zip -> Hitchcock-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4170e5e9334940153a6d4142954a967b
diff --git a/metadata/md5-cache/app-dicts/sword-HunIMIT-1.0 b/metadata/md5-cache/app-dicts/sword-HunIMIT-1.0
deleted file mode 100644
index 9cab188ed464..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HunIMIT-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Bible of the Jewish-Hungarian Literature Society (Jewish)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunIMIT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HunIMIT.zip -> HunIMIT-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c9d6c2b3ab88c1d6434954f0a2b20c05
diff --git a/metadata/md5-cache/app-dicts/sword-HunKNB-1.0 b/metadata/md5-cache/app-dicts/sword-HunKNB-1.0
deleted file mode 100644
index 60a712871cbd..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HunKNB-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Káldi-Neovulgáta (Catholic) 2013
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKNB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HunKNB.zip -> HunKNB-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2e81915e5d5850ba44fd482d873cd915
diff --git a/metadata/md5-cache/app-dicts/sword-HunKar-2.0 b/metadata/md5-cache/app-dicts/sword-HunKar-2.0
deleted file mode 100644
index e98ef9ddb481..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HunKar-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Karoli Bible revised version 1908
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKar
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HunKar.zip -> HunKar-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5bef2f2fdb025da4d90458dba711f1c9
diff --git a/metadata/md5-cache/app-dicts/sword-HunRUF-1.0 b/metadata/md5-cache/app-dicts/sword-HunRUF-1.0
deleted file mode 100644
index 113cb5ab7156..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HunRUF-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=A Magyar Bibliatársulat Revideált Újfordítású Bibliája
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunRUF
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HunRUF.zip -> HunRUF-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=65954c656965ae86bd3840384d9b29d2
diff --git a/metadata/md5-cache/app-dicts/sword-HunUj-1.8.1 b/metadata/md5-cache/app-dicts/sword-HunUj-1.8.1
deleted file mode 100644
index 0d5ff25fdbc5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-HunUj-1.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The New Translation Bible of the Hungarian Bible Society
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HunUj.zip -> HunUj-1.8.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=592eb9ecb3a934e0632741a83664ebd2
diff --git a/metadata/md5-cache/app-dicts/sword-ISBE-2.2 b/metadata/md5-cache/app-dicts/sword-ISBE-2.2
deleted file mode 100644
index 6b0b125d1c32..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ISBE-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=International Standard Bible Encyclopedia
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ISBE
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ISBE.zip -> ISBE-2.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ffee2ba2cb10c4b69eaf58157e669763
diff --git a/metadata/md5-cache/app-dicts/sword-ISV-1.5 b/metadata/md5-cache/app-dicts/sword-ISV-1.5
deleted file mode 100644
index 575017ad0907..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ISV-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=International Standard Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ISV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ISV.zip -> ISV-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=22040519d85de3b121f956fe54d4085e
diff --git a/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1 b/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
deleted file mode 100644
index 873e0087778d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Imitation of Christ by Thomas a Kempis
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Imitation
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Imitation.zip -> Imitation-1.7.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2ff999dbc526ef218a352fa6e45c18e8
diff --git a/metadata/md5-cache/app-dicts/sword-Institutes-1.2 b/metadata/md5-cache/app-dicts/sword-Institutes-1.2
deleted file mode 100644
index 246da588670c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Institutes-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Calvin's Institutes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Institutes
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Institutes.zip -> Institutes-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=fec42194c296e6782a07bddc4ae7a738
diff --git a/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0 b/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
deleted file mode 100644
index dd562aa7fa15..000000000000
--- a/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=A modern Irish New Testament (Luke preview)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=IriODomhnuill
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/IriODomhnuill.zip -> IriODomhnuill-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=18a9dd3e8ec19425f75494f50e41d44d
diff --git a/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2 b/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
deleted file mode 100644
index ae60382a4533..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Greek-Italian Dictionary of the New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItDizGreco
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ItDizGreco.zip -> ItDizGreco-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=812155a5478a58a39c9f9bf0a672ee63
diff --git a/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0 b/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
deleted file mode 100644
index 4801faee6eb7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dizionario dei nomi della Bibbia
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItNomiBibbia
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.7.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ItNomiBibbia.zip -> ItNomiBibbia-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e7d1f95929c82ec41af1c6bf81bd2735
diff --git a/metadata/md5-cache/app-dicts/sword-ItaDio-1.1 b/metadata/md5-cache/app-dicts/sword-ItaDio-1.1
deleted file mode 100644
index 581683d2e717..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ItaDio-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Italian Giovanni Diodati Bibbia 1649
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaDio
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ItaDio.zip -> ItaDio-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7cfacd0d3433a5e6a902678f030c2243
diff --git a/metadata/md5-cache/app-dicts/sword-ItaRive-1.1 b/metadata/md5-cache/app-dicts/sword-ItaRive-1.1
deleted file mode 100644
index cc724f28347b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ItaRive-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Italian Riveduta Bibbia (1927)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaRive
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ItaRive.zip -> ItaRive-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9cd3ae6070ed5cc0b637ed269493e965
diff --git a/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0 b/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
deleted file mode 100644
index 82ddc38a7227..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Holiness by J. C. Ryle
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JCRHoliness
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JCRHoliness.zip -> JCRHoliness-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7802a8434d1f3e098d04ff3762f32758
diff --git a/metadata/md5-cache/app-dicts/sword-JEAffections-1.0 b/metadata/md5-cache/app-dicts/sword-JEAffections-1.0
deleted file mode 100644
index dbe87f99d688..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JEAffections-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Religious Affections by Jonathan Edwards
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JEAffections
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JEAffections.zip -> JEAffections-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b9480cfff030daea1de43428d93bed59
diff --git a/metadata/md5-cache/app-dicts/sword-JESermons-1.0 b/metadata/md5-cache/app-dicts/sword-JESermons-1.0
deleted file mode 100644
index 8f55792ac00c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JESermons-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Select Sermons of Jonathan Edwards
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JESermons
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JESermons.zip -> JESermons-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a7dd09ee9832c6a1dbc87159122c01af
diff --git a/metadata/md5-cache/app-dicts/sword-JFB-3.0 b/metadata/md5-cache/app-dicts/sword-JFB-3.0
deleted file mode 100644
index 242057717cbe..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JFB-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Jamieson Fausset Brown Bible Commentary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JFB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JFB.zip -> JFB-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=99dbb2979809209d36abed37deb5709a
diff --git a/metadata/md5-cache/app-dicts/sword-JOChrist-0.5 b/metadata/md5-cache/app-dicts/sword-JOChrist-0.5
deleted file mode 100644
index 31211bcc1a45..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JOChrist-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Christologia by John Owen
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOChrist
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOChrist.zip -> JOChrist-0.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=fd715d750601bd0d8f97ed37c144c102
diff --git a/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1 b/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
deleted file mode 100644
index 43d60cdb42df..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Communion with God the Father, Son and Holy Ghost by John Owen
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOCommGod
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOCommGod.zip -> JOCommGod-0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2fd9256489cf82681f6d01696655d748
diff --git a/metadata/md5-cache/app-dicts/sword-JOGlory-0.5 b/metadata/md5-cache/app-dicts/sword-JOGlory-0.5
deleted file mode 100644
index 13238ecf8b7c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JOGlory-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Glory of Christ by John Owen
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOGlory
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOGlory.zip -> JOGlory-0.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3bf453ed72454f347a1d308c0759e0c7
diff --git a/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0 b/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
deleted file mode 100644
index edeeaa8aa0cd..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Mortification of Sin by John Owen
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOMortSin
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOMortSin.zip -> JOMortSin-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4a286ddabba68d6df45823d332c85932
diff --git a/metadata/md5-cache/app-dicts/sword-JPS-2.1 b/metadata/md5-cache/app-dicts/sword-JPS-2.1
deleted file mode 100644
index b0648d511c4e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JPS-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Jewish Publication Society Old Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JPS
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JPS.zip -> JPS-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8b27c31ad3242e6f1a6aa18f68b95eb8
diff --git a/metadata/md5-cache/app-dicts/sword-JST-1.1 b/metadata/md5-cache/app-dicts/sword-JST-1.1
deleted file mode 100644
index c07b00acd203..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JST-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Joseph Smith Translation
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JST
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JST.zip -> JST-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=137bc734d52141db2d218e2de51241d6
diff --git a/metadata/md5-cache/app-dicts/sword-JapBungo-1.0 b/metadata/md5-cache/app-dicts/sword-JapBungo-1.0
deleted file mode 100644
index a6c1774bc255..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JapBungo-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Classical Japanese Bible (Bungo-yaku/Taisho-kaiyaku), 1950 edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapBungo
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.12
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapBungo.zip -> JapBungo-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=bb9b0b503fe8f074e7bf763b31a93d1a
diff --git a/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1 b/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
deleted file mode 100644
index e8809717e0d4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Japanese Electronic Network Bible (Denmo)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapDenmo
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapDenmo.zip -> JapDenmo-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=af26291b5035fc45a55c05874e10a244
diff --git a/metadata/md5-cache/app-dicts/sword-JapKougo-1.1 b/metadata/md5-cache/app-dicts/sword-JapKougo-1.1
deleted file mode 100644
index e51f3b26eb35..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JapKougo-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Colloquial Japanese Bible (Kougo-yaku), published 1954/1955
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapKougo
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.12
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapKougo.zip -> JapKougo-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b203c25e57bf8efee45fb7a8be49e42b
diff --git a/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0 b/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
deleted file mode 100644
index 0b512a77fdf6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Japanese Bible translation from the Meiji period, version from 1953
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapMeiji
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.12
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapMeiji.zip -> JapMeiji-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f96cb7057cec74e793c2220c4b8c8d84
diff --git a/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0 b/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
deleted file mode 100644
index 9b7030f71d30..000000000000
--- a/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Raguet-yaku - Japanese translation of the Bible by Emile Raguet (1910)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapRaguet
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.12
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapRaguet.zip -> JapRaguet-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=401ebf41e974c8aa1a14dd9d03876196
diff --git a/metadata/md5-cache/app-dicts/sword-Josephus-1.1 b/metadata/md5-cache/app-dicts/sword-Josephus-1.1
deleted file mode 100644
index f476bf6a31ca..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Josephus-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Josephus: The Complete Works
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.3
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Josephus.zip -> Josephus-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f64cf76d81e6aeea2fd5f61e9b83dce9
diff --git a/metadata/md5-cache/app-dicts/sword-Jubilee2000-1.1 b/metadata/md5-cache/app-dicts/sword-Jubilee2000-1.1
deleted file mode 100644
index 82bc21b333b9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Jubilee2000-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=English Jubilee 2000 Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Jubilee2000
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Jubilee2000.zip -> Jubilee2000-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=27a71bce43a7ecd1239e0b9161cf2fab
diff --git a/metadata/md5-cache/app-dicts/sword-KD-1.0 b/metadata/md5-cache/app-dicts/sword-KD-1.0
deleted file mode 100644
index 9d1c6b790202..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KD-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Keil and Delitzsch Biblical Commentary on the Old Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KD
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KD.zip -> KD-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2d3e040fc1123c9272ac2b323a53262b
diff --git a/metadata/md5-cache/app-dicts/sword-KJV-2.10.2 b/metadata/md5-cache/app-dicts/sword-KJV-2.10.2
deleted file mode 100644
index 95cf874bd3a9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KJV-2.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=King James Version (1769) with Strongs Numbers and Morphology
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJV.zip -> KJV-2.10.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=327f735f59d7d882f7a2baa05bbb30d9
diff --git a/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1 b/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
deleted file mode 100644
index 135050a1cf3a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=King James Version (1769) incl. Apocrypha, with Strongs Numbers and Morphology
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVA
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJVA.zip -> KJVA-3.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=37aa52c38a409e1c1e289417f660ab95
diff --git a/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0 b/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
deleted file mode 100644
index 9137858b40a9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=King James Version: Pure Cambridge Edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVPCE
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJVPCE.zip -> KJVPCE-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0d52741edac1fcb00240e4e0f72799f7
diff --git a/metadata/md5-cache/app-dicts/sword-KLV-2.2 b/metadata/md5-cache/app-dicts/sword-KLV-2.2
deleted file mode 100644
index d018745683fa..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KLV-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Klingon Language Version of the World English Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KLV.zip -> KLV-2.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=33b728b7740b4c78d5793623cc065cd5
diff --git a/metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.1 b/metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.1
deleted file mode 100644
index 2211770bc970..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Klingon Language Version English to Klingon mapping lexicon
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLVen_iklingon
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KLVen_iklingon.zip -> KLVen_iklingon-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=197c0f58b15d4c3998c06dacc55027d3
diff --git a/metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.1 b/metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.1
deleted file mode 100644
index 6194708a90f9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Klingon Language Version Klingon to English mapping lexicon
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLViklingon_en
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KLViklingon_en.zip -> KLViklingon_en-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e1f8c677b2638275f0a87761ef85d295
diff --git a/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1 b/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
deleted file mode 100644
index 79d302f048ab..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The New Testament in the Kapingamarangi language
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kapingamarangi
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Kapingamarangi.zip -> Kapingamarangi-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=06e00b7a9dcc06b1eb1f66d11931c92a
diff --git a/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1 b/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
deleted file mode 100644
index 3a9cb238af66..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible translation into Kazakh
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kaz
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Kaz.zip -> Kaz-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d2633b1efe1b299b75f02fb604afdedc
diff --git a/metadata/md5-cache/app-dicts/sword-Kekchi-1.5 b/metadata/md5-cache/app-dicts/sword-Kekchi-1.5
deleted file mode 100644
index 55f49e467ae7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Kekchi-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=K'ekchi' Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Kekchi.zip -> Kekchi-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=256a6d5c8dec9839333a85d4488c58f5
diff --git a/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1 b/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
deleted file mode 100644
index b6c1cd665723..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Khmer Christian Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KhmerNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KhmerNT.zip -> KhmerNT-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2e583f3f76195b590ea0d4c25d2d36b0
diff --git a/metadata/md5-cache/app-dicts/sword-KingComm-1.1 b/metadata/md5-cache/app-dicts/sword-KingComm-1.1
deleted file mode 100644
index b57f20de11d7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KingComm-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Kingcomments, commentary on the whole Bible
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KingComm
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KingComm.zip -> KingComm-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=639bb30959be774db6d224d7e6856c1d
diff --git a/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0 b/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
deleted file mode 100644
index 612e37579529..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Korean Hangul King James Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorHKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KorHKJV.zip -> KorHKJV-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d70418650da62ad39f93098b054e6ce7
diff --git a/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1 b/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
deleted file mode 100644
index 528219a5314c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Korean Revised Version 1952/1961
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorRV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KorRV.zip -> KorRV-2.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e60aebc892d57f41aedcc022175b53c5
diff --git a/metadata/md5-cache/app-dicts/sword-KtuVB-3.2 b/metadata/md5-cache/app-dicts/sword-KtuVB-3.2
deleted file mode 100644
index 04da81050449..000000000000
--- a/metadata/md5-cache/app-dicts/sword-KtuVB-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Masonama ya Santu par le Père Widart et l’équipe de Verbum Bible Kinshasa
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KtuVB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KtuVB.zip -> KtuVB-3.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d7e1983566226f7a9aca5357987de056
diff --git a/metadata/md5-cache/app-dicts/sword-LEB-3.0 b/metadata/md5-cache/app-dicts/sword-LEB-3.0
deleted file mode 100644
index e27564f3ac35..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LEB-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Lexham English Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LEB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LEB.zip -> LEB-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5b89cf32fbf54108060bcf65804c7613
diff --git a/metadata/md5-cache/app-dicts/sword-LITV-1.4 b/metadata/md5-cache/app-dicts/sword-LITV-1.4
deleted file mode 100644
index 14ae8c6550b1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LITV-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Green's Literal Translation
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LITV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LITV.zip -> LITV-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=22d4cb1d103d9528a756ced989e05136
diff --git a/metadata/md5-cache/app-dicts/sword-LO-1.1 b/metadata/md5-cache/app-dicts/sword-LO-1.1
deleted file mode 100644
index 1b1b23127985..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LO-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Living Oracles NT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LO
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LO.zip -> LO-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1c43e3c08b7c9ddf2d432b4c9c5311c6
diff --git a/metadata/md5-cache/app-dicts/sword-LXX-2.5 b/metadata/md5-cache/app-dicts/sword-LXX-2.5
deleted file mode 100644
index 23f0e050b13d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LXX-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Septuagint, Morphologically Tagged Rahlfs'
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LXX
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LXX.zip -> LXX-2.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=42f15a94b857618636c2130af7248cca
diff --git a/metadata/md5-cache/app-dicts/sword-Latvian-1.4 b/metadata/md5-cache/app-dicts/sword-Latvian-1.4
deleted file mode 100644
index c1d03ab51dae..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Latvian-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Latvian New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Latvian.zip -> Latvian-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=daa8d4dcfe7570049a56234d12590cfa
diff --git a/metadata/md5-cache/app-dicts/sword-LawGospel-2.1 b/metadata/md5-cache/app-dicts/sword-LawGospel-2.1
deleted file mode 100644
index dc59bc1a9d7a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LawGospel-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Walther's Law and Gospel
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LawGospel
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.10
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LawGospel.zip -> LawGospel-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c47f2237869666e49c60b67fe393eeaa
diff --git a/metadata/md5-cache/app-dicts/sword-Leeser-1.2 b/metadata/md5-cache/app-dicts/sword-Leeser-1.2
deleted file mode 100644
index 1624cfa8feda..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Leeser-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1853 Leeser Old Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Leeser
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Leeser.zip -> Leeser-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3d0f34f9531fa95b8983f1f8fd48f800
diff --git a/metadata/md5-cache/app-dicts/sword-Lightfoot-1.0 b/metadata/md5-cache/app-dicts/sword-Lightfoot-1.0
deleted file mode 100644
index 4bc66b791268..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Lightfoot-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=John Lightfoot Commentary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Lightfoot
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Lightfoot.zip -> Lightfoot-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=dcf5f1e3a1a18a3db2712acd54102831
diff --git a/metadata/md5-cache/app-dicts/sword-LinVB-1.0.1 b/metadata/md5-cache/app-dicts/sword-LinVB-1.0.1
deleted file mode 100644
index 7e9741f8dc05..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LinVB-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Liloba lya Nzambe, édition Verbum Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LinVB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LinVB.zip -> LinVB-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ffdba45c266ee66b7b1e5ee8857f366d
diff --git a/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2 b/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
deleted file mode 100644
index 957116ca57e8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Lithuanian Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LtKBB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LtKBB.zip -> LtKBB-1.7.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=de363f31634b6afba7f3c21418bcfb43
diff --git a/metadata/md5-cache/app-dicts/sword-Luther-1.1 b/metadata/md5-cache/app-dicts/sword-Luther-1.1
deleted file mode 100644
index f2adc80c1c5e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Luther-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Luther's Commentary on Galatians
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Luther
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Luther.zip -> Luther-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1e4f1e4e61ba442941097c82d45f7f33
diff --git a/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1 b/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
deleted file mode 100644
index 7988521b7cc7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Latvian Glück 8th edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LvGluck8
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LvGluck8.zip -> LvGluck8-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b1fb83ee5cc2357e62ff45911909f72a
diff --git a/metadata/md5-cache/app-dicts/sword-MAK-1.0 b/metadata/md5-cache/app-dicts/sword-MAK-1.0
deleted file mode 100644
index 831e33056ee0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MAK-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Matthias Ansorgs Kommentar
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MAK
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MAK.zip -> MAK-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=89ae220329323c4daadec915f9b0b6a6
diff --git a/metadata/md5-cache/app-dicts/sword-MHC-2.0 b/metadata/md5-cache/app-dicts/sword-MHC-2.0
deleted file mode 100644
index 61e90bfa08a1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MHC-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Matthew Henry's Complete Commentary on the Whole Bible
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MHC
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MHC.zip -> MHC-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=dd88b217b722f51f05481b69c1edc444
diff --git a/metadata/md5-cache/app-dicts/sword-MHCC-2.0 b/metadata/md5-cache/app-dicts/sword-MHCC-2.0
deleted file mode 100644
index cc3dc52e1a16..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MHCC-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Matthew Henry's Concise Commentary on the Whole Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MHCC
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MHCC.zip -> MHCC-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=41454831753ce21bb890e675d36f6576
diff --git a/metadata/md5-cache/app-dicts/sword-MKJV-1.4 b/metadata/md5-cache/app-dicts/sword-MKJV-1.4
deleted file mode 100644
index d3312c70e791..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MKJV-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Green's Modern King James Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MKJV.zip -> MKJV-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e4c2c7731d21ed51f79aceba209ffba1
diff --git a/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1 b/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
deleted file mode 100644
index c53d9d2457bb..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=An Intermediate Greek-English Lexicon Keyed to Strong's Numbers
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MLStrong
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MLStrong.zip -> MLStrong-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=613e2b0559751e6aa2a909a382072771
diff --git a/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1 b/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
deleted file mode 100644
index f6b3498d36a2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Sathyavedapusthakam (Malayalam Bible) published in 1910
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mal1910
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Mal1910.zip -> Mal1910-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0869bacca54bf8e291f5d29a72478145
diff --git a/metadata/md5-cache/app-dicts/sword-ManxGaelic-1.1 b/metadata/md5-cache/app-dicts/sword-ManxGaelic-1.1
deleted file mode 100644
index d74cad6c7fcc..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ManxGaelic-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Manx Gaelic Scripture Portions
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ManxGaelic
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ManxGaelic.zip -> ManxGaelic-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=52182333624f8902e4b283952559125b
diff --git a/metadata/md5-cache/app-dicts/sword-Maori-1.1 b/metadata/md5-cache/app-dicts/sword-Maori-1.1
deleted file mode 100644
index e1fe563ff7d4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Maori-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Maori Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Maori.zip -> Maori-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=227c26b83bcb7a47e24f4055f01b0e64
diff --git a/metadata/md5-cache/app-dicts/sword-MapM-1.0 b/metadata/md5-cache/app-dicts/sword-MapM-1.0
deleted file mode 100644
index 6931b00495a1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MapM-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Miqra according to the Mesorah
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MapM
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MapM.zip -> MapM-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=46e5fde494a6d0b30b212f90d18757f2
diff --git a/metadata/md5-cache/app-dicts/sword-Mg1865-2.0 b/metadata/md5-cache/app-dicts/sword-Mg1865-2.0
deleted file mode 100644
index 4cf7ccc2a8b2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Mg1865-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Baiboly Malagasy (1865)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mg1865
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Mg1865.zip -> Mg1865-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=96106e2466e54f2946ecab479410413a
diff --git a/metadata/md5-cache/app-dicts/sword-MollColossians-1.0 b/metadata/md5-cache/app-dicts/sword-MollColossians-1.0
deleted file mode 100644
index 893d7de6d15d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MollColossians-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Paul's Letter to the Believers at Colosse - A Series of Devotions by Pr R. Moll
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MollColossians
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MollColossians.zip -> MollColossians-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=07b04cda31d6e1358cae8d8f0e718380
diff --git a/metadata/md5-cache/app-dicts/sword-MonKJV-1.4 b/metadata/md5-cache/app-dicts/sword-MonKJV-1.4
deleted file mode 100644
index 0b5847c226c7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MonKJV-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Mongolian King James Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MonKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MonKJV.zip -> MonKJV-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=073e02a1ebca1902a3ed4c50c5064dae
diff --git a/metadata/md5-cache/app-dicts/sword-Montgomery-1.3 b/metadata/md5-cache/app-dicts/sword-Montgomery-1.3
deleted file mode 100644
index 129027642cc7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Montgomery-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Montgomery New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Montgomery
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Montgomery.zip -> Montgomery-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b35f35aacecc5897cb96ccdbe0886e51
diff --git a/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0 b/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
deleted file mode 100644
index fd1db3629469..000000000000
--- a/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Morphologically Parsed Greek New Testament based on the SBLGNT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MorphGNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MorphGNT.zip -> MorphGNT-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a3b7a41a231cfd69b5268839d09eb890
diff --git a/metadata/md5-cache/app-dicts/sword-Murdock-1.2 b/metadata/md5-cache/app-dicts/sword-Murdock-1.2
deleted file mode 100644
index 40fbf7f290f0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Murdock-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=James Murdock's Translation of the Syriac Peshitta
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Murdock
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Murdock.zip -> Murdock-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ffd493fc214527106a776e9b6c30af26
diff --git a/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1 b/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
deleted file mode 100644
index d023e1f1af8e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Free version of New English Translation with limited notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETfree
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NETfree.zip -> NETfree-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3df3645560c68d7d90c3a117584e4939
diff --git a/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1 b/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
deleted file mode 100644
index 9697d226f5f6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Free version of NET Bible Footnotes with limited notes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETnotesfree
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NETnotesfree.zip -> NETnotesfree-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=35a8fff150a64932c45125354be88516
diff --git a/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0 b/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
deleted file mode 100644
index a056fdef6833..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New English Translation text only with footnote markers
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETtext
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NETtext.zip -> NETtext-1.0.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9ea03a5944b0f63da89a6546191bad34
diff --git a/metadata/md5-cache/app-dicts/sword-NHEB-2.1 b/metadata/md5-cache/app-dicts/sword-NHEB-2.1
deleted file mode 100644
index f20c2e97801d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NHEB-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New Heart English Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NHEB.zip -> NHEB-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3219bc708164a66435e0a1eef3ffe35a
diff --git a/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1 b/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
deleted file mode 100644
index 412670dcd65d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New Heart English Bible: Jehovah Edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBJE
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NHEBJE.zip -> NHEBJE-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=92a9800bec048e302d4ed0d03424c1f0
diff --git a/metadata/md5-cache/app-dicts/sword-NHEBME-2.1 b/metadata/md5-cache/app-dicts/sword-NHEBME-2.1
deleted file mode 100644
index e8f93949f977..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NHEBME-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New Heart English Bible: Messianic Edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBME
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NHEBME.zip -> NHEBME-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e847b15068bbc71b5fbf1a479591e7e7
diff --git a/metadata/md5-cache/app-dicts/sword-Nave-3.0 b/metadata/md5-cache/app-dicts/sword-Nave-3.0
deleted file mode 100644
index 4f954b809cb3..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Nave-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Nave's Topical Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nave
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Nave.zip -> Nave-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8c88f8cf6d93a507dedafa1c2143af3f
diff --git a/metadata/md5-cache/app-dicts/sword-Ndebele-1.2 b/metadata/md5-cache/app-dicts/sword-Ndebele-1.2
deleted file mode 100644
index 47c9508539aa..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Ndebele-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Ndebele Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ndebele
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=FDL-1.3+
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Ndebele.zip -> Ndebele-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4a0c7b3e41412d022a7147cd006c4cff
diff --git a/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3 b/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
deleted file mode 100644
index 6f5602eaa4ae..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Nestle GNT 1904
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nestle1904
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Nestle1904.zip -> Nestle1904-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=890ef391a4043388bb7d6c05bade1865
diff --git a/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0 b/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
deleted file mode 100644
index 42010b053985..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Petrus Canisius Translation
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NlCanisius1939
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NlCanisius1939.zip -> NlCanisius1939-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e1f91a7db67979bb5bcc76fb1bc3ad40
diff --git a/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1 b/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
deleted file mode 100644
index 1a12a85a379d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bread Norwegian NT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorBroed
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NorBroed.zip -> NorBroed-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=386bf99a8c697b5b1e39fc845874d80b
diff --git a/metadata/md5-cache/app-dicts/sword-NorSMB-1.0 b/metadata/md5-cache/app-dicts/sword-NorSMB-1.0
deleted file mode 100644
index 6eec8d31b1dd..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NorSMB-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Studentmållagsbibelen, first complete Nynorsk Bible translation (1921)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorSMB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NorSMB.zip -> NorSMB-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=66fa87400e28af2f29730ba25e1e9090
diff --git a/metadata/md5-cache/app-dicts/sword-Norsk-2.0 b/metadata/md5-cache/app-dicts/sword-Norsk-2.0
deleted file mode 100644
index 74bd10dc0fcb..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Norsk-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Den Norske Bibelen
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Norsk
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Norsk.zip -> Norsk-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d092cd4fe9005e577f7eafcab04e8ce0
diff --git a/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1 b/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
deleted file mode 100644
index 3b95e2f6da26..000000000000
--- a/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Northern Azeri Translation
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorthernAzeri
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.10
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NorthernAzeri.zip -> NorthernAzeri-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0fd102bc2910f0830a78575d4b483f96
diff --git a/metadata/md5-cache/app-dicts/sword-Noyes-1.2 b/metadata/md5-cache/app-dicts/sword-Noyes-1.2
deleted file mode 100644
index 97a0e2ce25b1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Noyes-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1869 Noyes Translation
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Noyes
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Noyes.zip -> Noyes-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a5ebcf672be563912c3527d96ff6752c
diff --git a/metadata/md5-cache/app-dicts/sword-OEB-1.1 b/metadata/md5-cache/app-dicts/sword-OEB-1.1
deleted file mode 100644
index ddf79c589ef9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-OEB-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Open English Bible (US Spelling)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC0-1.0
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OEB.zip -> OEB-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e0f1e550a4c11f1f248a2348ac64a4be
diff --git a/metadata/md5-cache/app-dicts/sword-OEBcth-1.1 b/metadata/md5-cache/app-dicts/sword-OEBcth-1.1
deleted file mode 100644
index 8ff1bec225c3..000000000000
--- a/metadata/md5-cache/app-dicts/sword-OEBcth-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Open English Bible (Commonwealth Spelling)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEBcth
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC0-1.0
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OEBcth.zip -> OEBcth-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=46be0b41c5813abad0edc21881849b94
diff --git a/metadata/md5-cache/app-dicts/sword-OSHB-2.1.2 b/metadata/md5-cache/app-dicts/sword-OSHB-2.1.2
deleted file mode 100644
index ea4dccf48db9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-OSHB-2.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Open Scriptures Hebrew Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-4.0
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OSHB.zip -> OSHB-2.1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d6fe1c551a425bc4c0fd6c9fbd6ccc4d
diff --git a/metadata/md5-cache/app-dicts/sword-OSHM-2.1 b/metadata/md5-cache/app-dicts/sword-OSHM-2.1
deleted file mode 100644
index eaa05bc38aa0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-OSHM-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Open Scriptures Hebrew Morphology Key
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHM
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-4.0
-RDEPEND=>=app-text/sword-1.7.4
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OSHM.zip -> OSHM-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f0cf1f97d8348138efb1cc4f321fc828
diff --git a/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1 b/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
deleted file mode 100644
index 1830c9752919..000000000000
--- a/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Orthodox Jewish Brit Chadasha
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OrthJBC
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OrthJBC.zip -> OrthJBC-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=68c65553d2902e220c948f191c2e82bd
diff --git a/metadata/md5-cache/app-dicts/sword-Orthodoxy-1.0 b/metadata/md5-cache/app-dicts/sword-Orthodoxy-1.0
deleted file mode 100644
index bdfc70f56c39..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Orthodoxy-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Orthodoxy by Gilbert K. Chesterton (1874-1936)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Orthodoxy
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Orthodoxy.zip -> Orthodoxy-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=feab0ec91c64fa4470dc11c00a54f105
diff --git a/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0 b/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
deleted file mode 100644
index 0cfe8be7b8d7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1873 Oxford Textus Receptus Gospel of John
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OxfordTR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OxfordTR.zip -> OxfordTR-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4388e34398b671f63d58c93dd03b87a8
diff --git a/metadata/md5-cache/app-dicts/sword-PNT-1.1 b/metadata/md5-cache/app-dicts/sword-PNT-1.1
deleted file mode 100644
index d5f80263ab51..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PNT-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The People's New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PNT.zip -> PNT-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=69e013b909659874cc06bce8dd2b6bb7
diff --git a/metadata/md5-cache/app-dicts/sword-Packard-1.2 b/metadata/md5-cache/app-dicts/sword-Packard-1.2
deleted file mode 100644
index c1e0dafa7aaa..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Packard-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Packard's Morphological Analysis Codes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Packard
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Packard.zip -> Packard-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f030212cb8e63d75d159f77ee2052d14
diff --git a/metadata/md5-cache/app-dicts/sword-Passion-1.0 b/metadata/md5-cache/app-dicts/sword-Passion-1.0
deleted file mode 100644
index 4388256ffcf6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Passion-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dolorous Passion of Our Lord Jesus Christ
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Passion
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Passion.zip -> Passion-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1bdd48536c6d47d2b4cb429453a96b48
diff --git a/metadata/md5-cache/app-dicts/sword-Personal-1.0 b/metadata/md5-cache/app-dicts/sword-Personal-1.0
deleted file mode 100644
index 190b1b8a6904..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Personal-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Personal Commentary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Personal.zip -> Personal-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=03a21f588ea87aebaf1ba8d3a8eeedfd
diff --git a/metadata/md5-cache/app-dicts/sword-Peshitta-2.0 b/metadata/md5-cache/app-dicts/sword-Peshitta-2.0
deleted file mode 100644
index 8c04067a08b8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Peshitta-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Syriac Peshitta
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Peshitta
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Peshitta.zip -> Peshitta-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1250a9eeb9507498c42e67464f7f9466
diff --git a/metadata/md5-cache/app-dicts/sword-Phaistos-1.0 b/metadata/md5-cache/app-dicts/sword-Phaistos-1.0
deleted file mode 100644
index 7fc9051a6159..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Phaistos-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Phaistos Disk
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Phaistos
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Phaistos.zip -> Phaistos-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a33295ebd6a022a8125e3c6384d2bdbe
diff --git a/metadata/md5-cache/app-dicts/sword-Pilgrim-1.0 b/metadata/md5-cache/app-dicts/sword-Pilgrim-1.0
deleted file mode 100644
index 53e1655586b2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Pilgrim-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Pilgrim's Progress by John Bunyan (1628-1688)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pilgrim
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Pilgrim.zip -> Pilgrim-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ff1e3bfcdb4390f29b97047e305e0471
diff --git a/metadata/md5-cache/app-dicts/sword-PohnOld-1.01 b/metadata/md5-cache/app-dicts/sword-PohnOld-1.01
deleted file mode 100644
index 613dd07c8fd1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PohnOld-1.01
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Old Public Domain Pohnpeian Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PohnOld
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PohnOld.zip -> PohnOld-1.01.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9c2e04c16999e53de8be73773594885a
diff --git a/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1 b/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
deleted file mode 100644
index 62e91e5d4d0e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible in Pohnpeian language
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pohnpeian
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Pohnpeian.zip -> Pohnpeian-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=77a4ffbc97069d26f8ec6615388e23a9
diff --git a/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0 b/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
deleted file mode 100644
index f492a829efc4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Polish Biblia Gdanska (1881)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolGdanska
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PolGdanska.zip -> PolGdanska-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8cc3e38f3cf1f3542ca07f8459432d85
diff --git a/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1 b/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
deleted file mode 100644
index 52f65ecde1c6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Updated Polish Gdansk Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolUGdanska
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PolUGdanska.zip -> PolUGdanska-2.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c39e2e87dee0430485ced7b42a27d9c8
diff --git a/metadata/md5-cache/app-dicts/sword-PorAR-1.3 b/metadata/md5-cache/app-dicts/sword-PorAR-1.3
deleted file mode 100644
index e260f5cb6497..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PorAR-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bíblia Almeida Recebida (AR)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-ND-4.0
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorAR.zip -> PorAR-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=68b2c152f4bfeb5744d6cb0911633ff8
diff --git a/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2 b/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
deleted file mode 100644
index feae26dd1483..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=De 1911 Biblia Sagrada Traduzida em Portuguez Por João Ferreeira D'Almeida
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAlmeida1911
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorAlmeida1911.zip -> PorAlmeida1911-0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ca2325ce138207d869dc150c5cc76e1d
diff --git a/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1 b/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
deleted file mode 100644
index 0d798fc76ba3..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bíblia Livre
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivre
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-3.0
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorBLivre.zip -> PorBLivre-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6fc701bc4d9789229d170c214990282d
diff --git a/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1 b/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
deleted file mode 100644
index 18f3ee075a44..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bíblia Livre - Textus Receptus
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivreTR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-3.0
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorBLivreTR.zip -> PorBLivreTR-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8671193b1ffb6a57277b601a00df1b6b
diff --git a/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1 b/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
deleted file mode 100644
index bd4babe8f50f..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bíblia Sagrada (Capuchinhos)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorCap
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire free-noncomm
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorCap.zip -> PorCap-2.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2780f274f0dfc1a566e45a6a610e8168
diff --git a/metadata/md5-cache/app-dicts/sword-PorIBP-1.0 b/metadata/md5-cache/app-dicts/sword-PorIBP-1.0
deleted file mode 100644
index 6ce1f243a453..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PorIBP-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Índice Bíblico-Pastoral da Bíblia dos Capuchinhos
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorIBP
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorIBP.zip -> PorIBP-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=81e835fd31ffcaa60192f114c3f605ca
diff --git a/metadata/md5-cache/app-dicts/sword-PotLykins-1.0 b/metadata/md5-cache/app-dicts/sword-PotLykins-1.0
deleted file mode 100644
index 9580907badda..000000000000
--- a/metadata/md5-cache/app-dicts/sword-PotLykins-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1833 Potawatomi Matthew and Acts
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PotLykins
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PotLykins.zip -> PotLykins-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1b53b1511d916e5282311a4a384fcca3
diff --git a/metadata/md5-cache/app-dicts/sword-Practice-1.0 b/metadata/md5-cache/app-dicts/sword-Practice-1.0
deleted file mode 100644
index 66200be0a7d2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Practice-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Practice of the Presence of God: The Best Rule of Holy Life
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Practice
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Practice.zip -> Practice-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=10e12b86f753d6eb2184c2bd10e4c8e1
diff --git a/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2 b/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
deleted file mode 100644
index cb2dc3cb7ee7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Scripture Passages Quoting Scripture
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=QuotingPassages
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/QuotingPassages.zip -> QuotingPassages-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=bfcee019108c9a03028c66475eeddd5f
diff --git a/metadata/md5-cache/app-dicts/sword-RKJNT-1.0 b/metadata/md5-cache/app-dicts/sword-RKJNT-1.0
deleted file mode 100644
index ed8576552a7e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RKJNT-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Revised King James New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RKJNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RKJNT.zip -> RKJNT-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=11d93f0f8e6488620be7a4b4b4861cde
diff --git a/metadata/md5-cache/app-dicts/sword-RNKJV-1.5 b/metadata/md5-cache/app-dicts/sword-RNKJV-1.5
deleted file mode 100644
index a6beec241bb1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RNKJV-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Restored Name King James Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RNKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RNKJV.zip -> RNKJV-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d045c8fadab029dfb630c0e08ca55bca
diff --git a/metadata/md5-cache/app-dicts/sword-RWP-2.0 b/metadata/md5-cache/app-dicts/sword-RWP-2.0
deleted file mode 100644
index b34d12ebaf8f..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RWP-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Robertson's Word Pictures
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RWP
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RWP.zip -> RWP-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a7631ebe39f4d9e725a0568059df88c3
diff --git a/metadata/md5-cache/app-dicts/sword-RWebster-1.3 b/metadata/md5-cache/app-dicts/sword-RWebster-1.3
deleted file mode 100644
index 9d48b2e1b945..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RWebster-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Revised Webster Version (1833)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RWebster
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RWebster.zip -> RWebster-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=02d2d2d145c215affd67d298aa579d2e
diff --git a/metadata/md5-cache/app-dicts/sword-RecVer-1.0 b/metadata/md5-cache/app-dicts/sword-RecVer-1.0
deleted file mode 100644
index 4050e0b35ae7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RecVer-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Text Only Recovery Version (no outlines)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RecVer
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RecVer.zip -> RecVer-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e1f29eacd9e4fba8788308bae0c49747
diff --git a/metadata/md5-cache/app-dicts/sword-Rieger-1.0 b/metadata/md5-cache/app-dicts/sword-Rieger-1.0
deleted file mode 100644
index 98145a86d421..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Rieger-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Carl Heinrich Riegers Kommentar
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rieger
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Rieger.zip -> Rieger-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=abca2dfa8b81c0b1b526042ff3537c60
diff --git a/metadata/md5-cache/app-dicts/sword-Robinson-2.1 b/metadata/md5-cache/app-dicts/sword-Robinson-2.1
deleted file mode 100644
index 1a15f1342987..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Robinson-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Robinson's Morphological Analysis Codes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Robinson
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Robinson.zip -> Robinson-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=babbf3e4117d9d345c7c1e0aba5b3875
diff --git a/metadata/md5-cache/app-dicts/sword-RomCor-2.1 b/metadata/md5-cache/app-dicts/sword-RomCor-2.1
deleted file mode 100644
index d4a852905b2d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RomCor-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Cornilescu Bible in Romanian language
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RomCor.zip -> RomCor-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=486271798ab4d509e1971c6594aa834e
diff --git a/metadata/md5-cache/app-dicts/sword-Rotherham-1.7 b/metadata/md5-cache/app-dicts/sword-Rotherham-1.7
deleted file mode 100644
index 3acb09ed2693..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Rotherham-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Emphasized Bible by J. B. Rotherham
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rotherham
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Rotherham.zip -> Rotherham-1.7.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=491db96c1a9c00f9f2d606250f501c80
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1 b/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
deleted file mode 100644
index c0db62a3f9a7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Смысловой перевод Таурата, Книги Пророков, Забура и Инджила
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARS
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARS.zip -> RusCARS-4.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ecff064fbdb46f3a0f9dee66eb2f94ca
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
deleted file mode 100644
index d7400fbc53e6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Смысловой перевод Таурата, Книги Пророков, Забура и Инджила
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSA
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSA.zip -> RusCARSA-4.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f2368a5d295e5b15a507ade62fe72279
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
deleted file mode 100644
index 14f2b9162bb9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARSA
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSADICT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSADICT.zip -> RusCARSADICT-4.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2bf70301b51ce980681d954614262285
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0 b/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
deleted file mode 100644
index 67f32f01d8c6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARS
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSDict
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSDict.zip -> RusCARSDict-4.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8d840edbb7645024ccdc7cf77393c25e
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARST-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARST-4.1
deleted file mode 100644
index 2660629dbf79..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusCARST-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Смысловой перевод Таврота, Книги Пророков, Забура и Инджила
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARST
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARST.zip -> RusCARST-4.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9eda189e0a26f3d17701e70079d76b33
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
deleted file mode 100644
index 820f5c95808d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARST
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSTDICT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSTDICT.zip -> RusCARSTDICT-4.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4d39dc4d7400f5cc563bd43e276f2854
diff --git a/metadata/md5-cache/app-dicts/sword-RusMakarij-2.0 b/metadata/md5-cache/app-dicts/sword-RusMakarij-2.0
deleted file mode 100644
index 9d1bb86821d5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusMakarij-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Pentateuch of Moses in Russian
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusMakarij
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusMakarij.zip -> RusMakarij-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ce44e469e68a212cb32dbff483764504
diff --git a/metadata/md5-cache/app-dicts/sword-RusSynodal-1.9 b/metadata/md5-cache/app-dicts/sword-RusSynodal-1.9
deleted file mode 100644
index 46f5e48a7547..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusSynodal-1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1876 Russian Synodal Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodal
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusSynodal.zip -> RusSynodal-1.9.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b1920b29ae196f8479c629fc5df053d3
diff --git a/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2 b/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
deleted file mode 100644
index 8ccfa783204f..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Russian Synodal Bible, Licht im Osten Edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodalLIO
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusSynodalLIO.zip -> RusSynodalLIO-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=797358cb5d8c092153ccafbe5f814d1f
diff --git a/metadata/md5-cache/app-dicts/sword-RusVZh-1.0 b/metadata/md5-cache/app-dicts/sword-RusVZh-1.0
deleted file mode 100644
index c996ef14ba58..000000000000
--- a/metadata/md5-cache/app-dicts/sword-RusVZh-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Russian New Testament with Strong's Numbers under edition of Victor R. Zhuromsky
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusVZh
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.3
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusVZh.zip -> RusVZh-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=84571d90132e66b23d051aa25843814e
diff --git a/metadata/md5-cache/app-dicts/sword-SAOA-1.0 b/metadata/md5-cache/app-dicts/sword-SAOA-1.0
deleted file mode 100644
index c7f8d2ed7810..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SAOA-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Scripture Alphabet Of Animals
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SAOA
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SAOA.zip -> SAOA-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8eb0d552cf071023d43ae87b4e076cbb
diff --git a/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1 b/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
deleted file mode 100644
index 05300b310629..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Greek New Testament: SBL Edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SBLGNT.zip -> SBLGNT-1.3.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=cf92a983465020faf2c333d89a13788a
diff --git a/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3 b/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
deleted file mode 100644
index 63b13bf525c2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Greek New Testament: SBL Edition, Apparatus
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNTApp
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SBLGNTApp.zip -> SBLGNTApp-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=948de4a6cd69f9c1805b565442ec0520
diff --git a/metadata/md5-cache/app-dicts/sword-SME-1.7 b/metadata/md5-cache/app-dicts/sword-SME-1.7
deleted file mode 100644
index 8d152050f6de..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SME-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=C. H. Spurgeon's Morning and Evening: Daily Readins
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SME
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SME.zip -> SME-1.7.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d51bd84dd848931443524b98ed94d12e
diff --git a/metadata/md5-cache/app-dicts/sword-SP-1.0 b/metadata/md5-cache/app-dicts/sword-SP-1.0
deleted file mode 100644
index 47cb538f7aff..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SP-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Samaritan Pentateuch
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SP
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.6.3
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SP.zip -> SP-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ff754294cb621a90db1175a72568ee81
diff --git a/metadata/md5-cache/app-dicts/sword-SPDSS-1.0 b/metadata/md5-cache/app-dicts/sword-SPDSS-1.0
deleted file mode 100644
index a3ba10bf0d2c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SPDSS-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Dead Sea Scrolls variants parallel to the Samaritan Pentateuch
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPDSS
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.6.3
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPDSS.zip -> SPDSS-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=150cf08aeac87ebff01b38656eb9dfe6
diff --git a/metadata/md5-cache/app-dicts/sword-SPE-1.0 b/metadata/md5-cache/app-dicts/sword-SPE-1.0
deleted file mode 100644
index f53b572b05c6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SPE-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Samaritan Pentateuch in English
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPE
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPE.zip -> SPE-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=df19070af60a2d8289a3364d7491b30f
diff --git a/metadata/md5-cache/app-dicts/sword-SPMT-1.0 b/metadata/md5-cache/app-dicts/sword-SPMT-1.0
deleted file mode 100644
index 12f07f283767..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SPMT-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Masoretic Text parallel to the Samaritan Pentateuch
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPMT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.6.3
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPMT.zip -> SPMT-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a40b962fbc8254a8eadc6c62dca1efc0
diff --git a/metadata/md5-cache/app-dicts/sword-SPVar-1.0 b/metadata/md5-cache/app-dicts/sword-SPVar-1.0
deleted file mode 100644
index cefb038ddfe1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SPVar-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Samaritan Pentateuch with variant readings
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPVar
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPVar.zip -> SPVar-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7d05fad2e78ae7579f5d4374bd108c40
diff --git a/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1 b/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
deleted file mode 100644
index 87f9436a1d21..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Sahidic Bible - Askeland / Schulz
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SahidicBible
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SahidicBible.zip -> SahidicBible-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=cb94692c5cc18f2f1f5e31a94433700e
diff --git a/metadata/md5-cache/app-dicts/sword-Scofield-1.0 b/metadata/md5-cache/app-dicts/sword-Scofield-1.0
deleted file mode 100644
index 4b6e7dac91f1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Scofield-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Scofield Reference Notes, 1917 Edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Scofield.zip -> Scofield-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=21f8fc95e9db1f0dd711070c23343f8b
diff --git a/metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.2 b/metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.2
deleted file mode 100644
index 83c61ba094b1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Scots Gaelic Gospel of Mark
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ScotsGaelic
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ScotsGaelic.zip -> ScotsGaelic-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=13fccdf6ad328f179ad8dd4b946fb679
diff --git a/metadata/md5-cache/app-dicts/sword-Sentiment-1.0 b/metadata/md5-cache/app-dicts/sword-Sentiment-1.0
deleted file mode 100644
index 61439a028da7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Sentiment-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Sentiment Analysis of the Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sentiment
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-4.0
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Sentiment.zip -> Sentiment-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=53a1d5afe6aeef49520a412f1430995d
diff --git a/metadata/md5-cache/app-dicts/sword-Shona-2.1 b/metadata/md5-cache/app-dicts/sword-Shona-2.1
deleted file mode 100644
index ea337f533d8e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Shona-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Shona Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Shona
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=FDL-1.3+
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Shona.zip -> Shona-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3b98c194c3befe46e75e874712bdb02e
diff --git a/metadata/md5-cache/app-dicts/sword-SloKJV-17.0 b/metadata/md5-cache/app-dicts/sword-SloKJV-17.0
deleted file mode 100644
index 9505a34fd59b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SloKJV-17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Slovenian translation of Holy Bible King James Version (1769)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-ND-4.0
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloKJV.zip -> SloKJV-17.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5d3ec612341eaa6e30ca9682f8524349
diff --git a/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0 b/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
deleted file mode 100644
index fb87733c769b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Ojačano Sveto pismo (Ps + Gal)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloOjacano
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloOjacano.zip -> SloOjacano-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f9d0ceeea571e5b310dd2e9d89bd092e
diff --git a/metadata/md5-cache/app-dicts/sword-SloStritar-1.1 b/metadata/md5-cache/app-dicts/sword-SloStritar-1.1
deleted file mode 100644
index 6cc960b27f6c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SloStritar-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Novi testament in Psalmi Davidovi Josipa Stritarja (1882)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloStritar
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloStritar.zip -> SloStritar-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e00d34283cdf6f66cb03e2abc47d94cd
diff --git a/metadata/md5-cache/app-dicts/sword-Smith-1.3 b/metadata/md5-cache/app-dicts/sword-Smith-1.3
deleted file mode 100644
index f8ba2afb504a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Smith-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Smith's Bible Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Smith
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Smith.zip -> Smith-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=bcd113670ddca72ad59ce3269298e28e
diff --git a/metadata/md5-cache/app-dicts/sword-SomKQA-2.0 b/metadata/md5-cache/app-dicts/sword-SomKQA-2.0
deleted file mode 100644
index 085c5b8f182d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SomKQA-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Kitaabka Quduuska Ah (Somali Bible)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SomKQA
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SomKQA.zip -> SomKQA-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=253e250d63c6531c2fb0f032dfa41dd1
diff --git a/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1 b/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
deleted file mode 100644
index 14ac324bec2e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bible in Sorani Kurdish language
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sorani
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Sorani.zip -> Sorani-2.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1b10c0aefc26235131e2d7bd3229c262
diff --git a/metadata/md5-cache/app-dicts/sword-SpaPlatense-1.0 b/metadata/md5-cache/app-dicts/sword-SpaPlatense-1.0
deleted file mode 100644
index c8c4ab993487..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SpaPlatense-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Platense Bible (Straubinger)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaPlatense
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaPlatense.zip -> SpaPlatense-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c89541876c7836b9cef057cec4deb781
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV-2.0 b/metadata/md5-cache/app-dicts/sword-SpaRV-2.0
deleted file mode 100644
index 6768cea22c1a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SpaRV-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=La Santa Biblia Reina-Valera (1909)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaRV.zip -> SpaRV-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=60d709a66665657f2aa50f5eb0d2e5f0
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1 b/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
deleted file mode 100644
index 3de6ef4c04ab..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Spanish Reina-Valera Bible (1865) with updated orthography
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1865
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaRV1865.zip -> SpaRV1865-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5432f6a346ccbfc1f6d7c75cfb46b8bf
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1 b/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
deleted file mode 100644
index eca474eb4916..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Spanish Reina-Valera 1909 with Strong's numbers
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1909
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaRV1909.zip -> SpaRV1909-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9f6c8424fa1ddc43d95e14761fd057ff
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRVG-1.3 b/metadata/md5-cache/app-dicts/sword-SpaRVG-1.3
deleted file mode 100644
index e675823f85ad..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SpaRVG-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Spanish Reina Valera Gomez Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRVG
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-ND-3.0
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaRVG.zip -> SpaRVG-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=b08ae56f34b2ebddbc5ef2cb2f6157f7
diff --git a/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0 b/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
deleted file mode 100644
index e81d8554805d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Spanish Traducción de dominio público (Mateo a Romanos)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaTDP
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaTDP.zip -> SpaTDP-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9f20ae54a700b0baaa7a95658ca19421
diff --git a/metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.1 b/metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.1
deleted file mode 100644
index 8d5185ad7bd9..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Spanish 1858 Reina Valera New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaVNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaVNT.zip -> SpaVNT-1.2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=9537de357994cd50ccc2ba60cae41515
diff --git a/metadata/md5-cache/app-dicts/sword-Spurious-1.0 b/metadata/md5-cache/app-dicts/sword-Spurious-1.0
deleted file mode 100644
index 20b3852df85d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Spurious-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Tischendorf's Spurious Passages of the GNT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Spurious
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Spurious.zip -> Spurious-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a3256b4dd625edbe153246a60a90ae02
diff --git a/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0 b/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
deleted file mode 100644
index 08df1e678fd6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Serbian Bible Daničić-Karadžić Ekavski, NRSV versification
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDEkavski
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SrKDEkavski.zip -> SrKDEkavski-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7b641b911609c3e4380f664b92ffb3ce
diff --git a/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0 b/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
deleted file mode 100644
index 7fd08a39d323..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Serbian Bible Daničić-Karadžić Ijekavski, Calvin versification
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDIjekav
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.8.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SrKDIjekav.zip -> SrKDIjekav-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=baa49112c4771f599c37027d5a03d9ac
diff --git a/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2 b/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
deleted file mode 100644
index 83799f7bc88a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Strong's Greek Bible Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/StrongsGreek.zip -> StrongsGreek-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=cf16bf2089dc0109df2fcb575e7466f3
diff --git a/metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.2 b/metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.2
deleted file mode 100644
index 94fdff8b2197..000000000000
--- a/metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Strong's Hebrew Bible Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsHebrew
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/StrongsHebrew.zip -> StrongsHebrew-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0dc97524bcb25671c5fae6daccbc7dd8
diff --git a/metadata/md5-cache/app-dicts/sword-Swahili-1.1 b/metadata/md5-cache/app-dicts/sword-Swahili-1.1
deleted file mode 100644
index bb6dbcd4e15d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Swahili-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Swahili New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swahili
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Swahili.zip -> Swahili-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=5206cdd8380345ed6338f32a685e1bf5
diff --git a/metadata/md5-cache/app-dicts/sword-Swe1917-2.0 b/metadata/md5-cache/app-dicts/sword-Swe1917-2.0
deleted file mode 100644
index 3f7b11ee6c18..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Swe1917-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Swedish Bible (1917)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Swe1917.zip -> Swe1917-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=57eb75567a9acfa6bf1e492912edce18
diff --git a/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1 b/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
deleted file mode 100644
index ac7fa65f4f5e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Ordförklaringar och sakupplysningar från 1917 års översättning av bibeln
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917Of
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Swe1917Of.zip -> Swe1917Of-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3aa9a51491e71cd77bfdbcfa54b2bb59
diff --git a/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2 b/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
deleted file mode 100644
index d44aa5ab811b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Svenska Folkbibeln (1998)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweFolk1998
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SweFolk1998.zip -> SweFolk1998-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1c0bb7fed358abad7a7edfc27f70ed34
diff --git a/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0 b/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
deleted file mode 100644
index 4b7690b8658e..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Svenska Karl XII:s Bibel (1703)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SweKarlXII.zip -> SweKarlXII-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3e1c942bcffb5695d175a8044602cc7a
diff --git a/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0 b/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
deleted file mode 100644
index 97211495276b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Svenska Karl XII:s Bibel (1873)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII1873
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SweKarlXII1873.zip -> SweKarlXII1873-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=409bbd26430be110fd1844fe083e14ab
diff --git a/metadata/md5-cache/app-dicts/sword-TCR-1.1 b/metadata/md5-cache/app-dicts/sword-TCR-1.1
deleted file mode 100644
index cca144571f54..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TCR-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Thompson Chain Topics
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TCR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TCR.zip -> TCR-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4ee00d2caf2c45a57ef9d3481f06ebea
diff --git a/metadata/md5-cache/app-dicts/sword-TDavid-2.0 b/metadata/md5-cache/app-dicts/sword-TDavid-2.0
deleted file mode 100644
index f7f4883e69c1..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TDavid-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=C. H. Spurgeon's Treasury of David
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TDavid
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TDavid.zip -> TDavid-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6d360e88ee661140f59912b3d0e050bc
diff --git a/metadata/md5-cache/app-dicts/sword-TFG-1.5 b/metadata/md5-cache/app-dicts/sword-TFG-1.5
deleted file mode 100644
index ee503a52a543..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TFG-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Fourfold Gospel and Commentary on Acts of Apostles
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TFG
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TFG.zip -> TFG-1.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=475ff18cc311b951eae9789b9ebde4af
diff --git a/metadata/md5-cache/app-dicts/sword-TNT-2.0 b/metadata/md5-cache/app-dicts/sword-TNT-2.0
deleted file mode 100644
index 6806c7a2f4e4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TNT-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Tregelles' Greek New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TNT.zip -> TNT-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e852b96e9c5e51b33a0ff197a1ba9590
diff --git a/metadata/md5-cache/app-dicts/sword-TR-3.0 b/metadata/md5-cache/app-dicts/sword-TR-3.0
deleted file mode 100644
index 7a3395d3c12c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TR-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Textus Receptus (1550/1894)
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TR
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TR.zip -> TR-3.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a2b289cf28b210bffeece820ed4cdd77
diff --git a/metadata/md5-cache/app-dicts/sword-TSK-1.4 b/metadata/md5-cache/app-dicts/sword-TSK-1.4
deleted file mode 100644
index e54b490ff31d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TSK-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Treasury of Scripture Knowledge
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TSK
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TSK.zip -> TSK-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=bc4d68a20f06d96b58c298de8a7621b3
diff --git a/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2 b/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
deleted file mode 100644
index 52a144cf8c0a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION='Ang Biblia' in Tagalog by Philippine Bible Society, 1905
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TagAngBiblia
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TagAngBiblia.zip -> TagAngBiblia-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6516f1cdba58e9471fe729c0c7dfa220
diff --git a/metadata/md5-cache/app-dicts/sword-Tagalog-1.1 b/metadata/md5-cache/app-dicts/sword-Tagalog-1.1
deleted file mode 100644
index f4c678157249..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Tagalog-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Tagalog (John & James)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tagalog
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Tagalog.zip -> Tagalog-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ed02edf4ae8c4bc0942c5b778c52b0da
diff --git a/metadata/md5-cache/app-dicts/sword-Tausug-1.1 b/metadata/md5-cache/app-dicts/sword-Tausug-1.1
deleted file mode 100644
index 647cb2780e2b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Tausug-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Tausug Kitab Injil
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tausug
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-ND-3.0
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Tausug.zip -> Tausug-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c2822e437bbcc83f3d0ea3964adb9c82
diff --git a/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0 b/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
deleted file mode 100644
index 17c75918652d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Thai King James Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ThaiKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ThaiKJV.zip -> ThaiKJV-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=da7c3395305b3ba27a638f5992739e86
diff --git a/metadata/md5-cache/app-dicts/sword-Tisch-2.5 b/metadata/md5-cache/app-dicts/sword-Tisch-2.5
deleted file mode 100644
index 5062c83eb8d4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Tisch-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Tischendorf's 8th edition GNT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tisch
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Tisch.zip -> Tisch-2.5.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=17250c0d1d123f50d56d27061780c2b5
diff --git a/metadata/md5-cache/app-dicts/sword-Torrey-1.3 b/metadata/md5-cache/app-dicts/sword-Torrey-1.3
deleted file mode 100644
index 8a5e843b632b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Torrey-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=R. A. Torrey's New Topical Textbook
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Torrey
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Torrey.zip -> Torrey-1.3.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=67a58cd3f843695ef3ed1b8a1cb715c8
diff --git a/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1 b/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
deleted file mode 100644
index 45e327425dfe..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Turkish Easy-to-Read Translation (HADI)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurHADI
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TurHADI.zip -> TurHADI-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=eb7a49fb8572cefdefa55547b8c74d59
diff --git a/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1 b/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
deleted file mode 100644
index b946f1b1a664..000000000000
--- a/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Kutsal Kitap (New Turkish Bible)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurNTB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TurNTB.zip -> TurNTB-2.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=df127ddb3cda353a5e0dadb22aad4a84
diff --git a/metadata/md5-cache/app-dicts/sword-Twenty-1.1 b/metadata/md5-cache/app-dicts/sword-Twenty-1.1
deleted file mode 100644
index 806633ad4b0a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Twenty-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Twentieth Century New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Twenty
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Twenty.zip -> Twenty-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=474c4b1e70cd2d981e1f9f7bf94b023d
diff --git a/metadata/md5-cache/app-dicts/sword-Tyndale-1.0 b/metadata/md5-cache/app-dicts/sword-Tyndale-1.0
deleted file mode 100644
index 61e813a2c507..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Tyndale-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=William Tyndale Bible (1525/1530)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tyndale
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Tyndale.zip -> Tyndale-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1d69e6f3b57eebd5fb8978768caf8ea7
diff --git a/metadata/md5-cache/app-dicts/sword-UKJV-1.1.1 b/metadata/md5-cache/app-dicts/sword-UKJV-1.1.1
deleted file mode 100644
index 661a1dbfa1e2..000000000000
--- a/metadata/md5-cache/app-dicts/sword-UKJV-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Updated King James Version
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UKJV
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.6
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UKJV.zip -> UKJV-1.1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=28f1fda7798d86874d1db81f84f2acd1
diff --git a/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1 b/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
deleted file mode 100644
index e5c60e6f0279..000000000000
--- a/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Ukrainian New Testament translated by P. Kulish (1871)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UkrKulish
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UkrKulish.zip -> UkrKulish-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f098f5323667aa3e830874afb2d6e078
diff --git a/metadata/md5-cache/app-dicts/sword-Ukrainian-1.4 b/metadata/md5-cache/app-dicts/sword-Ukrainian-1.4
deleted file mode 100644
index 6541fd8446df..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Ukrainian-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Ivan Ogienko Ukrainian Bible, 1930
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ukrainian
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Ukrainian.zip -> Ukrainian-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=964870c0fafd6e328248e3c6305008cb
diff --git a/metadata/md5-cache/app-dicts/sword-Uma-1.2 b/metadata/md5-cache/app-dicts/sword-Uma-1.2
deleted file mode 100644
index a079846d253d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Uma-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Uma New Testament
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Uma
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Uma.zip -> Uma-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2ed6da08469abfad52d4e0aa8618b368
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeo-1.10 b/metadata/md5-cache/app-dicts/sword-UrduGeo-1.10
deleted file mode 100644
index c44656f4f543..000000000000
--- a/metadata/md5-cache/app-dicts/sword-UrduGeo-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Urdu Geo Version (UGV) of the Bible, Urdu script
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeo
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeo.zip -> UrduGeo-1.10.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=e8e65abf4e45c8972e2f4c86819753c3
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.9 b/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.9
deleted file mode 100644
index 52ebb339f197..000000000000
--- a/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Urdu Geo Version (UGV) Bible, Devanagari script
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoDeva
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoDeva.zip -> UrduGeoDeva-1.9.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=227c1f05f8109d55e202926500c4f2a1
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.4 b/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.4
deleted file mode 100644
index 194eb3b53b09..000000000000
--- a/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Urdu Geo Version (UGV) of the Bible, Latin script
-EAPI=8
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoRoman
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoRoman.zip -> UrduGeoRoman-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=522762c811c445c536e04b8fc94b83c5
diff --git a/metadata/md5-cache/app-dicts/sword-UyCyr-1.1 b/metadata/md5-cache/app-dicts/sword-UyCyr-1.1
deleted file mode 100644
index 6c2fac30caad..000000000000
--- a/metadata/md5-cache/app-dicts/sword-UyCyr-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Modern Uyghur Cyrillic translation of the Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UyCyr
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UyCyr.zip -> UyCyr-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=cce8b1a2c8f102463c53d3eeedc55d98
diff --git a/metadata/md5-cache/app-dicts/sword-VarApp-1.0 b/metadata/md5-cache/app-dicts/sword-VarApp-1.0
deleted file mode 100644
index 8f09338bde2a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VarApp-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=NT Manuscript Variant Apparatus
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VarApp
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC0-1.0
-RDEPEND=>=app-text/sword-1.6.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VarApp.zip -> VarApp-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=77d19f91b5cd8aa5cf7f586247f93785
diff --git a/metadata/md5-cache/app-dicts/sword-VieRobinson-1.0 b/metadata/md5-cache/app-dicts/sword-VieRobinson-1.0
deleted file mode 100644
index fb8c5b120971..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VieRobinson-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Vietnamese translation of Robinson's Morphological Codes
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VieRobinson
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VieRobinson.zip -> VieRobinson-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ee4f33aa66fd7bc67618709b62850a41
diff --git a/metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1 b/metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1
deleted file mode 100644
index e734de923762..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Richard Helleme’s Greek-English-Vietnamese Dictionary in Vietnamese
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VieStrongsGreek
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VieStrongsGreek.zip -> VieStrongsGreek-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=afca699c28b345ada8403c01e004834b
diff --git a/metadata/md5-cache/app-dicts/sword-Viet-1.4.1 b/metadata/md5-cache/app-dicts/sword-Viet-1.4.1
deleted file mode 100644
index bb7e9a7ec212..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Viet-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Vietnamese Bible (1934)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Viet
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Viet.zip -> Viet-1.4.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=1da56a19ea0ede2094c3a1f049e8861f
diff --git a/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0 b/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
deleted file mode 100644
index 6004c641d97d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Lời Chúa Cho Mọi Người
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMN
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VietLCCMN.zip -> VietLCCMN-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ccb922938fa045eea05ec56209abb13f
diff --git a/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0 b/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
deleted file mode 100644
index 1acab7ec4a72..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Lời Chúa Cho Mọi Người Chú Thích
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMNCT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VietLCCMNCT.zip -> VietLCCMNCT-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=2499d3e0c5c2ab8a077f735c5889d78e
diff --git a/metadata/md5-cache/app-dicts/sword-VietNVB-1.4 b/metadata/md5-cache/app-dicts/sword-VietNVB-1.4
deleted file mode 100644
index 1b08e53a561c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VietNVB-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=New Vietnamese Bible (2002)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietNVB
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VietNVB.zip -> VietNVB-1.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c191c82b4186f4084c8dd468738a8cff
diff --git a/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1 b/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
deleted file mode 100644
index dbab1956176c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Clementine Vulgate
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgClementine
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgClementine.zip -> VulgClementine-2.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=27bdd6218f8f999ed918e798e099a221
diff --git a/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
deleted file mode 100644
index 9acf4ec448d7..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Vulgata Clementina, Conte editore
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgConte
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgConte.zip -> VulgConte-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=7785cf697352a31d2e0017a812f47ddc
diff --git a/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1 b/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
deleted file mode 100644
index 012fc34a69cf..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Glossa ordinaria, ed. Migne
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgGlossa
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgGlossa.zip -> VulgGlossa-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=c9868fbeb794053055a34cd9f95f6737
diff --git a/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
deleted file mode 100644
index c4b21b28266d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Vulgata Clementina, Hetzenauer editore
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgHetzenauer
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgHetzenauer.zip -> VulgHetzenauer-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f5fa1f84f2e09f78dbd07e8643824905
diff --git a/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
deleted file mode 100644
index ca541f166834..000000000000
--- a/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Vulgata Sistina
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgSistine
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgSistine.zip -> VulgSistine-1.0.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=39e844ed37fdec8616f382551d2f8315
diff --git a/metadata/md5-cache/app-dicts/sword-Vulgate-2.1 b/metadata/md5-cache/app-dicts/sword-Vulgate-2.1
deleted file mode 100644
index c931fccd690b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Vulgate-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Latin Vulgate
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Vulgate.zip -> Vulgate-2.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0687b2dde35d1e0054d536dd80147645
diff --git a/metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.1 b/metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.1
deleted file mode 100644
index 03bc7d4a92e8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Latin Vulgate Psalms from Hebrew
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate_HebPs
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Vulgate_HebPs.zip -> Vulgate_HebPs-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=bad8655e469d92d5cbc4d079221c1c43
diff --git a/metadata/md5-cache/app-dicts/sword-WHNU-2.4 b/metadata/md5-cache/app-dicts/sword-WHNU-2.4
deleted file mode 100644
index e91314a0bb28..000000000000
--- a/metadata/md5-cache/app-dicts/sword-WHNU-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Westcott-Hort with NA27/UBS4 variants (1881)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=WHNU
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/WHNU.zip -> WHNU-2.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3dd6e09fa1570947763e5e0448c9c0f8
diff --git a/metadata/md5-cache/app-dicts/sword-WLC-1.9 b/metadata/md5-cache/app-dicts/sword-WLC-1.9
deleted file mode 100644
index b0fcef1d8129..000000000000
--- a/metadata/md5-cache/app-dicts/sword-WLC-1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Westminster Leningrad Codex
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=WLC
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.7.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/WLC.zip -> WLC-1.9.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=042d6e442d2144ee91a40bb603519412
diff --git a/metadata/md5-cache/app-dicts/sword-Webster-1.2 b/metadata/md5-cache/app-dicts/sword-Webster-1.2
deleted file mode 100644
index ae966404ae26..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Webster-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Webster Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Webster.zip -> Webster-1.2.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=31b9e6900bf9449b6a51a65ee43ccd63
diff --git a/metadata/md5-cache/app-dicts/sword-Webster1806-1.0 b/metadata/md5-cache/app-dicts/sword-Webster1806-1.0
deleted file mode 100644
index 83b7937dd02b..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Webster1806-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Webster's 1806 A Compendious Dictionary of the English Language
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1806
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Webster1806.zip -> Webster1806-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4bd57ee2674a8718b6789fda2fb0ab85
diff --git a/metadata/md5-cache/app-dicts/sword-Webster1913-2.0 b/metadata/md5-cache/app-dicts/sword-Webster1913-2.0
deleted file mode 100644
index 36669a0ae2d6..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Webster1913-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Webster's English Dictionary, 1913 edition
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1913
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.11
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Webster1913.zip -> Webster1913-2.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=eee4b5ad4883109c4c323a933030f5eb
diff --git a/metadata/md5-cache/app-dicts/sword-WelBeiblNet-3.0.1 b/metadata/md5-cache/app-dicts/sword-WelBeiblNet-3.0.1
deleted file mode 100644
index 226b99a1bef0..000000000000
--- a/metadata/md5-cache/app-dicts/sword-WelBeiblNet-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=beibl.net translation of the Bible into colloquial Welsh by Arfon Jones
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=WelBeiblNet
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/WelBeiblNet.zip -> WelBeiblNet-3.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=34fade41e9234f740d56350c78d85786
diff --git a/metadata/md5-cache/app-dicts/sword-Wesley-1.1 b/metadata/md5-cache/app-dicts/sword-Wesley-1.1
deleted file mode 100644
index e5011adffe73..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Wesley-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=John Wesley's Notes on the Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wesley
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Wesley.zip -> Wesley-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=0bf71053797528dc67e968584291c303
diff --git a/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1 b/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
deleted file mode 100644
index 40c59ea92372..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Westminster Confession & Catechisms
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Westminster.zip -> Westminster-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=696494d8ef8a461c8d0b721739819e02
diff --git a/metadata/md5-cache/app-dicts/sword-Westminster21-1.0 b/metadata/md5-cache/app-dicts/sword-Westminster21-1.0
deleted file mode 100644
index 5574651c01c3..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Westminster21-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The Westminster Standards translated into twenty-first century American English
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster21
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=freedist
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Westminster21.zip -> Westminster21-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=6a77112fca905b9260a40eb7d4ff7333
diff --git a/metadata/md5-cache/app-dicts/sword-Weymouth-1.1 b/metadata/md5-cache/app-dicts/sword-Weymouth-1.1
deleted file mode 100644
index 97579b5413e5..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Weymouth-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Weymouth NT (1912)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Weymouth
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Weymouth.zip -> Weymouth-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3890ca54235eec3070b03f453b6c1730
diff --git a/metadata/md5-cache/app-dicts/sword-Worsley-1.6 b/metadata/md5-cache/app-dicts/sword-Worsley-1.6
deleted file mode 100644
index b8803d9fc7ab..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Worsley-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=1770 John Worsley NT
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Worsley
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Worsley.zip -> Worsley-1.6.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a9080e501e1eb6ebaad59ec0326cf905
diff --git a/metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1 b/metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1
deleted file mode 100644
index 1a76daf495f4..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Bishop Wulfila Gothic Bible
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wulfila
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Wulfila.zip -> Wulfila-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=550579c7018d66289c65ce78dcd87e92
diff --git a/metadata/md5-cache/app-dicts/sword-Wycliffe-2.4 b/metadata/md5-cache/app-dicts/sword-Wycliffe-2.4
deleted file mode 100644
index cdbe05cd15ed..000000000000
--- a/metadata/md5-cache/app-dicts/sword-Wycliffe-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=John Wycliffe Bible (c. 1395)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wycliffe
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=app-text/sword-1.6.1
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Wycliffe.zip -> Wycliffe-2.4.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=f8dce8fb301b2b0046de808e6215f233
diff --git a/metadata/md5-cache/app-dicts/sword-YLT-1.1 b/metadata/md5-cache/app-dicts/sword-YLT-1.1
deleted file mode 100644
index 79a05d36da41..000000000000
--- a/metadata/md5-cache/app-dicts/sword-YLT-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Young's Literal Translation (1898)
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=YLT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=app-text/sword
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/YLT.zip -> YLT-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4405e2c405577ab235901be4ad34f82a
diff --git a/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1 b/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
deleted file mode 100644
index 52863d48de90..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=CEDICT English/Chinese Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhEnglish
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CEDICT
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ZhEnglish.zip -> ZhEnglish-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=ffde9c71ec75e038760d06002540b6e8
diff --git a/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0 b/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
deleted file mode 100644
index 8166b6ae3b6d..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=CEDICT Chinese (Hanzi)/English Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhHanzi
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CEDICT
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ZhHanzi.zip -> ZhHanzi-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=8828d4f925f10f10c285e23be465f0ef
diff --git a/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0 b/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
deleted file mode 100644
index d8843c6ea2ac..000000000000
--- a/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=CEDICT Chinese (Pinyin)/English Dictionary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhPinyin
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CEDICT
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ZhPinyin.zip -> ZhPinyin-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d38ad49ef48d064a17c351791d27a83e
diff --git a/metadata/md5-cache/app-dicts/sword-alzat-1.0 b/metadata/md5-cache/app-dicts/sword-alzat-1.0
deleted file mode 100644
index 8664dbdce58c..000000000000
--- a/metadata/md5-cache/app-dicts/sword-alzat-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=الذات للبابا شنودة الثالث
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=alzat
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=free-noncomm
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/alzat.zip -> alzat-1.0.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=fdf2295b501608b89f492e2acdea7120
diff --git a/metadata/md5-cache/app-dicts/sword-br_en-1.1 b/metadata/md5-cache/app-dicts/sword-br_en-1.1
deleted file mode 100644
index b2e34094e6d8..000000000000
--- a/metadata/md5-cache/app-dicts/sword-br_en-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Breton to English Glossary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/br_en.zip -> br_en-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=77c99e8e3b3084fa9df2559147d1dc13
diff --git a/metadata/md5-cache/app-dicts/sword-en_eu-1.1 b/metadata/md5-cache/app-dicts/sword-en_eu-1.1
deleted file mode 100644
index 72ca1b212182..000000000000
--- a/metadata/md5-cache/app-dicts/sword-en_eu-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=English to Basque Glossary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=en_eu
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/en_eu.zip -> en_eu-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=bd78419b5e840f011631d2cc5f52217d
diff --git a/metadata/md5-cache/app-dicts/sword-f35-1.0.1 b/metadata/md5-cache/app-dicts/sword-f35-1.0.1
deleted file mode 100644
index 97f188a1e2ca..000000000000
--- a/metadata/md5-cache/app-dicts/sword-f35-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Wilbur Pickering's Greek New Testament According to Family 35
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=f35
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/f35.zip -> f35-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=a472b454206d99bdf3edbfed53de7f9a
diff --git a/metadata/md5-cache/app-dicts/sword-la_en-1.1 b/metadata/md5-cache/app-dicts/sword-la_en-1.1
deleted file mode 100644
index 290c3562a180..000000000000
--- a/metadata/md5-cache/app-dicts/sword-la_en-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Latin to English Glossary
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/la_en.zip -> la_en-1.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=3c844021d007f289cd5b64c9d719b476
diff --git a/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1 b/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
deleted file mode 100644
index 2f1fb082741a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Kitab Awal-Jaman maka Kitab Injil
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=sml_BL_2008
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=CC-BY-ND-3.0
-RDEPEND=>=app-text/sword-1.5.1a
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/sml_BL_2008.zip -> sml_BL_2008-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=d4c6c640a9a4e087009549874278f6c6
diff --git a/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1 b/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
deleted file mode 100644
index 6eb60f9bf00a..000000000000
--- a/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=Het Nieuwe Testament by Nicolaas De Jonge
-EAPI=7
-HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=vlsJoNT
-INHERIT=sword-module
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.0
-SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/vlsJoNT.zip -> vlsJoNT-1.0.1.zip
-_eclasses_=sword-module	8f4e4628b0116c1c8cdeb1c242614338
-_md5_=4e057c7b02cd32c1b2783ceba8fafc8a
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index e21303692fe3..f636285651a2 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/diakonos-0.9.7 b/metadata/md5-cache/app-editors/diakonos-0.9.7
index f0cf49e5325b..b17f28f33323 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.7
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pistos/diakonos/archive/refs/tags/v0.9.7.tar.gz -> diakonos-0.9.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cb55b05085e7b69c8e9a7312faac8756
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r16 b/metadata/md5-cache/app-editors/emacs-25.3-r16
new file mode 100644
index 000000000000..9f23e78672dc
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r16
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+SLOT=25
+SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4ecb0593957ea31b9d943ef298701e46
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r12 b/metadata/md5-cache/app-editors/emacs-26.3-r12
deleted file mode 100644
index 56fdcfc14a33..000000000000
--- a/metadata/md5-cache/app-editors/emacs-26.3-r12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= 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 ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=26
-SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-4.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8f05e3ab122ff0f6e0199c7cb2a90fbe
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r13 b/metadata/md5-cache/app-editors/emacs-26.3-r13
new file mode 100644
index 000000000000..8aec7381c95b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r13
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= 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 ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+SLOT=26
+SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c8cbf272b4d1d93a1005c25892b130ee
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r10 b/metadata/md5-cache/app-editors/emacs-27.2-r10
deleted file mode 100644
index 244389e817bb..000000000000
--- a/metadata/md5-cache/app-editors/emacs-27.2-r10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= 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 ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games 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 ~m68k ~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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-RESTRICT=test
-SLOT=27
-SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-5.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=307aef2e2556a78b462456bf1dc7abb2
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r11 b/metadata/md5-cache/app-editors/emacs-27.2-r11
new file mode 100644
index 000000000000..586b30895030
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r11
@@ -0,0 +1,17 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= 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 ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games 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 ~m68k ~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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=27
+SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-6.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cfad29e96adbce33aa133abae7e228a0
diff --git a/metadata/md5-cache/app-editors/emacs-28.2-r5 b/metadata/md5-cache/app-editors/emacs-28.2-r5
deleted file mode 100644
index aef128e3460a..000000000000
--- a/metadata/md5-cache/app-editors/emacs-28.2-r5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) 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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= 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 ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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 ~m68k ~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 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) 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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
-SLOT=28
-SRC_URI=mirror://gnu/emacs/emacs-28.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-2.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fb0dda921bde589304abd9ca50c4fb02
diff --git a/metadata/md5-cache/app-editors/emacs-28.2-r6 b/metadata/md5-cache/app-editors/emacs-28.2-r6
new file mode 100644
index 000000000000..82ca0c1dafd0
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-28.2-r6
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=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 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) 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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= 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 ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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 ~m68k ~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 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) 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 gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) 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[X] ) 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.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+SLOT=28
+SRC_URI=mirror://gnu/emacs/emacs-28.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-3.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=77a0911abba5577c05ee53f1e5c93893
diff --git a/metadata/md5-cache/app-editors/emacs-28.3_rc1 b/metadata/md5-cache/app-editors/emacs-28.3_rc1
index 9cfe1f076b3c..36972d1194b9 100644
--- a/metadata/md5-cache/app-editors/emacs-28.3_rc1
+++ b/metadata/md5-cache/app-editors/emacs-28.3_rc1
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 SLOT=28
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.3-rc1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=87513c0b778ad1cdca3e1fd63c2218bf
+_md5_=a0457debd69e4d4c1a5fdb507aa6e398
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.1000 b/metadata/md5-cache/app-editors/gvim-9.0.1000
index bc95eaa2c739..c7f76d236411 100644
--- a/metadata/md5-cache/app-editors/gvim-9.0.1000
+++ b/metadata/md5-cache/app-editors/gvim-9.0.1000
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,10 +9,10 @@ IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python rack
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9.0.1000 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1000.tar.gz -> vim-9.0.1000.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=45b7ed86a143be008450836d5f03f9e0
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.1157 b/metadata/md5-cache/app-editors/gvim-9.0.1157
index 306faceb8944..c3a94dc0a28a 100644
--- a/metadata/md5-cache/app-editors/gvim-9.0.1157
+++ b/metadata/md5-cache/app-editors/gvim-9.0.1157
@@ -1,18 +1,18 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
 INHERIT=bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
 IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9.0.1157 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1157.tar.gz -> vim-9.0.1157.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=99329af4b72b0994288b8a11654bfe16
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=45b7ed86a143be008450836d5f03f9e0
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.1363 b/metadata/md5-cache/app-editors/gvim-9.0.1363
new file mode 100644
index 000000000000..0fe6ebb538be
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-9.0.1363
@@ -0,0 +1,18 @@
+BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-9.0.1363 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) x11-base/xorg-proto
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=8
+HOMEPAGE=https://www.vim.org https://github.com/vim/vim
+INHERIT=bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
+IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+RDEPEND=~app-editors/vim-core-9.0.1363 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v9.0.1363.tar.gz -> vim-9.0.1363.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=edc8f1f7d93a8f3a4d77e57715459f68
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index ba4a7733dbe8..14a11ab03d88 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,9 +9,9 @@ IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python rack
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 PROPERTIES=live
-RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b07db6b19e480eedb8440c5a52c88b4e
diff --git a/metadata/md5-cache/app-editors/okteta-0.26.9 b/metadata/md5-cache/app-editors/okteta-0.26.9
deleted file mode 100644
index 3f8a1c7ccff1..000000000000
--- a/metadata/md5-cache/app-editors/okteta-0.26.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/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/qtscript-5.15.2:5[scripttools] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2: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/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/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kparts-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 crypt? ( >=app-crypt/qca-2.3.0:2 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Hex editor by KDE
-EAPI=8
-HOMEPAGE=https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm kde.org
-IUSE=crypt test debug designer +handbook test
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2 handbook? ( FDL-1.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/qtprintsupport-5.15.2:5 >=dev-qt/qtscript-5.15.2:5[scripttools] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2: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/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/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kparts-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 crypt? ( >=app-crypt/qca-2.3.0:2 ) || ( 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/okteta/0.26.9/src/okteta-0.26.9.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fed1e9b4ba951406153057eaa3e69d30
diff --git a/metadata/md5-cache/app-editors/vim-9.0.1000 b/metadata/md5-cache/app-editors/vim-9.0.1000
index 7fe61eeb4b36..b318e724b0c8 100644
--- a/metadata/md5-cache/app-editors/vim-9.0.1000
+++ b/metadata/md5-cache/app-editors/vim-9.0.1000
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,9 +9,9 @@ IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinu
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1000 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) 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 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1000.tar.gz -> vim-9.0.1000.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c2a4d096802ccca474ab39f3147efaa4
diff --git a/metadata/md5-cache/app-editors/vim-9.0.1157 b/metadata/md5-cache/app-editors/vim-9.0.1157
index 6e6d5c493bf0..8a3d82039c85 100644
--- a/metadata/md5-cache/app-editors/vim-9.0.1157
+++ b/metadata/md5-cache/app-editors/vim-9.0.1157
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
 INHERIT=vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
 IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1157 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) 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 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1157.tar.gz -> vim-9.0.1157.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0b5aefb4f10f2d4a51a10d0d0ef2bfd0
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=cafd4784ebd6ef17998d2945c941e252
diff --git a/metadata/md5-cache/app-editors/vim-9.0.1363 b/metadata/md5-cache/app-editors/vim-9.0.1363
new file mode 100644
index 000000000000..5a9e993f901b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-9.0.1363
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1363 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=8
+HOMEPAGE=https://www.vim.org https://github.com/vim/vim
+INHERIT=vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
+IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.1363 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) 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 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v9.0.1363.tar.gz -> vim-9.0.1363.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=caefb1a807a08200823d60ce733a61f8
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 09b0fed1bd42..f36e69827a1f 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
@@ -9,8 +9,8 @@ IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinu
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 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 ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) 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-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) 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 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=caefb1a807a08200823d60ce733a61f8
diff --git a/metadata/md5-cache/app-editors/vim-core-9.0.1157 b/metadata/md5-cache/app-editors/vim-core-9.0.1157
index d88a78f17576..32de8ac3b2a8 100644
--- a/metadata/md5-cache/app-editors/vim-core-9.0.1157
+++ b/metadata/md5-cache/app-editors/vim-core-9.0.1157
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
 INHERIT=bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils
 IUSE=nls acl minimal
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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=vim
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.1157.tar.gz -> vim-9.0.1157.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cb8de5f29cf3f3463c1c7e60f91bc048
+_md5_=e1366c1aeb117c6ef7b5082b3790934c
diff --git a/metadata/md5-cache/app-editors/vim-core-9.0.1363 b/metadata/md5-cache/app-editors/vim-core-9.0.1363
new file mode 100644
index 000000000000..6289a14d109c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-core-9.0.1363
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/autoconf
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=sys-libs/ncurses-5.2-r2:0
+DESCRIPTION=vim and gvim shared files
+EAPI=8
+HOMEPAGE=https://www.vim.org https://github.com/vim/vim
+INHERIT=bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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=vim
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v9.0.1363.tar.gz -> vim-9.0.1363.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.1000-patches.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=edcb07f676903169e762867ac2bb5739
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 89cd5010ea5f..ecd6fcb5b3aa 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/apheleia-3.2 b/metadata/md5-cache/app-emacs/apheleia-3.2
new file mode 100644
index 000000000000..ed9d5c95e285
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/apheleia-3.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-26:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Reformat GNU Emacs buffers stably without moving point
+EAPI=8
+HOMEPAGE=https://github.com/radian-software/apheleia/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-editors/emacs-26:*
+SLOT=0
+SRC_URI=https://github.com/radian-software/apheleia/archive/v3.2.tar.gz -> apheleia-3.2.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=a8c8501bfee7faf6ae4998f490dbb4bc
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
index 544bb5609bc1..19a815394df4 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -7,9 +7,9 @@ INHERIT=elisp ruby-single vcs-snapshot
 IUSE=ruby
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
-RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems ) >=app-editors/emacs-24.3:*
+RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems ) >=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
-_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=8cfe79753f7eedc6edd3d50e4d1c602a
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.62 b/metadata/md5-cache/app-emacs/ebuild-mode-1.62
new file mode 100644
index 000000000000..d53621f07ee0
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.62
@@ -0,0 +1,13 @@
+BDEPEND=sys-apps/texinfo >=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+INHERIT=elisp optfeature
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.62.tar.xz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	optfeature	1a2157392a869265b2afcb63a26c12ac
+_md5_=7ca750a6cba17c8cad610afa6b6179e4
diff --git a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321 b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321
index 478c3d947406..ab1933be199e 100644
--- a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321
+++ b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321
@@ -1,16 +1,16 @@
-BDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) test? ( python_single_target_python3_9? ( dev-python/autopep8[python_targets_python3_9(-)] dev-python/jedi[python_targets_python3_9(-)] dev-python/yapf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/autopep8[python_targets_python3_10(-)] dev-python/jedi[python_targets_python3_10(-)] dev-python/yapf[python_targets_python3_10(-)] ) ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) >=app-editors/emacs-24.4:*
+BDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) test? ( python_single_target_python3_9? ( dev-python/autopep8[python_targets_python3_9(-)] dev-python/jedi[python_targets_python3_9(-)] dev-python/yapf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/autopep8[python_targets_python3_10(-)] dev-python/jedi[python_targets_python3_10(-)] dev-python/yapf[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/autopep8[python_targets_python3_11(-)] dev-python/jedi[python_targets_python3_11(-)] dev-python/yapf[python_targets_python3_11(-)] ) ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) >=app-editors/emacs-24.4:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Emacs Python Development Environment
 EAPI=8
 HOMEPAGE=https://github.com/jorgenschaefer/elpy/
 INHERIT=distutils-r1 elisp
-IUSE=test doc test python_single_target_python3_9 python_single_target_python3_10
+IUSE=test doc test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-editors/emacs-24.4:*
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-editors/emacs-24.4:*
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/elpy/archive/1746e7009000b7635c0ea6f1559018143aa61642.tar.gz -> elpy-1.35.0_p20220321.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=be8c485a8e58387af8b06be8e2ec7cda
+_md5_=560eac44a544efa9fc69ff1ecad2c2b9
diff --git a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627 b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627
index 5c1f0fe3fb7e..1aa393c95c85 100644
--- a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627
+++ b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627
@@ -1,16 +1,16 @@
-BDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) test? ( python_single_target_python3_9? ( dev-python/autopep8[python_targets_python3_9(-)] dev-python/jedi[python_targets_python3_9(-)] dev-python/yapf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/autopep8[python_targets_python3_10(-)] dev-python/jedi[python_targets_python3_10(-)] dev-python/yapf[python_targets_python3_10(-)] ) ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) >=app-editors/emacs-24.4:*
+BDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) test? ( python_single_target_python3_9? ( dev-python/autopep8[python_targets_python3_9(-)] dev-python/jedi[python_targets_python3_9(-)] dev-python/yapf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/autopep8[python_targets_python3_10(-)] dev-python/jedi[python_targets_python3_10(-)] dev-python/yapf[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/autopep8[python_targets_python3_11(-)] dev-python/jedi[python_targets_python3_11(-)] dev-python/yapf[python_targets_python3_11(-)] ) ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) >=app-editors/emacs-24.4:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Emacs Python Development Environment
 EAPI=8
 HOMEPAGE=https://github.com/jorgenschaefer/elpy/
 INHERIT=distutils-r1 elisp
-IUSE=test doc test python_single_target_python3_9 python_single_target_python3_10
+IUSE=test doc test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-editors/emacs-24.4:*
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=app-emacs/company-mode app-emacs/highlight-indentation app-emacs/pyvenv app-emacs/s app-emacs/yasnippet python_single_target_python3_9? ( dev-python/flake8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flake8[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flake8[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-editors/emacs-24.4:*
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/elpy/archive/de31d30003c515c25ff7bfd3a361c70c298f78bb.tar.gz -> elpy-1.35.0_p20220627.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=432981b87b649b0cd03332ceeb95e237
+_md5_=a608ed39459179c88002975f8142c16d
diff --git a/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1 b/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1
index 47e570d15fd9..6452dc6377ce 100644
--- a/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1
+++ b/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-emacs/anaphora app-emacs/dash app-emacs/deferred app-emacs/polymode app-emacs/request app-emacs/websocket app-emacs/with-editor python_single_target_python3_9? ( dev-python/ipython[python_targets_python3_9(-)] dev-python/notebook[python_targets_python3_9(-)] dev-python/tornado[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipython[python_targets_python3_10(-)] dev-python/notebook[python_targets_python3_10(-)] dev-python/tornado[python_targets_python3_10(-)] ) test? ( app-emacs/ert-runner app-emacs/mocker ) >=app-editors/emacs-25:*
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-emacs/anaphora app-emacs/dash app-emacs/deferred app-emacs/polymode app-emacs/request app-emacs/websocket app-emacs/with-editor python_single_target_python3_9? ( dev-python/ipython[python_targets_python3_9(-)] dev-python/notebook[python_targets_python3_9(-)] dev-python/tornado[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipython[python_targets_python3_10(-)] dev-python/notebook[python_targets_python3_10(-)] dev-python/tornado[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/ipython[python_targets_python3_11(-)] dev-python/notebook[python_targets_python3_11(-)] dev-python/tornado[python_targets_python3_11(-)] ) test? ( app-emacs/ert-runner app-emacs/mocker ) >=app-editors/emacs-25:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Jupyter notebook client in Emacs
 EAPI=8
 HOMEPAGE=https://github.com/millejoh/emacs-ipython-notebook/
 INHERIT=elisp readme.gentoo-r1 python-single-r1
-IUSE=test python_single_target_python3_9 python_single_target_python3_10
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-emacs/anaphora app-emacs/dash app-emacs/deferred app-emacs/polymode app-emacs/request app-emacs/websocket app-emacs/with-editor python_single_target_python3_9? ( dev-python/ipython[python_targets_python3_9(-)] dev-python/notebook[python_targets_python3_9(-)] dev-python/tornado[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipython[python_targets_python3_10(-)] dev-python/notebook[python_targets_python3_10(-)] dev-python/tornado[python_targets_python3_10(-)] ) >=app-editors/emacs-25:*
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-emacs/anaphora app-emacs/dash app-emacs/deferred app-emacs/polymode app-emacs/request app-emacs/websocket app-emacs/with-editor python_single_target_python3_9? ( dev-python/ipython[python_targets_python3_9(-)] dev-python/notebook[python_targets_python3_9(-)] dev-python/tornado[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipython[python_targets_python3_10(-)] dev-python/notebook[python_targets_python3_10(-)] dev-python/tornado[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/ipython[python_targets_python3_11(-)] dev-python/notebook[python_targets_python3_11(-)] dev-python/tornado[python_targets_python3_11(-)] ) >=app-editors/emacs-25:*
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/millejoh/emacs-ipython-notebook/archive/388c8f753cfb99b4f82acbdff26bbe27189d2299.tar.gz -> emacs-ipython-notebook-0.17.0_p20220419.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=623607cb736ab618dcd3de47332fbf5f
+_md5_=499844cc2c2a1f2d6251b3c69d65b4f3
diff --git a/metadata/md5-cache/app-emacs/geiser-chez-0.18 b/metadata/md5-cache/app-emacs/geiser-chez-0.18
new file mode 100644
index 000000000000..b529d70ff9e0
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/geiser-chez-0.18
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/geiser >=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Chez Scheme's implementation of the Geiser protocols
+EAPI=8
+HOMEPAGE=https://gitlab.com/emacs-geiser/chez/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-emacs/geiser dev-scheme/chez >=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://gitlab.com/emacs-geiser/chez/-/archive/0.18/chez-0.18.tar.bz2 -> geiser-chez-0.18.tar.bz2
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=0519a1b746815d2ab0f35aea2a3236f3
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730
deleted file mode 100644
index e98f68f443ee..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
-EAPI=8
-HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
-INHERIT=elisp
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
-LICENSE=MIT GPL-2+
-RDEPEND=>=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20220730.tar.xz
-_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=93410d58c5c38babced9242b7d7de9e2
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20230227 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20230227
new file mode 100644
index 000000000000..02d0f6426dfb
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20230227
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
+INHERIT=elisp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=MIT GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20230227.tar.xz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=932374104e8c84a56e9807ea9a76f267
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r3 b/metadata/md5-cache/app-emacs/pymacs-0.26-r3
index b1b9d5028390..348f8495cbb8 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26-r3
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r3
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( >=dev-python/docutils-0.7 virtual/latex-base ) >=app-editors/emacs-23.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=doc? ( >=dev-python/docutils-0.7 virtual/latex-base ) >=app-editors/emacs-23.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A tool that allows both-side communication between Python and Emacs Lisp
 EAPI=8
 HOMEPAGE=https://www.emacswiki.org/emacs/PyMacs
 INHERIT=elisp distutils-r1
-IUSE=doc python_targets_python3_9 python_targets_python3_10
+IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
-RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a37be4115f40175c4f1eb747df2f43d4
+_md5_=0f19adcf3cdb7f5858835ddbfe4747f7
diff --git a/metadata/md5-cache/app-emacs/racket-mode-1_p20230209 b/metadata/md5-cache/app-emacs/racket-mode-1_p20230209
new file mode 100644
index 000000000000..7689afa6764f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/racket-mode-1_p20230209
@@ -0,0 +1,13 @@
+BDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more
+EAPI=8
+HOMEPAGE=https://www.racket-mode.com/ https://github.com/greghendershott/racket-mode/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
+SLOT=0
+SRC_URI=https://github.com/greghendershott/racket-mode/archive/947d9806ee27ef241643f978c7901fd1f9e10c98.tar.gz -> racket-mode-1_p20230209.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=b86a7f3ed9c188a67e6c5db9e7bcca92
diff --git a/metadata/md5-cache/app-emacs/treemacs-2.10-r2 b/metadata/md5-cache/app-emacs/treemacs-2.10-r2
index da5cd0aef273..043bd99c9ed4 100644
--- a/metadata/md5-cache/app-emacs/treemacs-2.10-r2
+++ b/metadata/md5-cache/app-emacs/treemacs-2.10-r2
@@ -1,16 +1,16 @@
-BDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s test? ( app-emacs/buttercup ) >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+BDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s test? ( app-emacs/buttercup ) >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Tree style project file explorer
 EAPI=8
 HOMEPAGE=https://github.com/Alexander-Miller/treemacs/
 INHERIT=elisp distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/treemacs/archive/2.10.tar.gz -> treemacs-2.10.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f53b85ff19f606fa67ccaa8f3f41f64e
+_md5_=73e28725e06399dc4019812565c74f21
diff --git a/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2 b/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2
index e6e0d608b57c..b3944a9d4294 100644
--- a/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2
+++ b/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2
@@ -1,16 +1,16 @@
-BDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s test? ( app-emacs/buttercup ) >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+BDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s test? ( app-emacs/buttercup ) >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Tree style project file explorer
 EAPI=8
 HOMEPAGE=https://github.com/Alexander-Miller/treemacs/
 INHERIT=elisp distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/treemacs/archive/2.9.5.tar.gz -> treemacs-2.9.5.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2dbef152643104f3fe7da6709f4c3370
+_md5_=7857b16e4aaa6cce16591583a7469709
diff --git a/metadata/md5-cache/app-emacs/treemacs-3.0-r1 b/metadata/md5-cache/app-emacs/treemacs-3.0-r1
index b146d4a1de65..5f7aced5b9d5 100644
--- a/metadata/md5-cache/app-emacs/treemacs-3.0-r1
+++ b/metadata/md5-cache/app-emacs/treemacs-3.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s test? ( app-emacs/buttercup ) >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+BDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s test? ( app-emacs/buttercup ) >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Tree style project file explorer
 EAPI=8
 HOMEPAGE=https://github.com/Alexander-Miller/treemacs/
 INHERIT=elisp distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=app-emacs/ace-window app-emacs/cfrs app-emacs/dash app-emacs/ht app-emacs/hydra app-emacs/pfuture app-emacs/s >=app-editors/emacs-26.1:* python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/treemacs/archive/3.0.tar.gz -> treemacs-3.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c32d65c5f123b95eb3706d08af7b2f12
+_md5_=dcea36c23e19fa842fe11f5a426e5f78
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b0449c7be573..57b299bbe31e 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/genymotion-bin-3.3.2-r1 b/metadata/md5-cache/app-emulation/genymotion-bin-3.3.2-r1
new file mode 100644
index 000000000000..570a195da13f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/genymotion-bin-3.3.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=x11-misc/xdg-utils
+DEFINED_PHASES=install nofetch postinst prepare unpack
+DESCRIPTION=Complete set of tools that provide a virtual environment for Android
+EAPI=8
+HOMEPAGE=https://genymotion.com
+INHERIT=bash-completion-r1 desktop pax-utils
+KEYWORDS=-* ~amd64
+LICENSE=genymotion
+RDEPEND=app-arch/lz4 app-crypt/mit-krb5 || ( app-emulation/qemu[qemu_softmmu_targets_x86_64] app-emulation/virtualbox ) || ( dev-libs/openssl-compat:1.1.0 =dev-libs/openssl-1.1*:0 ) dev-libs/glib:2 =dev-libs/hiredis-1.0* media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/libpulse media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 sys-apps/dbus sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi x11-libs/libxkbcommon[X] x11-libs/libXmu x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=genymotion-3.3.2-linux_x64.bin
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=11bc8896cec45a9d90f935b8d0daaf0f
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1 b/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
index 896475f14275..70120273d5c3 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
 INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 PDEPEND=qemu? ( dev-python/libvirt-python )
 RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
@@ -14,4 +14,4 @@ REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtua
 SLOT=0/8.9.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.9.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.9.0.tar.xz.asc )
 _eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=9cb02fafdc983bd571e01eb61f70384a
+_md5_=011ceb4e43b19f69a2f7244cb4c6eed3
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
index 61397fa16593..7d2fcc27beb9 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.18.tar.gz -> vagrant-2.2.18.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6d8403fe1168ce06facc0ba1748eb9db
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.19 b/metadata/md5-cache/app-emulation/vagrant-2.2.19
index 1b071e171caa..f8d28a9a6b68 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.19
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.19
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.19.tar.gz -> vagrant-2.2.19.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=353234f71d98235de47c382d7f1538e0
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.19-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.19-r1
index 34c6dbfc50ff..e1e0c1f2c80b 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.19-r1
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.19-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.19.tar.gz -> vagrant-2.2.19.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=43f1319a10d2ef125cf14bed72d8027a
diff --git a/metadata/md5-cache/app-emulation/wine-mono-7.4.0 b/metadata/md5-cache/app-emulation/wine-mono-7.4.0
index c89f792ab9b8..61992d6846c8 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-7.4.0
+++ b/metadata/md5-cache/app-emulation/wine-mono-7.4.0
@@ -3,8 +3,8 @@ DESCRIPTION=Replacement for the .NET runtime and class libraries in Wine
 EAPI=8
 HOMEPAGE=https://wiki.winehq.org/Mono
 IUSE=+shared
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
 SLOT=7.4.0
 SRC_URI=shared? ( https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.4.0/wine-mono-7.4.0-x86.tar.xz ) !shared? ( https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.4.0/wine-mono-7.4.0-x86.msi )
-_md5_=d2f3d5f4ff87eba9f594606b1d1c6855
+_md5_=c2bbd88d30e7e3462c08ea6fdb7383f5
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-8.0 b/metadata/md5-cache/app-emulation/wine-vanilla-8.0
index 73a19966c1c7..639a00ea01ba 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-8.0
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-8.0
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
 IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.0
 SRC_URI=https://dl.winehq.org/wine/source/8.0/wine-8.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5636760ce06c523b8269d2c5558325a6
+_md5_=4af1baf7ae05642461997df4d78554bc
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 2f8a785f06f4..730bc115891c 100644
Binary files a/metadata/md5-cache/app-forensics/Manifest.gz and b/metadata/md5-cache/app-forensics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1 b/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1
index 618e98dd253d..8fcf4987be13 100644
--- a/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1
+++ b/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pefile-2017.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pycryptodome-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) disasm? ( >=dev-libs/capstone-3.0.5[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) jsonschema? ( >=dev-python/jsonschema-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) leechcore? ( >=dev-python/leechcorepyc-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) snappy? ( >=dev-python/python-snappy-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yara? ( >=dev-python/yara-python-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DEPEND=>=dev-python/pefile-2017.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pycryptodome-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) disasm? ( >=dev-libs/capstone-3.0.5[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) jsonschema? ( >=dev-python/jsonschema-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) leechcore? ( >=dev-python/leechcorepyc-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) snappy? ( >=dev-python/python-snappy-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yara? ( >=dev-python/yara-python-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=Framework for analyzing volatile memory
 EAPI=8
 HOMEPAGE=https://github.com/volatilityfoundation/volatility3/ https://www.volatilityfoundation.org/
 INHERIT=distutils-r1
-IUSE=crypt disasm jsonschema leechcore snappy test yara python_targets_python3_9 python_targets_python3_10
+IUSE=crypt disasm jsonschema leechcore snappy test yara python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-python/pefile-2017.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pycryptodome-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) disasm? ( >=dev-libs/capstone-3.0.5[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) jsonschema? ( >=dev-python/jsonschema-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) leechcore? ( >=dev-python/leechcorepyc-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) snappy? ( >=dev-python/python-snappy-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yara? ( >=dev-python/yara-python-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=test? ( yara ) || ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/pefile-2017.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pycryptodome-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) disasm? ( >=dev-libs/capstone-3.0.5[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) jsonschema? ( >=dev-python/jsonschema-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) leechcore? ( >=dev-python/leechcorepyc-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) snappy? ( >=dev-python/python-snappy-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yara? ( >=dev-python/yara-python-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=test? ( yara ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/volatilityfoundation/volatility3/archive/v2.4.0.tar.gz -> volatility3-2.4.0.gh.tar.gz test? ( https://downloads.volatilityfoundation.org/volatility3/images/win-xp-laptop-2005-06-25.img.gz -> volatility3-win-xp-laptop-2005-06-25.img.gz https://downloads.volatilityfoundation.org/volatility3/images/linux-sample-1.bin.gz -> volatility3-linux-sample-1.bin.gz )
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e46ffad76fc5df7db35d9d63ec66779d
+_md5_=e0611a2c5718a81c60b98e289d71d470
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index e30480b0292a..2d596fdaabb4 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/ibus-1.5.27 b/metadata/md5-cache/app-i18n/ibus-1.5.27
index d5a2b2487a47..4239657ea11d 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.27
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.27
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/glib:2 dev-util/glib-utils virtual/pkgconfig x11-misc/xkeyboard-config emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/glib:2 dev-util/glib-utils virtual/pkgconfig x11-misc/xkeyboard-config emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) test? ( x11-apps/setxkbmap ) unicode? ( app-i18n/unicode-data ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=app-text/iso-codes >=dev-libs/glib-2.65.0:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) gtk4? ( gui-libs/gtk:4 ) gui? ( x11-libs/libX11 x11-libs/libXi ) introspection? ( dev-libs/gobject-introspection ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.27/ibus-1.5.27.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d6cb43255775d948ba9b9c8a91d58477
+_md5_=7bf60fc672bf3dedea5050a66bd3540e
diff --git a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2 b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
index 5085ff05babe..1587058d15a4 100644
--- a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
+++ b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/intltool nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/ibus[python(+),python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_9(-)?,python_targets_python3_10(-)?] nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/ibus[python(+),python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Chinese Cangjie and Quick engines for IBus
 EAPI=7
 HOMEPAGE=http://cangjians.github.io/
 INHERIT=autotools gnome2-utils python-r1 xdg
-IUSE=nls python_targets_python3_9 python_targets_python3_10
+IUSE=nls python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/ibus[python(+),python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_9(-)?,python_targets_python3_10(-)?] nls? ( virtual/libintl )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/ibus[python(+),python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] nls? ( virtual/libintl )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Cangjians/ibus-cangjie/releases/download/v2.4/ibus-cangjie-2.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=82bdacc4a8a056195284de645e387313
+_md5_=bb46421b5cb7c3ff2779f42ed96983f5
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1
index dbf65a3f0234..157cdd600e51 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
 INHERIT=autotools gnome2-utils lua-single python-single-r1
 IUSE=boost lua opencc lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.13.1.tar.gz -> ibus-libpinyin-1.13.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=32b42c7e6da4234db6a3bd5d47f30f0f
+_md5_=1ce32b9086bebc9827a24d6c8ba3d915
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.19 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.19
new file mode 100644
index 000000000000..6a65fe82f886
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.19
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl )
+DESCRIPTION=M17N engine for IBus
+EAPI=8
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils xdg
+IUSE=gtk nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
+SLOT=0
+SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.19/ibus-m17n-1.4.19.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=04ab03b6a2973ef81e319a782e52ac37
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
index da2045241863..ccd0825f9073 100644
--- a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 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	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b326625f1a3b02abbd86a9aba340c600
+_md5_=744ce14d4a624fe3871ee485881ec68c
diff --git a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.15 b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.15
new file mode 100644
index 000000000000..8494fd545e26
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.15
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
+DESCRIPTION=Various tables for IBus-Table
+EAPI=8
+HOMEPAGE=https://github.com/moebiuscurve/ibus-table-others
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
+SLOT=0
+SRC_URI=https://github.com/moebiuscurve/ibus-table-others/releases/download/1.3.15/ibus-table-others-1.3.15.tar.gz
+_md5_=2abe390ce76b75dfe158b7278d8c2bc0
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.20.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.20.0
index 2732758c762c..db4b1732d955 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.20.0
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.20.0
@@ -1,18 +1,18 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] )
 DESCRIPTION=Completion input method for IBus
 EAPI=8
 HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils python-single-r1 xdg
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.20.0/ibus-typing-booster-2.20.0.tar.gz
 _eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=64da4ba64bceb15593efd70f6d25afdc
+_md5_=b519df7926f100392d7d8501d5ebc3ba
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.1 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.1
index 522c17e46215..17de8d7d8232 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.1
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.1
@@ -1,18 +1,18 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] )
 DESCRIPTION=Completion input method for IBus
 EAPI=8
 HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils python-single-r1 xdg
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.21.1/ibus-typing-booster-2.21.1.tar.gz
 _eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=df27444e2b1e92e48411d728681963f4
+_md5_=e2072dcc2c36352c5a44a750a61eb860
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.3 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.3
index bde263f9f82f..dbe9597f5e97 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.3
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.3
@@ -1,18 +1,18 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] )
 DESCRIPTION=Completion input method for IBus
 EAPI=8
 HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils python-single-r1 xdg
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.21.3/ibus-typing-booster-2.21.3.tar.gz
 _eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=df27444e2b1e92e48411d728681963f4
+_md5_=e2072dcc2c36352c5a44a750a61eb860
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.4 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.4
new file mode 100644
index 000000000000..552cb7192fdd
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.21.4
@@ -0,0 +1,18 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] )
+DESCRIPTION=Completion input method for IBus
+EAPI=8
+HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils python-single-r1 xdg
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pyenchant[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.21.4/ibus-typing-booster-2.21.4.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e2072dcc2c36352c5a44a750a61eb860
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-999999 b/metadata/md5-cache/app-i18n/skk-jisyo-999999
index 8c42b4de262b..db6863f127a5 100644
--- a/metadata/md5-cache/app-i18n/skk-jisyo-999999
+++ b/metadata/md5-cache/app-i18n/skk-jisyo-999999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=|| ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems app-i18n/skktools app-alternatives/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
+DEPEND=|| ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems app-i18n/skktools app-alternatives/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
 DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
 EAPI=8
 HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
@@ -9,5 +9,5 @@ IUSE=cdb ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_target
 LICENSE=CC-BY-SA-3.0 GPL-2+ public-domain unicode
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=27da236a951b0cb26ed50550737e2d0f
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
index c692740a1c2e..a2fe33810a16 100644
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby27 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=744b7d29d0373182197e0a92d71ba57a
diff --git a/metadata/md5-cache/app-i18n/transifex-client-1.4.1 b/metadata/md5-cache/app-i18n/transifex-client-1.4.1
deleted file mode 100644
index 4125fa985b1f..000000000000
--- a/metadata/md5-cache/app-i18n/transifex-client-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=The Transifex command-line client
-EAPI=8
-HOMEPAGE=https://github.com/transifex/cli
-INHERIT=go-module
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.4.1.tar.gz -> transifex-client-1.4.1.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.4.1/transifex-client-1.4.1-deps.tar.bz
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=75516e541eb38644d83e4a478816b72d
diff --git a/metadata/md5-cache/app-i18n/transifex-client-1.6.5 b/metadata/md5-cache/app-i18n/transifex-client-1.6.5
new file mode 100644
index 000000000000..0139e8a9e14d
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/transifex-client-1.6.5
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=The Transifex command-line client
+EAPI=8
+HOMEPAGE=https://github.com/transifex/cli
+INHERIT=go-module
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.6.5.tar.gz -> transifex-client-1.6.5.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.6.5/transifex-client-1.6.5-deps.tar.bz
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=ec5f57229aa72ae92573874b583f04e8
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 3af0e69127cf..359f7bdcfd4f 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/broot-1.20.2 b/metadata/md5-cache/app-misc/broot-1.20.2
new file mode 100644
index 000000000000..2c588959eab5
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.20.2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.65 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libgit2:= sys-libs/zlib X? ( x11-libs/libxcb:= )
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+INHERIT=bash-completion-r1 cargo
+IUSE=X debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+RDEPEND=dev-libs/libgit2:= sys-libs/zlib X? ( x11-libs/libxcb:= )
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.20.2.tar.gz -> broot-1.20.2.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansi_colours/1.2.1/download -> ansi_colours-1.2.1.crate https://crates.io/api/v1/crates/anyhow/1.0.68/download -> anyhow-1.0.68.crate https://crates.io/api/v1/crates/argh/0.1.10/download -> argh-0.1.10.crate https://crates.io/api/v1/crates/argh_derive/0.1.10/download -> argh_derive-0.1.10.crate https://crates.io/api/v1/crates/argh_shared/0.1.10/download -> argh_shared-0.1.10.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bet/1.0.2/download -> bet-1.0.2.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bstr/1.2.0/download -> bstr-1.2.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/bytemuck/1.13.0/download -> bytemuck-1.13.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.1/download -> char_reader-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/clap/3.2.23/download -> clap-3.2.23.crate https://crates.io/api/v1/crates/clap_complete/3.2.5/download -> clap_complete-3.2.5.crate https://crates.io/api/v1/crates/clap_derive/3.2.18/download -> clap_derive-3.2.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.5.0/download -> clipboard-win-4.5.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/coolor/0.5.0/download -> coolor-0.5.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crokey/0.4.3/download -> crokey-0.4.3.crate https://crates.io/api/v1/crates/crokey-proc_macros/0.4.0/download -> crokey-proc_macros-0.4.0.crate https://crates.io/api/v1/crates/crossbeam/0.8.2/download -> crossbeam-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.8/download -> crossbeam-queue-0.3.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crossterm/0.23.2/download -> crossterm-0.23.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.8/download -> csv2svg-0.1.8.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/cxx/1.0.89/download -> cxx-1.0.89.crate https://crates.io/api/v1/crates/cxx-build/1.0.89/download -> cxx-build-1.0.89.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.89/download -> cxxbridge-flags-1.0.89.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.89/download -> cxxbridge-macro-1.0.89.crate https://crates.io/api/v1/crates/data-url/0.2.0/download -> data-url-0.2.0.crate https://crates.io/api/v1/crates/deser-hjson/1.1.0/download -> deser-hjson-1.1.0.crate https://crates.io/api/v1/crates/directories/4.0.1/download -> directories-4.0.1.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/error-code/2.3.1/download -> error-code-2.3.1.crate https://crates.io/api/v1/crates/exr/1.5.2/download -> exr-1.5.2.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/flume/0.10.14/download -> flume-0.10.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fontconfig-parser/0.5.1/download -> fontconfig-parser-0.5.1.crate https://crates.io/api/v1/crates/fontdb/0.10.0/download -> fontdb-0.10.0.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/futures-core/0.3.26/download -> futures-core-0.3.26.crate https://crates.io/api/v1/crates/futures-sink/0.3.26/download -> futures-sink-0.3.26.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gif/0.11.4/download -> gif-0.11.4.crate https://crates.io/api/v1/crates/git2/0.14.4/download -> git2-0.14.4.crate https://crates.io/api/v1/crates/glassbench/0.3.4/download -> glassbench-0.3.4.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/half/2.2.1/download -> half-2.2.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/image/0.24.5/download -> image-0.24.5.crate https://crates.io/api/v1/crates/imagesize/0.10.1/download -> imagesize-0.10.1.crate https://crates.io/api/v1/crates/include_dir/0.7.3/download -> include_dir-0.7.3.crate https://crates.io/api/v1/crates/include_dir_macros/0.7.3/download -> include_dir_macros-0.7.3.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/jobserver/0.1.25/download -> jobserver-0.1.25.crate https://crates.io/api/v1/crates/jpeg-decoder/0.3.0/download -> jpeg-decoder-0.3.0.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/kurbo/0.8.3/download -> kurbo-0.8.3.crate https://crates.io/api/v1/crates/lazy-regex/2.4.1/download -> lazy-regex-2.4.1.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.4.1/download -> lazy-regex-proc_macros-2.4.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lebe/0.5.2/download -> lebe-0.5.2.crate https://crates.io/api/v1/crates/lfs-core/0.11.1/download -> lfs-core-0.11.1.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.5+1.4.5/download -> libgit2-sys-0.13.5+1.4.5.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.8/download -> memmap2-0.5.8.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/minimad/0.9.1/download -> minimad-0.9.1.crate https://crates.io/api/v1/crates/minimad/0.10.0/download -> minimad-0.10.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/onig/6.4.0/download -> onig-6.4.0.crate https://crates.io/api/v1/crates/onig_sys/69.8.1/download -> onig_sys-69.8.1.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/opener/0.5.2/download -> opener-0.5.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.10.0/download -> phf_macros-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pico-args/0.5.0/download -> pico-args-0.5.0.crate https://crates.io/api/v1/crates/pin-project/1.0.12/download -> pin-project-1.0.12.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.12/download -> pin-project-internal-1.0.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/plist/1.4.0/download -> plist-1.4.0.crate https://crates.io/api/v1/crates/png/0.17.6/download -> png-0.17.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.50/download -> proc-macro2-1.0.50.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quick-xml/0.26.0/download -> quick-xml-0.26.0.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/rctree/0.5.0/download -> rctree-0.5.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/resvg/0.28.0/download -> resvg-0.28.0.crate https://crates.io/api/v1/crates/rgb/0.8.34/download -> rgb-0.8.34.crate https://crates.io/api/v1/crates/roxmltree/0.15.1/download -> roxmltree-0.15.1.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/rustybuzz/0.6.0/download -> rustybuzz-0.6.0.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.91/download -> serde_json-1.0.91.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/simplecss/0.2.1/download -> simplecss-0.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/snafu/0.7.4/download -> snafu-0.7.4.crate https://crates.io/api/v1/crates/snafu-derive/0.7.4/download -> snafu-derive-0.7.4.crate https://crates.io/api/v1/crates/spin/0.9.4/download -> spin-0.9.4.crate https://crates.io/api/v1/crates/splitty/1.0.1/download -> splitty-1.0.1.crate https://crates.io/api/v1/crates/str-buf/1.0.6/download -> str-buf-1.0.6.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strict-num/0.1.0/download -> strict-num-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/svg/0.10.0/download -> svg-0.10.0.crate https://crates.io/api/v1/crates/svgfilters/0.4.0/download -> svgfilters-0.4.0.crate https://crates.io/api/v1/crates/svgtypes/0.8.2/download -> svgtypes-0.8.2.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/syntect-no-panic/4.6.1/download -> syntect-no-panic-4.6.1.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/termimad/0.20.6/download -> termimad-0.20.6.crate https://crates.io/api/v1/crates/termimad/0.21.0/download -> termimad-0.21.0.crate https://crates.io/api/v1/crates/terminal-clipboard/0.3.1/download -> terminal-clipboard-0.3.1.crate https://crates.io/api/v1/crates/terminal-light/1.1.1/download -> terminal-light-1.1.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/tiff/0.8.1/download -> tiff-0.8.1.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/time/0.3.17/download -> time-0.3.17.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.6/download -> time-macros-0.2.6.crate https://crates.io/api/v1/crates/tiny-skia/0.8.2/download -> tiny-skia-0.8.2.crate https://crates.io/api/v1/crates/tiny-skia-path/0.8.2/download -> tiny-skia-path-0.8.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/ttf-parser/0.17.1/download -> ttf-parser-0.17.1.crate https://crates.io/api/v1/crates/umask/2.0.0/download -> umask-2.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-bidi-mirroring/0.1.0/download -> unicode-bidi-mirroring-0.1.0.crate https://crates.io/api/v1/crates/unicode-ccc/0.1.2/download -> unicode-ccc-0.1.2.crate https://crates.io/api/v1/crates/unicode-general-category/0.6.0/download -> unicode-general-category-0.6.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-script/0.5.5/download -> unicode-script-0.5.5.crate https://crates.io/api/v1/crates/unicode-vo/0.1.0/download -> unicode-vo-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/usvg/0.28.0/download -> usvg-0.28.0.crate https://crates.io/api/v1/crates/usvg-text-layout/0.28.0/download -> usvg-text-layout-0.28.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.3/download -> x11-clipboard-0.5.3.crate https://crates.io/api/v1/crates/xcb/0.10.1/download -> xcb-0.10.1.crate https://crates.io/api/v1/crates/xmlparser/0.13.5/download -> xmlparser-0.13.5.crate https://crates.io/api/v1/crates/xterm-query/0.1.0/download -> xterm-query-0.1.0.crate https://crates.io/api/v1/crates/xterm-query/0.2.0/download -> xterm-query-0.2.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=124d723ecc09d50cef28cfc1c2382f8f
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.5 b/metadata/md5-cache/app-misc/gramps-5.1.5
index 098750c27ed9..f22805729ff7 100644
--- a/metadata/md5-cache/app-misc/gramps-5.1.5
+++ b/metadata/md5-cache/app-misc/gramps-5.1.5
@@ -1,16 +1,16 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] dev-python/pyicu[python_targets_python3_9(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_9(-),introspection] ) ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils berkdb? ( python_single_target_python3_9? ( dev-python/bsddb3[python_targets_python3_9(-)] ) ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_9? ( dev-python/jsonschema[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] dev-python/pyicu[python_targets_python3_9(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_9(-),introspection] ) ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils berkdb? ( python_single_target_python3_9? ( dev-python/bsddb3[python_targets_python3_9(-)] ) ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_9? ( dev-python/jsonschema[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DESCRIPTION=Community genealogy program aiming to be both intuitive and feature-complete
 EAPI=8
 HOMEPAGE=https://gramps-project.org/
 INHERIT=distutils-r1 xdg-utils
-IUSE=berkdb exif geo postscript +rcs +reports spell test python_single_target_python3_9 python_single_target_python3_10
+IUSE=berkdb exif geo postscript +rcs +reports spell test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] dev-python/pyicu[python_targets_python3_9(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_9(-),introspection] ) ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils berkdb? ( python_single_target_python3_9? ( dev-python/bsddb3[python_targets_python3_9(-)] ) ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] dev-python/pyicu[python_targets_python3_9(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_9(-),introspection] ) ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils berkdb? ( python_single_target_python3_9? ( dev-python/bsddb3[python_targets_python3_9(-)] ) ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test ) !berkdb? ( test )
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.5.tar.gz -> gramps-5.1.5.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e85a411baab76a4e4dc42c4d19516a60
+_md5_=42722e796076eaa5158914f1b7ad33ca
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.20 b/metadata/md5-cache/app-misc/hivex-1.3.20
index a2dd4e51649d..124dc95d5688 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.20
+++ b/metadata/md5-cache/app-misc/hivex-1.3.20
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 ) ) ruby? ( || ( ruby
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.20.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5e85941cc23298abb85975308677502d
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.21 b/metadata/md5-cache/app-misc/hivex-1.3.21
index e0b8c06aecb3..14c7be618cdd 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.21
+++ b/metadata/md5-cache/app-misc/hivex-1.3.21
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.21.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=86e96179cdac31d74bf9690598081245
diff --git a/metadata/md5-cache/app-misc/jq-1.7_pre20230210 b/metadata/md5-cache/app-misc/jq-1.7_pre20230210
index cbe9d9d48717..914091bbf8c2 100644
--- a/metadata/md5-cache/app-misc/jq-1.7_pre20230210
+++ b/metadata/md5-cache/app-misc/jq-1.7_pre20230210
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://stedolan.github.io/jq/
 INHERIT=autotools
 IUSE=+oniguruma static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
 LICENSE=MIT CC-BY-3.0
 RDEPEND=!static-libs? ( oniguruma? ( >=dev-libs/oniguruma-6.1.3[static-libs?] ) )
 REQUIRED_USE=test? ( oniguruma )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stedolan/jq/archive/cff5336ec71b6fee396a95bb0e4bea365e0cd1e8.tar.gz -> jq-1.7_pre20230210.gh.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=459f73ded81328a5ffcae9dc56ec7b5a
+_md5_=9104dc6ae401d44b769f7bc1410e4ead
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.2 b/metadata/md5-cache/app-misc/lirc-0.10.2
index bb685fb7dae4..581550c5cd01 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.2
+++ b/metadata/md5-cache/app-misc/lirc-0.10.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=8
 HOMEPAGE=https://www.lirc.org/
 INHERIT=linux-info python-single-r1 xdg-utils
-IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X python_single_target_python3_9 python_single_target_python3_10
+IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) ) inputlirc? ( app-misc/inputlircd )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) gtk? ( X )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject[python_targets_python3_11(-)] ) ) inputlirc? ( app-misc/inputlircd )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.2.tar.bz2
 _eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ffbfb4c1881526b4379d2a477f946d11
+_md5_=44db843bfe05009e786816266c24fe54
diff --git a/metadata/md5-cache/app-misc/ola-0.10.9 b/metadata/md5-cache/app-misc/ola-0.10.9
new file mode 100644
index 000000000000..0dbfc23851a0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ola-0.10.9
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-util/cppunit python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/protobuf-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/protobuf-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/protobuf-python[python_targets_python3_11(-)] ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/protobuf:= sys-apps/util-linux sys-libs/ncurses ftdi? ( dev-embedded/libftdi:1 ) http? ( net-libs/libmicrohttpd:= ) osc? ( media-libs/liblo ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/protobuf-python[python_targets_python3_11(-)] ) ) rdm-tests? ( python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) tcmalloc? ( dev-util/google-perftools:= ) usb? ( virtual/libusb:1 ) zeroconf? ( net-dns/avahi ) sys-kernel/linux-headers
+DESCRIPTION=Open Lighting Architecture, a framework for lighting control information
+EAPI=8
+HOMEPAGE=https://www.openlighting.org/ola/
+INHERIT=autotools python-single-r1
+IUSE=doc examples ftdi http osc python rdm-tests tcmalloc test usb zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/protobuf:= sys-apps/util-linux sys-libs/ncurses ftdi? ( dev-embedded/libftdi:1 ) http? ( net-libs/libmicrohttpd:= ) osc? ( media-libs/liblo ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/protobuf-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/protobuf-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/protobuf-python[python_targets_python3_11(-)] ) ) rdm-tests? ( python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) tcmalloc? ( dev-util/google-perftools:= ) usb? ( virtual/libusb:1 ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) rdm-tests? ( python )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenLightingProject/ola/releases/download/0.10.9/ola-0.10.9.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a40978e6b4b2872cbf116b47bbc178c2
diff --git a/metadata/md5-cache/app-misc/openrgb-0.7 b/metadata/md5-cache/app-misc/openrgb-0.7
deleted file mode 100644
index 2dc620cdf467..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1 dev-cpp/nlohmann_json
-DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
-EAPI=8
-HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
-INHERIT=flag-o-matic qmake-utils
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
-SLOT=0/2
-SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.7/OpenRGB-release_0.7.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e76d5a8bc366a50f60e3a2886ad3f855
diff --git a/metadata/md5-cache/app-misc/openrgb-0.7-r1 b/metadata/md5-cache/app-misc/openrgb-0.7-r1
deleted file mode 100644
index 5456ad6db6ec..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1 dev-cpp/nlohmann_json
-DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
-EAPI=8
-HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
-INHERIT=flag-o-matic qmake-utils udev
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
-SLOT=0/2
-SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.7/OpenRGB-release_0.7.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=9d807b196a4716e70c120f6c35c0f910
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0.8 b/metadata/md5-cache/app-misc/openrgb-plugin-effects-0.8
index 999e29297ca3..75ca9223b363 100644
--- a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0.8
+++ b/metadata/md5-cache/app-misc/openrgb-plugin-effects-0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Plugin for OpenRGB with various Effects that can be synced across de
 EAPI=8
 HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin
 INHERIT=qmake-utils
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 MIT
 RDEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] media-libs/openal
 SLOT=0
 SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/release_0.8/OpenRGBEffectsPlugin-release_0.8.tar.bz2 https://github.com/SRombauts/SimplexNoise/archive/97e62c5b5e26c8edabdc29a6b0a277192be3746c.tar.gz -> SimplexNoise-2019-12-03.tar.gz https://github.com/justxi/QCodeEditor/archive/a9aab24c7970a38d14bc79939306d9d3ba78cf61.tar.gz -> QCodeEditor-2021-08-17.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a3c9773ccd81ab20b4ee0e78d68acc1b
+_md5_=3cf1d3f06e6616a63823d21ca1764e25
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20220110 b/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20220110
deleted file mode 100644
index f19020ac7801..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20220110
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] media-libs/openal dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB with various Effects that can be synced across devices
-EAPI=8
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin
-INHERIT=qmake-utils
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] media-libs/openal
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/a7222bdbcd3c52e13d96993a33c5648f1306aeba/OpenRGBEffectsPlugin-a7222bdbcd3c52e13d96993a33c5648f1306aeba.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=df0af1b339c68fa3e2fb5309b5c52b30
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0.8 b/metadata/md5-cache/app-misc/openrgb-plugin-skin-0.8
index a73971b577c2..acce68bfa32c 100644
--- a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0.8
+++ b/metadata/md5-cache/app-misc/openrgb-plugin-skin-0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Plugin for OpenRGB that allows you to customize the look and feel of
 EAPI=8
 HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin
 INHERIT=qmake-utils
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=app-misc/openrgb-0.8:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin/-/archive/release_0.8/OpenRGBSkinPlugin-release_0.8.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=efdf88939847d20f3fd8e6fa692afd23
+_md5_=00a3781aff9763f440cc198b9d30fabc
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20211230 b/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20211230
deleted file mode 100644
index a565606a5f2f..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20211230
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB
-EAPI=8
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBSkinPlugin
-INHERIT=qmake-utils
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/ebb80f7bd0e1efaa995f60454f3c049a4607bc3b/openrgbskinplugin-ebb80f7bd0e1efaa995f60454f3c049a4607bc3b.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d07767d15cbd4d52d424480cddb3a8c3
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0.8 b/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0.8
index 8966cf23efc6..33f33646ea5a 100644
--- a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0.8
+++ b/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Plugin for OpenRGB to create virtual devices out of multiple real on
 EAPI=8
 HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin
 INHERIT=qmake-utils
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=app-misc/openrgb-0.8:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/release_0.8/OpenRGBVisualMapPlugin-release_0.8.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3e49341a6d53e43eb7aa4078ff6daabf
+_md5_=9d0710cd1f3c9fac6fd369efb913d49c
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20211230 b/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20211230
deleted file mode 100644
index 992b56da9b8a..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20211230
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB to create virtual devices out of multiple real ones
-EAPI=8
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin
-INHERIT=qmake-utils
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=>=app-misc/openrgb-0.7:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/223c5ec67d256c5fa3bf7f3d572213114d93db6e/OpenRGBVisualMapPlugin-223c5ec67d256c5fa3bf7f3d572213114d93db6e.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=717bd3a7e410fd441ea5d9d48ca34b44
diff --git a/metadata/md5-cache/app-misc/rmlint-2.10.1 b/metadata/md5-cache/app-misc/rmlint-2.10.1
deleted file mode 100644
index 9e433844b2db..000000000000
--- a/metadata/md5-cache/app-misc/rmlint-2.10.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ) nls? ( sys-devel/gettext ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-shells/dash python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] dev-python/parameterized[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyxattr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] dev-python/parameterized[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyxattr[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0=
-DESCRIPTION=Extremely fast tool to remove duplicates and other lint from your filesystem
-EAPI=7
-HOMEPAGE=https://rmlint.readthedocs.io/
-INHERIT=gnome2-utils python-single-r1 scons-utils toolchain-funcs xdg-utils
-IUSE=doc gui nls test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0= gui? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) x11-libs/gtksourceview:3.0 python_single_target_python3_9? ( dev-python/colorlog[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorlog[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sahib/rmlint/archive/v2.10.1.tar.gz -> rmlint-2.10.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2173aaa6da4e8d09a3a69942649d36e5
diff --git a/metadata/md5-cache/app-misc/rmlint-2.10.1-r1 b/metadata/md5-cache/app-misc/rmlint-2.10.1-r1
new file mode 100644
index 000000000000..f30897191231
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rmlint-2.10.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_11(-)] ) ) nls? ( sys-devel/gettext ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-shells/dash python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] dev-python/parameterized[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyxattr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] dev-python/parameterized[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyxattr[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/nose[python_targets_python3_11(-)] dev-python/parameterized[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyxattr[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0=
+DESCRIPTION=Extremely fast tool to remove duplicates and other lint from your filesystem
+EAPI=8
+HOMEPAGE=https://rmlint.readthedocs.io/
+INHERIT=gnome2-utils python-single-r1 scons-utils toolchain-funcs
+IUSE=doc gui nls test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0= gui? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) x11-libs/gtksourceview:3.0 python_single_target_python3_9? ( dev-python/colorlog[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorlog[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/colorlog[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sahib/rmlint/archive/v2.10.1.tar.gz -> rmlint-2.10.1.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2fd284807952123bf31ae03f28f0f251
diff --git a/metadata/md5-cache/app-misc/solaar-1.1.8-r1 b/metadata/md5-cache/app-misc/solaar-1.1.8-r1
new file mode 100644
index 000000000000..0c00e8df83af
--- /dev/null
+++ b/metadata/md5-cache/app-misc/solaar-1.1.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Linux Device Manager for Logitech Unifying Receivers and Paired Devices
+EAPI=7
+HOMEPAGE=https://pwr-solaar.github.io/Solaar/
+INHERIT=linux-info udev xdg distutils-r1
+IUSE=doc appindicator libnotify python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/plugdev python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-evdev[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] >=dev-python/pyudev-0.13[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psutil[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-evdev[python_targets_python3_10(-)] dev-python/python-xlib[python_targets_python3_10(-)] >=dev-python/pyudev-0.13[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psutil[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-evdev[python_targets_python3_11(-)] dev-python/python-xlib[python_targets_python3_11(-)] >=dev-python/pyudev-0.13[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] appindicator? ( dev-libs/libayatana-appindicator ) libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.1.8.tar.gz -> solaar-1.1.8.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fc71e558c2a929d07d509614f26b4a82
diff --git a/metadata/md5-cache/app-misc/vit-2.2.0 b/metadata/md5-cache/app-misc/vit-2.2.0
new file mode 100644
index 000000000000..89e6ab92dc4d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/vit-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-python/tasklib-2.4.3[python_targets_python3_9(-)] >=dev-python/urwid-2.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/tasklib-2.4.3[python_targets_python3_10(-)] >=dev-python/urwid-2.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/tasklib-2.4.3[python_targets_python3_11(-)] >=dev-python/urwid-2.1.2[python_targets_python3_11(-)] ) test? ( app-misc/task python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=A lightweight, fast, curses-based front end to Taskwarrior
+EAPI=8
+HOMEPAGE=https://github.com/vit-project/vit https://pypi.org/project/vit/
+INHERIT=distutils-r1 pypi
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-misc/task python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/v/vit/vit-2.2.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=24b88ec2cd8e403c8a23237c00c8e7e8
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 3ad54e64b1f8..790eb64791de 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/libreoffice-l10n-7.5.1.1 b/metadata/md5-cache/app-office/libreoffice-l10n-7.5.1.1
deleted file mode 100644
index fefa183f3d59..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-7.5.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=8
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=rpm
-IUSE=offlinehelp l10n_am l10n_ar l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_lo l10n_lt l10n_lv l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sid l10n_sk l10n_sl l10n_sq l10n_sv l10n_ta l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_as l10n_be l10n_br l10n_brx l10n_ckb l10n_cy l10n_dgo l10n_dsb l10n_fa l10n_fur l10n_fy l10n_ga l10n_gd l10n_gug l10n_hsb l10n_kab l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_rw l10n_sa l10n_sat l10n_sd l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_szl l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_vec l10n_xh l10n_zu
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ar? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ar.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_lo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lo.tar.gz ) ) l10n_lt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lt.tar.gz ) ) l10n_lv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_lv.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ro? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ro.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sid? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sid.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_ta? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ta.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_ckb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ckb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ckb.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_dsb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_dsb.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_fur? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fur.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fur.tar.gz ) l10n_fy? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_fy.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_hsb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_hsb.tar.gz ) l10n_kab? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kab.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kab.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_szl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_szl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_szl.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_vec? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vec.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_vec.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.5.1.1_Linux_x86-64_rpm_langpack_zu.tar.gz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0
-_md5_=b959f24032015469d43e80778a80e474
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-7.5.1.2 b/metadata/md5-cache/app-office/libreoffice-l10n-7.5.1.2
new file mode 100644
index 000000000000..91daea073346
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-7.5.1.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=compile configure install prepare unpack
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=8
+HOMEPAGE=https://www.libreoffice.org
+INHERIT=rpm
+IUSE=offlinehelp l10n_am l10n_ar l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_lo l10n_lt l10n_lv l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sid l10n_sk l10n_sl l10n_sq l10n_sv l10n_ta l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_as l10n_be l10n_br l10n_brx l10n_ckb l10n_cy l10n_dgo l10n_dsb l10n_fa l10n_fur l10n_fy l10n_ga l10n_gd l10n_gug l10n_hsb l10n_kab l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_rw l10n_sa l10n_sat l10n_sd l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_szl l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_vec l10n_xh l10n_zu
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ar? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ar.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_lo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lo.tar.gz ) ) l10n_lt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lt.tar.gz ) ) l10n_lv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_lv.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ro? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ro.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sid? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sid.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_ta? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ta.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_ckb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ckb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ckb.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_dsb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_dsb.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_fur? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fur.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fur.tar.gz ) l10n_fy? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_fy.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_hsb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_hsb.tar.gz ) l10n_kab? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kab.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kab.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_szl? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_szl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_szl.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_vec? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vec.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_vec.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/7.5.1/rpm/x86_64/LibreOffice_7.5.1_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.5.1/rpm/x86_64/LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.5.1.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0
+_md5_=b959f24032015469d43e80778a80e474
diff --git a/metadata/md5-cache/app-office/sc-im-0.8.3 b/metadata/md5-cache/app-office/sc-im-0.8.3
new file mode 100644
index 000000000000..4d3390968bd1
--- /dev/null
+++ b/metadata/md5-cache/app-office/sc-im-0.8.3
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/yacc virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/ncurses:= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ods? ( dev-libs/libxml2 dev-libs/libzip ) plots? ( sci-visualization/gnuplot ) tmux? ( app-misc/tmux ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) xls? ( dev-libs/libxls ) xlsx? ( dev-libs/libxlsxwriter dev-libs/libxml2 dev-libs/libzip )
+DESCRIPTION=Ncurses based, vim-like spreadsheet calculator
+EAPI=8
+HOMEPAGE=https://github.com/andmarti1424/sc-im
+INHERIT=lua-single toolchain-funcs flag-o-matic
+IUSE=lua ods plots tmux wayland X xls xlsx lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-4
+RDEPEND=sys-libs/ncurses:= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ods? ( dev-libs/libxml2 dev-libs/libzip ) plots? ( sci-visualization/gnuplot ) tmux? ( app-misc/tmux ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) xls? ( dev-libs/libxls ) xlsx? ( dev-libs/libxlsxwriter dev-libs/libxml2 dev-libs/libzip )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+SLOT=0
+SRC_URI=https://github.com/andmarti1424/sc-im/archive/v0.8.3.tar.gz -> sc-im-0.8.3.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fd9005d2ee685dd669e549be4b6e5ded
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 3cf81be204fb..a96fbdefcd66 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/gemato-18.0 b/metadata/md5-cache/app-portage/gemato-18.0
deleted file mode 100644
index 8efbf4cec401..000000000000
--- a/metadata/md5-cache/app-portage/gemato-18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=8
-HOMEPAGE=https://github.com/projg2/gemato/ https://pypi.org/project/gemato/
-INHERIT=distutils-r1
-IUSE=+gpg pretty-log tools test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/gemato/archive/v18.0.tar.gz -> gemato-18.0.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=115e0f5025b4eaed000bc39665a33e01
diff --git a/metadata/md5-cache/app-portage/gemato-19.0 b/metadata/md5-cache/app-portage/gemato-19.0
index db458ec0bcc8..8d44e22f744d 100644
--- a/metadata/md5-cache/app-portage/gemato-19.0
+++ b/metadata/md5-cache/app-portage/gemato-19.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/gemato/ https://pypi.org/project/gemato/
 INHERIT=distutils-r1
 IUSE=+gpg pretty-log tools test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/gemato/archive/v19.0.tar.gz -> gemato-19.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=be07855d08b6ee46af932240cef57600
+_md5_=115e0f5025b4eaed000bc39665a33e01
diff --git a/metadata/md5-cache/app-portage/gemato-20.0 b/metadata/md5-cache/app-portage/gemato-20.0
new file mode 100644
index 000000000000..2ad26bc5bd7b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gemato-20.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=8
+HOMEPAGE=https://github.com/projg2/gemato/ https://pypi.org/project/gemato/
+INHERIT=distutils-r1
+IUSE=+gpg pretty-log tools test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) pretty-log? ( dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/projg2/gemato/archive/v20.0.tar.gz -> gemato-20.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=be07855d08b6ee46af932240cef57600
diff --git a/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1 b/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
index 8826ddb5971f..84e4f43095bd 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
+++ b/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/java-ebuilder.git/snapshot/java-ebuilder-0.5.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=236bc1b36bdbe638ac48bded5871d084
diff --git a/metadata/md5-cache/app-portage/java-ebuilder-9999 b/metadata/md5-cache/app-portage/java-ebuilder-9999
index 57f84783861d..932556210a0b 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-9999
+++ b/metadata/md5-cache/app-portage/java-ebuilder-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=virtual/jre-1.8:* sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=236bc1b36bdbe638ac48bded5871d084
diff --git a/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.1 b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.1
new file mode 100644
index 000000000000..f8fb7fa59990
--- /dev/null
+++ b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Packages testing tools for Gentoo
+EAPI=8
+HOMEPAGE=https://github.com/slashbeast/pkg-testing-tools
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/slashbeast/pkg-testing-tools/archive/refs/tags/v0.1.1.tar.gz -> pkg-testing-tools-0.1.1.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=37a6a3fc6a141a05308064b9a8c9d8c5
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 4493c77370d6..3597c4c4e2c3 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/bash-5.1_p16-r3 b/metadata/md5-cache/app-shells/bash-5.1_p16-r3
new file mode 100644
index 000000000000..577770b33e18
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.1_p16-r3
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/yacc verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html
+INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig ) mirror://gnu//bash-5.1-patches/bash51-001 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ) mirror://gnu//bash-5.1-patches/bash51-002 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ) mirror://gnu//bash-5.1-patches/bash51-003 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ) mirror://gnu//bash-5.1-patches/bash51-004 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ) mirror://gnu//bash-5.1-patches/bash51-005 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ) mirror://gnu//bash-5.1-patches/bash51-006 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ) mirror://gnu//bash-5.1-patches/bash51-007 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ) mirror://gnu//bash-5.1-patches/bash51-008 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ) mirror://gnu//bash-5.1-patches/bash51-009 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ) mirror://gnu//bash-5.1-patches/bash51-010 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ) mirror://gnu//bash-5.1-patches/bash51-011 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ) mirror://gnu//bash-5.1-patches/bash51-012 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ) mirror://gnu//bash-5.1-patches/bash51-013 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ) mirror://gnu//bash-5.1-patches/bash51-014 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ) mirror://gnu//bash-5.1-patches/bash51-015 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ) mirror://gnu//bash-5.1-patches/bash51-016 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-016.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig ) https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.1_p16-patches.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=42cac591f6db0bd47139d14f65570b4d
diff --git a/metadata/md5-cache/app-shells/yash-2.54 b/metadata/md5-cache/app-shells/yash-2.54
new file mode 100644
index 000000000000..3e32abb2d174
--- /dev/null
+++ b/metadata/md5-cache/app-shells/yash-2.54
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( sys-devel/gettext ) test? ( sys-apps/ed )
+DEFINED_PHASES=configure
+DEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
+DESCRIPTION=Yash is a POSIX-compliant command line shell
+EAPI=8
+HOMEPAGE=https://yash.osdn.jp/
+INHERIT=flag-o-matic plocale toolchain-funcs
+IUSE=nls test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/yash/78345/yash-2.54.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ed2c091e6bf3d051641ee5ec12612910
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 79a0e53b2f5d..60816e26fb6e 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/docbook-xsl-stylesheets-1.79.1-r3 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
index 0b96b8ea35c2..9509bf77333e 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
@@ -6,9 +6,9 @@ INHERIT=ruby-single
 IUSE=ruby
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems )
+RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
-_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22
+_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=9bbf6a5b7752bd87620940121aeb256a
diff --git a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1 b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
index 715ec42a4c83..25b653072583 100644
--- a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/58
 SRC_URI=https://github.com/htacg/tidy-html5/archive/refs/tags/5.8.0.tar.gz -> htmltidy-5.8.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=92caf711db601e3f4044773a01fc3e51
diff --git a/metadata/md5-cache/app-text/hunspell-1.7.2 b/metadata/md5-cache/app-text/hunspell-1.7.2
index a4387c0be949..f9ed832768cf 100644
--- a/metadata/md5-cache/app-text/hunspell-1.7.2
+++ b/metadata/md5-cache/app-text/hunspell-1.7.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hunspell.github.io/
 INHERIT=autotools flag-o-matic
 IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
 RDEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= )
 SLOT=0/1.7
 SRC_URI=https://github.com/hunspell/hunspell/releases/download/v1.7.2/hunspell-1.7.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1daf32044e57427b562b7d90f15993b3
+_md5_=212586fad656c044893cf0b40bd951a3
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2 b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
index b7d5061ac433..c6e92c93ee74 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d4d0f7781fc8186cfe22b2c2d6072277
diff --git a/metadata/md5-cache/app-text/iso-codes-4.13.0 b/metadata/md5-cache/app-text/iso-codes-4.13.0
new file mode 100644
index 000000000000..1f7a144c7a63
--- /dev/null
+++ b/metadata/md5-cache/app-text/iso-codes-4.13.0
@@ -0,0 +1,13 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) sys-devel/gettext
+DEFINED_PHASES=prepare setup
+DESCRIPTION=ISO language, territory, currency, script codes and their translations
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
+INHERIT=python-any-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.13.0/iso-codes-v4.13.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=485200c4f10755d709aab0d9281b406b
diff --git a/metadata/md5-cache/app-text/kbibtex-0.9.2-r1 b/metadata/md5-cache/app-text/kbibtex-0.9.2-r1
deleted file mode 100644
index 6df66cbeb3fc..000000000000
--- a/metadata/md5-cache/app-text/kbibtex-0.9.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=dev-qt/qtxmlpatterns-5.15.5: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/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/kparts-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/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.15.5:5[widgets] ) zotero? ( >=app-crypt/qca-2.3.0:2[qt5(+)] dev-libs/qoauth:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
-EAPI=8
-HOMEPAGE=https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm kde.org optfeature
-IUSE=webengine zotero debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=dev-qt/qtxmlpatterns-5.15.5: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/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/kparts-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/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.15.5:5[widgets] ) zotero? ( >=app-crypt/qca-2.3.0:2[qt5(+)] dev-libs/qoauth:5 ) dev-tex/bibtex2html || ( 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/KBibTeX/0.9.2/kbibtex-0.9.2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=94d9c0aebbe7be1cccec35c202743487
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.17 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.17
index 29cad1520d72..23720006388d 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.17
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cdebbecfa2ef90b82521054a73590dcd
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.18 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.18
index fcad1f1321f9..f0e1364a4086 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.18
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.18.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3233d57c9b361b0c2f8f4dddb5a6c7da
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.21 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.21
index 04b66c80d6f4..6b291c84d5e5 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.21
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.21
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.21.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9269f6a018e59e1361989f30be14fd52
diff --git a/metadata/md5-cache/app-text/kramdown-rfc-1.6.22 b/metadata/md5-cache/app-text/kramdown-rfc-1.6.22
index 26dc4729641e..2065fddabfe9 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc-1.6.22
+++ b/metadata/md5-cache/app-text/kramdown-rfc-1.6.22
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.6.22.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9269f6a018e59e1361989f30be14fd52
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.10 b/metadata/md5-cache/app-text/libspectre-0.2.10
deleted file mode 100644
index de58006fd9cb..000000000000
--- a/metadata/md5-cache/app-text/libspectre-0.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DEPEND=>=app-text/ghostscript-gpl-9.53.0:=
-DESCRIPTION=Library for rendering Postscript documents
-EAPI=8
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
-IUSE=debug doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/ghostscript-gpl-9.53.0:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.10.tar.gz
-_md5_=7d0d54df6f2252834605e48d4be3196f
diff --git a/metadata/md5-cache/app-text/libspectre-0.2.11 b/metadata/md5-cache/app-text/libspectre-0.2.11
index b04f1ae2eb86..a5037cfadb7b 100644
--- a/metadata/md5-cache/app-text/libspectre-0.2.11
+++ b/metadata/md5-cache/app-text/libspectre-0.2.11
@@ -5,10 +5,10 @@ DESCRIPTION=Library for rendering Postscript documents
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
 IUSE=debug doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-9.53.0:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.11.tar.gz
-_md5_=8a2b445646ad18281931c50089425dc2
+_md5_=0c0bce05669820898395c56a204a2d49
diff --git a/metadata/md5-cache/app-text/mupdf-1.21.1-r1 b/metadata/md5-cache/app-text/mupdf-1.21.1-r1
new file mode 100644
index 000000000000..137a3de4485e
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.21.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=X? ( x11-base/xorg-proto ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-libs/gumbo media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext )
+DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
+EAPI=8
+HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
+IUSE=+drm +javascript opengl ssl X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/gumbo media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext )
+REQUIRED_USE=opengl? ( javascript )
+SLOT=0/1.21.1
+SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.21.1-source.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4dfbb7a419a082bb4e3d2997ce68c0ad
diff --git a/metadata/md5-cache/app-text/pandoc-bin-3.0.1 b/metadata/md5-cache/app-text/pandoc-bin-3.0.1
index 9c28d9954bb7..6b1e5b215737 100644
--- a/metadata/md5-cache/app-text/pandoc-bin-3.0.1
+++ b/metadata/md5-cache/app-text/pandoc-bin-3.0.1
@@ -3,9 +3,9 @@ DESCRIPTION=Conversion between markup formats (binary package)
 EAPI=8
 HOMEPAGE=https://pandoc.org/ https://github.com/jgm/pandoc/
 IUSE=+pandoc-symlink
-KEYWORDS=-* ~amd64 ~arm64
+KEYWORDS=-* amd64 arm64
 LICENSE=GPL-2+
 RDEPEND=pandoc-symlink? ( !app-text/pandoc )
 SLOT=0
 SRC_URI=amd64? ( https://github.com/jgm/pandoc/releases/download/3.0.1/pandoc-3.0.1-linux-amd64.tar.gz ) arm64? ( https://github.com/jgm/pandoc/releases/download/3.0.1/pandoc-3.0.1-linux-arm64.tar.gz )
-_md5_=9de2481ca42246e96194be468def2f3c
+_md5_=e442be8235bc1d246765ad2eea234986
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.3 b/metadata/md5-cache/app-text/pdftk-3.3.3
index effc72af4f27..1d932ee9e3ca 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.3
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/v3.3.3/pdftk-v3.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=aa638e153893b294cea8435323cd32db
diff --git a/metadata/md5-cache/app-text/pytextile-4.0.2 b/metadata/md5-cache/app-text/pytextile-4.0.2
new file mode 100644
index 000000000000..0472f5cfa15c
--- /dev/null
+++ b/metadata/md5-cache/app-text/pytextile-4.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/html5lib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python port of Textile, A humane web text generator
+EAPI=8
+HOMEPAGE=https://github.com/textile/python-textile/ https://pypi.org/project/textile/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/html5lib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/textile/python-textile/archive/4.0.2.tar.gz -> python-textile-4.0.2.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cecbbb83dc2ece81e10b3ef0c6529adf
diff --git a/metadata/md5-cache/app-text/qpdf-11.3.0 b/metadata/md5-cache/app-text/qpdf-11.3.0
new file mode 100644
index 000000000000..3545a00d8834
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-11.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl doc? ( app-arch/unzip ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=8
+HOMEPAGE=https://qpdf.sourceforge.net/
+INHERIT=cmake bash-completion-r1
+IUSE=doc examples gnutls ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
+LICENSE=|| ( Apache-2.0 Artistic-2 )
+RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.3.0/qpdf-11.3.0.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.3.0/qpdf-11.3.0-doc.zip )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=95f52755c8c7815bd744f001ae5fc9b0
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227 b/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
deleted file mode 100644
index 0f4d086f4e0c..000000000000
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_p20211227
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5[cups?] dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A tabbed document viewer
-EAPI=7
-HOMEPAGE=https://launchpad.net/qpdfview
-INHERIT=plocale qmake-utils xdg
-IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5[cups?] dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
-REQUIRED_USE=?? ( fitz pdf )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_p20211227.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d0bb50c5adbb4b56391ff59c0d0ad73e
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r4 b/metadata/md5-cache/app-text/ronn-0.7.3-r4
index 2ffbddea4123..027fb51976af 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r4
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=233f5916ff605288afb558b43b1147c7
diff --git a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2 b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
index c310e8785563..7f14fc74b7dd 100644
--- a/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
+++ b/metadata/md5-cache/app-text/ronn-ng-0.9.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-ng-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a71adb8041a0974accec1639e82b3093
diff --git a/metadata/md5-cache/app-text/sword-modules-2.6 b/metadata/md5-cache/app-text/sword-modules-2.6
deleted file mode 100644
index 25953750b008..000000000000
--- a/metadata/md5-cache/app-text/sword-modules-2.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=All the unlocked modules for app-text/sword, grouped by language
-EAPI=8
-HOMEPAGE=https://www.crosswire.org/sword/modules/
-IUSE=esoteric l10n_af l10n_ar l10n_az l10n_be l10n_bea l10n_bg l10n_br l10n_ceb l10n_ch l10n_chr l10n_ckb l10n_cop l10n_cs l10n_cu 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_gd l10n_gez l10n_got l10n_grc l10n_gv l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_it l10n_ja l10n_kek l10n_kk l10n_km l10n_ko l10n_kpg l10n_ktu l10n_la l10n_ln l10n_lt l10n_lv l10n_mg l10n_mi l10n_ml l10n_mn l10n_my l10n_nb l10n_nd l10n_nl l10n_nn l10n_pl l10n_pon l10n_pot l10n_ppk l10n_prs l10n_pt l10n_rmq l10n_ro l10n_ru l10n_sl l10n_sml l10n_sn l10n_so l10n_sq l10n_sr l10n_sv l10n_sw l10n_syr l10n_th l10n_tl l10n_tlh l10n_tr l10n_tsg l10n_ug l10n_uk l10n_ur l10n_vi l10n_vls l10n_zh
-KEYWORDS=~amd64 ~loong ~ppc ~riscv ~x86
-LICENSE=metapackage
-RDEPEND=|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs ) app-dicts/sword-Personal esoteric? ( app-dicts/sword-Phaistos app-dicts/sword-Sentiment ) l10n_af? ( app-dicts/sword-Afr1953 ) l10n_ar? ( app-dicts/sword-AraNAV app-dicts/sword-AraSVD app-dicts/sword-alzat ) l10n_az? ( app-dicts/sword-Azeri app-dicts/sword-NorthernAzeri ) l10n_be? ( app-dicts/sword-Bela ) l10n_bea? ( app-dicts/sword-BeaMRK ) l10n_bg? ( app-dicts/sword-BulCarigradNT app-dicts/sword-BulVeren ) l10n_br? ( app-dicts/sword-BretonNT app-dicts/sword-br_en ) l10n_ceb? ( app-dicts/sword-CebPinadayag ) l10n_ch? ( app-dicts/sword-Chamorro ) l10n_chr? ( app-dicts/sword-Che1860 ) l10n_ckb? ( app-dicts/sword-Sorani ) l10n_cop? ( app-dicts/sword-CopNT app-dicts/sword-CopSahBible2 app-dicts/sword-CopSahHorner app-dicts/sword-CopSahidicMSS app-dicts/sword-CopSahidica app-dicts/sword-SahidicBible ) l10n_cs? ( app-dicts/sword-CzeB21 app-dicts/sword-CzeBKR app-dicts/sword-CzeCEP app-dicts/sword-CzeCSP ) l10n_cu? ( app-dicts/sword-CSlElizabeth ) l10n_cy? ( app-dicts/sword-WelBeiblNet ) l10n_da? ( app-dicts/sword-DaNT1819 app-dicts/sword-DaOT1871NT1907 app-dicts/sword-DaOT1931NT1907 ) l10n_de? ( app-dicts/sword-GerAlbrecht app-dicts/sword-GerAugustinus app-dicts/sword-GerBoLut app-dicts/sword-GerElb1871 app-dicts/sword-GerElb1905 app-dicts/sword-GerGruenewald app-dicts/sword-GerKingComm app-dicts/sword-GerLeoNA28 app-dicts/sword-GerLeoRP18 app-dicts/sword-GerLutherpredigten app-dicts/sword-GerMenge app-dicts/sword-GerNeUe app-dicts/sword-GerOffBiSt app-dicts/sword-GerReinhardt app-dicts/sword-GerSch app-dicts/sword-GerTafel app-dicts/sword-GerTextbibel app-dicts/sword-GerZurcher app-dicts/sword-MAK app-dicts/sword-Rieger ) l10n_el? ( app-dicts/sword-GreVamvas ) l10n_en? ( app-dicts/sword-2BabDict app-dicts/sword-AB app-dicts/sword-ABP app-dicts/sword-ABS_Essay_GoodSam_SWB app-dicts/sword-ACV app-dicts/sword-AKJV app-dicts/sword-ASV app-dicts/sword-Abbott app-dicts/sword-AbbottSmith app-dicts/sword-AbbottSmithStrongs app-dicts/sword-AmTract app-dicts/sword-Anderson app-dicts/sword-BBE app-dicts/sword-BDBGlosses_Strongs app-dicts/sword-BWE app-dicts/sword-BaptistConfession1646 app-dicts/sword-BaptistConfession1689 app-dicts/sword-Barnes app-dicts/sword-Burkitt app-dicts/sword-CBC app-dicts/sword-CPDV app-dicts/sword-Catena app-dicts/sword-Cawdrey app-dicts/sword-Clarke app-dicts/sword-Common app-dicts/sword-Concord app-dicts/sword-DBD app-dicts/sword-DRC app-dicts/sword-DTN app-dicts/sword-Daily app-dicts/sword-Darby app-dicts/sword-DarkNightOfTheSoul app-dicts/sword-Diaglott app-dicts/sword-Dodson app-dicts/sword-EMBReality app-dicts/sword-EMTV app-dicts/sword-Easton app-dicts/sword-Etheridge app-dicts/sword-Family app-dicts/sword-Finney app-dicts/sword-Geneva app-dicts/sword-Geneva1599 app-dicts/sword-Godbey app-dicts/sword-GodsWord app-dicts/sword-Heretics app-dicts/sword-Hitchcock app-dicts/sword-ISBE app-dicts/sword-ISV app-dicts/sword-Imitation app-dicts/sword-Institutes app-dicts/sword-JCRHoliness app-dicts/sword-JEAffections app-dicts/sword-JESermons app-dicts/sword-JFB app-dicts/sword-JOChrist app-dicts/sword-JOCommGod app-dicts/sword-JOGlory app-dicts/sword-JOMortSin app-dicts/sword-JPS app-dicts/sword-JST app-dicts/sword-Josephus app-dicts/sword-Jubilee2000 app-dicts/sword-KD app-dicts/sword-KJV app-dicts/sword-KJVA app-dicts/sword-KJVPCE app-dicts/sword-KingComm app-dicts/sword-LEB app-dicts/sword-LITV app-dicts/sword-LO app-dicts/sword-LawGospel app-dicts/sword-Leeser app-dicts/sword-Lightfoot app-dicts/sword-Luther app-dicts/sword-MHC app-dicts/sword-MHCC app-dicts/sword-MKJV app-dicts/sword-MLStrong app-dicts/sword-MollColossians app-dicts/sword-Montgomery app-dicts/sword-Murdock app-dicts/sword-NETfree app-dicts/sword-NETnotesfree app-dicts/sword-NETtext app-dicts/sword-NHEB app-dicts/sword-NHEBJE app-dicts/sword-NHEBME app-dicts/sword-Nave app-dicts/sword-Noyes app-dicts/sword-OEB app-dicts/sword-OEBcth app-dicts/sword-OSHM app-dicts/sword-OrthJBC app-dicts/sword-Orthodoxy app-dicts/sword-PNT app-dicts/sword-Packard app-dicts/sword-Passion app-dicts/sword-Pilgrim app-dicts/sword-Practice app-dicts/sword-QuotingPassages app-dicts/sword-RKJNT app-dicts/sword-RNKJV app-dicts/sword-RWP app-dicts/sword-RWebster app-dicts/sword-RecVer app-dicts/sword-Robinson app-dicts/sword-Rotherham app-dicts/sword-SAOA app-dicts/sword-SME app-dicts/sword-SPE app-dicts/sword-Scofield app-dicts/sword-Smith app-dicts/sword-Spurious app-dicts/sword-StrongsGreek app-dicts/sword-StrongsHebrew app-dicts/sword-TCR app-dicts/sword-TDavid app-dicts/sword-TFG app-dicts/sword-TSK app-dicts/sword-Torrey app-dicts/sword-Twenty app-dicts/sword-Tyndale app-dicts/sword-UKJV app-dicts/sword-Webster app-dicts/sword-Webster1806 app-dicts/sword-Webster1913 app-dicts/sword-Wesley app-dicts/sword-Westminster app-dicts/sword-Westminster21 app-dicts/sword-Weymouth app-dicts/sword-Worsley app-dicts/sword-Wycliffe app-dicts/sword-YLT ) l10n_eo? ( app-dicts/sword-Esperanto ) l10n_es? ( app-dicts/sword-SpaPlatense app-dicts/sword-SpaRV app-dicts/sword-SpaRV1865 app-dicts/sword-SpaRV1909 app-dicts/sword-SpaRVG app-dicts/sword-SpaTDP app-dicts/sword-SpaVNT ) l10n_et? ( app-dicts/sword-Est ) l10n_eu? ( app-dicts/sword-BasHautin app-dicts/sword-en_eu ) l10n_fa? ( app-dicts/sword-FarHezareNoh app-dicts/sword-FarOPV app-dicts/sword-FarTPV ) l10n_fi? ( app-dicts/sword-FinBiblia app-dicts/sword-FinPR app-dicts/sword-FinPR92 app-dicts/sword-FinRK app-dicts/sword-FinSTLK2017 ) l10n_fr? ( app-dicts/sword-FreAug app-dicts/sword-FreBBB app-dicts/sword-FreBDM1707 app-dicts/sword-FreBDM1744 app-dicts/sword-FreBailly app-dicts/sword-FreCJE app-dicts/sword-FreChry app-dicts/sword-FreCrampon app-dicts/sword-FreDAW app-dicts/sword-FreGBM app-dicts/sword-FreGeneve1669 app-dicts/sword-FreJND app-dicts/sword-FreKhan app-dicts/sword-FreLSN1872 app-dicts/sword-FreLXX app-dicts/sword-FreOltramare1874 app-dicts/sword-FrePGR app-dicts/sword-FrePilgrim app-dicts/sword-FreSegond1910 app-dicts/sword-FreStapfer1889 app-dicts/sword-FreSynodale1921 ) l10n_ga? ( app-dicts/sword-IriODomhnuill ) l10n_gd? ( app-dicts/sword-ScotsGaelic ) l10n_gez? ( app-dicts/sword-Geez ) l10n_got? ( app-dicts/sword-Wulfila ) l10n_grc? ( app-dicts/sword-ABPGRK app-dicts/sword-Antoniades app-dicts/sword-Byz app-dicts/sword-Elzevir app-dicts/sword-GreekHebrew app-dicts/sword-LXX app-dicts/sword-MorphGNT app-dicts/sword-Nestle1904 app-dicts/sword-OxfordTR app-dicts/sword-SBLGNT app-dicts/sword-SBLGNTApp app-dicts/sword-TNT app-dicts/sword-TR app-dicts/sword-Tisch app-dicts/sword-VarApp app-dicts/sword-WHNU app-dicts/sword-f35 ) l10n_gv? ( app-dicts/sword-ManxGaelic ) l10n_he? ( app-dicts/sword-Aleppo app-dicts/sword-HebDelitzsch app-dicts/sword-HebModern app-dicts/sword-HebrewGreek app-dicts/sword-MapM app-dicts/sword-OSHB app-dicts/sword-SP app-dicts/sword-SPDSS app-dicts/sword-SPMT app-dicts/sword-SPVar app-dicts/sword-WLC ) l10n_hi? ( app-dicts/sword-HinERV ) l10n_hr? ( app-dicts/sword-CroSaric ) l10n_ht? ( app-dicts/sword-Haitian ) l10n_hu? ( app-dicts/sword-HunIMIT app-dicts/sword-HunKNB app-dicts/sword-HunKar app-dicts/sword-HunRUF app-dicts/sword-HunUj ) l10n_hy? ( app-dicts/sword-ArmEastern app-dicts/sword-ArmWestern ) l10n_it? ( app-dicts/sword-ItDizGreco app-dicts/sword-ItNomiBibbia app-dicts/sword-ItaDio app-dicts/sword-ItaRive ) l10n_ja? ( app-dicts/sword-JapBungo app-dicts/sword-JapDenmo app-dicts/sword-JapKougo app-dicts/sword-JapMeiji app-dicts/sword-JapRaguet ) l10n_kek? ( app-dicts/sword-Kekchi ) l10n_kk? ( app-dicts/sword-Kaz ) l10n_km? ( app-dicts/sword-KhmerNT ) l10n_ko? ( app-dicts/sword-KorHKJV app-dicts/sword-KorRV ) l10n_kpg? ( app-dicts/sword-Kapingamarangi ) l10n_ktu? ( app-dicts/sword-KtuVB ) l10n_la? ( app-dicts/sword-VulgClementine app-dicts/sword-VulgConte app-dicts/sword-VulgGlossa app-dicts/sword-VulgHetzenauer app-dicts/sword-VulgSistine app-dicts/sword-Vulgate app-dicts/sword-Vulgate_HebPs app-dicts/sword-la_en ) l10n_ln? ( app-dicts/sword-LinVB ) l10n_lt? ( app-dicts/sword-LtKBB ) l10n_lv? ( app-dicts/sword-Latvian app-dicts/sword-LvGluck8 ) l10n_mg? ( app-dicts/sword-Mg1865 ) l10n_mi? ( app-dicts/sword-Maori ) l10n_ml? ( app-dicts/sword-Mal1910 ) l10n_mn? ( app-dicts/sword-MonKJV ) l10n_my? ( app-dicts/sword-BurCBCM app-dicts/sword-BurJudson ) l10n_nb? ( app-dicts/sword-NorBroed app-dicts/sword-Norsk ) l10n_nd? ( app-dicts/sword-Ndebele ) l10n_nl? ( app-dicts/sword-DutKant app-dicts/sword-DutKingComm app-dicts/sword-DutSVV app-dicts/sword-DutSVVA app-dicts/sword-NlCanisius1939 ) l10n_nn? ( app-dicts/sword-NorSMB ) l10n_pl? ( app-dicts/sword-PolGdanska app-dicts/sword-PolUGdanska ) l10n_pon? ( app-dicts/sword-PohnOld app-dicts/sword-Pohnpeian ) l10n_pot? ( app-dicts/sword-PotLykins ) l10n_ppk? ( app-dicts/sword-Uma ) l10n_prs? ( app-dicts/sword-Dari ) l10n_pt? ( app-dicts/sword-PorAR app-dicts/sword-PorAlmeida1911 app-dicts/sword-PorBLivre app-dicts/sword-PorBLivreTR app-dicts/sword-PorCap app-dicts/sword-PorIBP ) l10n_rmq? ( app-dicts/sword-Calo ) l10n_ro? ( app-dicts/sword-RomCor ) l10n_ru? ( app-dicts/sword-RusCARS app-dicts/sword-RusCARSA app-dicts/sword-RusCARSADICT app-dicts/sword-RusCARSDict app-dicts/sword-RusCARST app-dicts/sword-RusCARSTDICT app-dicts/sword-RusMakarij app-dicts/sword-RusSynodal app-dicts/sword-RusSynodalLIO app-dicts/sword-RusVZh ) l10n_sl? ( app-dicts/sword-SloKJV app-dicts/sword-SloOjacano app-dicts/sword-SloStritar ) l10n_sml? ( app-dicts/sword-sml_BL_2008 ) l10n_sn? ( app-dicts/sword-Shona ) l10n_so? ( app-dicts/sword-SomKQA ) l10n_sq? ( app-dicts/sword-Alb ) l10n_sr? ( app-dicts/sword-SrKDEkavski app-dicts/sword-SrKDIjekav ) l10n_sv? ( app-dicts/sword-Swe1917 app-dicts/sword-Swe1917Of app-dicts/sword-SweFolk1998 app-dicts/sword-SweKarlXII app-dicts/sword-SweKarlXII1873 ) l10n_sw? ( app-dicts/sword-Swahili ) l10n_syr? ( app-dicts/sword-Peshitta ) l10n_th? ( app-dicts/sword-ThaiKJV ) l10n_tl? ( app-dicts/sword-TagAngBiblia app-dicts/sword-Tagalog ) l10n_tlh? ( app-dicts/sword-KLV app-dicts/sword-KLVen_iklingon app-dicts/sword-KLViklingon_en ) l10n_tr? ( app-dicts/sword-TurHADI app-dicts/sword-TurNTB ) l10n_tsg? ( app-dicts/sword-Tausug ) l10n_ug? ( app-dicts/sword-UyCyr ) l10n_uk? ( app-dicts/sword-UkrKulish app-dicts/sword-Ukrainian ) l10n_ur? ( app-dicts/sword-UrduGeo app-dicts/sword-UrduGeoDeva app-dicts/sword-UrduGeoRoman ) l10n_vi? ( app-dicts/sword-FVDPVietAnh app-dicts/sword-VieRobinson app-dicts/sword-VieStrongsGreek app-dicts/sword-Viet app-dicts/sword-VietLCCMN app-dicts/sword-VietLCCMNCT app-dicts/sword-VietNVB ) l10n_vls? ( app-dicts/sword-vlsJoNT ) l10n_zh? ( app-dicts/sword-ChiNCVs app-dicts/sword-ChiNCVt app-dicts/sword-ChiSB app-dicts/sword-ChiUn app-dicts/sword-ChiUnL app-dicts/sword-ChiUns app-dicts/sword-ZhEnglish app-dicts/sword-ZhHanzi app-dicts/sword-ZhPinyin )
-SLOT=0
-_md5_=aaea3f75e920ae2828ea0c5f929837b1
diff --git a/metadata/md5-cache/app-text/texlive-core-2021-r5 b/metadata/md5-cache/app-text/texlive-core-2021-r5
deleted file mode 100644
index 03909ac9f607..000000000000
--- a/metadata/md5-cache/app-text/texlive-core-2021-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/ed sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=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:= dev-libs/mpfr:= >=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:=
-DESCRIPTION=A complete TeX distribution
-EAPI=7
-HOMEPAGE=https://tug.org/texlive/
-INHERIT=autotools flag-o-matic toolchain-funcs libtool texlive-common
-IUSE=cjk X doc source tk +luajittex xetex xindy
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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:= dev-libs/mpfr:= >=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_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	texlive-common	c918583cd52e23eacee8a4cb5a623ed0	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ed829aed0aadd05b6ad85542b29d3984
diff --git a/metadata/md5-cache/app-text/texlive-core-2021-r6 b/metadata/md5-cache/app-text/texlive-core-2021-r6
new file mode 100644
index 000000000000..92d2fbd5461d
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2021-r6
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/ed sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=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:= dev-libs/mpfr:= >=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:=
+DESCRIPTION=A complete TeX distribution
+EAPI=7
+HOMEPAGE=https://tug.org/texlive/
+INHERIT=autotools flag-o-matic toolchain-funcs libtool texlive-common
+IUSE=cjk X doc source tk +luajittex xetex xindy
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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:= dev-libs/mpfr:= >=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_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	texlive-common	c918583cd52e23eacee8a4cb5a623ed0	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3b093d302ed4d1f57bc4f8ec7b8c4bba
diff --git a/metadata/md5-cache/app-text/webgen-1.7.2 b/metadata/md5-cache/app-text/webgen-1.7.2
index ac973f3342d9..1aad4887357a 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.2
+++ b/metadata/md5-cache/app-text/webgen-1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webgen-1.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=46346ff9c8a436d82e1e9f425549f6e2
diff --git a/metadata/md5-cache/app-text/xmlformat-1.04 b/metadata/md5-cache/app-text/xmlformat-1.04
index 9ca8ae904ae3..901b2e1ec163 100644
--- a/metadata/md5-cache/app-text/xmlformat-1.04
+++ b/metadata/md5-cache/app-text/xmlformat-1.04
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install test
-DEPEND=ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
+DEPEND=ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
 DESCRIPTION=Reformat XML documents to your custom style
 EAPI=7
 HOMEPAGE=http://www.kitebird.com/software/xmlformat/
@@ -7,8 +7,8 @@ INHERIT=ruby-single
 IUSE=doc ruby
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=xmlformat
-RDEPEND=ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
+RDEPEND=ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.kitebird.com/software/xmlformat/xmlformat-1.04.tar.gz
-_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22
+_eclasses_=ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30
 _md5_=892f2b99747c323f2db63c2717006e66
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.10 b/metadata/md5-cache/app-text/zathura-cb-0.1.10
new file mode 100644
index 000000000000..738e5d78d791
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.10
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:3 x11-base/xorg-proto
+DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
+EAPI=8
+HOMEPAGE=https://pwmt.org/projects/zathura-cb/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson xdg
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=ZLIB
+RDEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://pwmt.org/projects/zathura-cb/download/zathura-cb-0.1.10.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a1359b5ffa49ced9ebfb01ad8ab96aea
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index 2ca9b6737d0d..d566e08c38d8 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -1,13 +1,14 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
+DEFINED_PHASES=compile configure install postinst postrm preinst test unpack
+DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:3 x11-base/xorg-proto
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-cb/
-INHERIT=meson xdg-utils optfeature git-r3
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson xdg git-r3
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
+RDEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:3
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=883317814f6b79574ed002816546efe0
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a1359b5ffa49ced9ebfb01ad8ab96aea
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 143658451a81..6da647ab7c1f 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/command-t-5.0.3-r1 b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
index 6a0b40c680ab..003a836cecc7 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.3-r1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
@@ -12,5 +12,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.3.tar.gz -> command-t-5.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=31081c81d39e742467c4372c3739ca6d
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 440b30424d33..28358a3ac048 100644
Binary files a/metadata/md5-cache/app-xemacs/Manifest.gz and b/metadata/md5-cache/app-xemacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.61 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.61
deleted file mode 100644
index 234005c8e031..000000000000
--- a/metadata/md5-cache/app-xemacs/ebuild-mode-1.61
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-INHERIT=optfeature
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.61.tar.xz
-_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=b126a1d8a1098aaa0470fac825a6a790
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.62 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.62
new file mode 100644
index 000000000000..4a776992ea70
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ebuild-mode-1.62
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+INHERIT=optfeature
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.62.tar.xz
+_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
+_md5_=30d514f3f4faecb648b436393abb64fc
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 065096db3ffc..98b2f13524b2 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/e3-testsuite-25.0 b/metadata/md5-cache/dev-ada/e3-testsuite-25.0
index d8e57f5f3518..9e115545dc43 100644
--- a/metadata/md5-cache/dev-ada/e3-testsuite-25.0
+++ b/metadata/md5-cache/dev-ada/e3-testsuite-25.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ada/e3-core[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-ada/e3-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ada/e3-core[python_targets_python3_10(-)?]
+DEPEND=dev-ada/e3-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Generic testsuite framework in Python
 EAPI=8
 HOMEPAGE=https://www.adacore.com/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10
+IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/e3-core[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
+RDEPEND=dev-ada/e3-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/e3-testsuite/archive/refs/tags/v25.0.tar.gz -> e3-testsuite-25.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b460c70a741e68136c8ecd1efe16fcfc
+_md5_=2d7afe2f873d3eb53e70f6aeeada9b2b
diff --git a/metadata/md5-cache/dev-ada/libadalang-23.0.0 b/metadata/md5-cache/dev-ada/libadalang-23.0.0
deleted file mode 100644
index 9e8ca1c70e9b..000000000000
--- a/metadata/md5-cache/dev-ada/libadalang-23.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-ml/dune dev-ml/zarith dev-ml/camomile dev-ml/ocaml-ctypes dev-ada/e3-testsuite <dev-lang/ocaml-4.14 )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pyyaml <dev-ada/gnatcoll-bindings-2021 >=dev-ada/gnatcoll-bindings-23.0.0[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-),gmp,iconv] dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?] ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-ada/langkit[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-),shared,static-libs?,static-pic?] python_single_target_python3_10? ( dev-ada/langkit[python_targets_python3_10(-)] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)]
-DESCRIPTION=high performance semantic engine for the Ada programming language
-EAPI=7
-HOMEPAGE=https://libre.adacore.com/
-INHERIT=ada python-single-r1 multiprocessing
-IUSE=test +static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 +python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml <dev-ada/gnatcoll-bindings-2021 >=dev-ada/gnatcoll-bindings-23.0.0[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-),gmp,iconv] dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?] ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-ada/langkit[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-),shared,static-libs?,static-pic?] python_single_target_python3_10? ( dev-ada/langkit[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
-RESTRICT=!test? ( test )
-SLOT=0/23.0.0
-SRC_URI=https://github.com/AdaCore/libadalang/archive/refs/tags/v23.0.0.tar.gz -> libadalang-23.0.0.tar.gz
-_eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f8efa3f02ea6e386d2394739c0b2374e
diff --git a/metadata/md5-cache/dev-ada/libadalang-23.0.0-r1 b/metadata/md5-cache/dev-ada/libadalang-23.0.0-r1
new file mode 100644
index 000000000000..3fb093605eb3
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/libadalang-23.0.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-ml/dune dev-ml/zarith dev-ml/camomile dev-ml/ocaml-ctypes dev-ada/e3-testsuite <dev-lang/ocaml-4.14 )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/pyyaml <dev-ada/gnatcoll-bindings-2021 >=dev-ada/gnatcoll-bindings-23.0.0[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,gmp,iconv] dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?] ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-ada/langkit[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,shared,static-libs?,static-pic?] python_single_target_python3_10? ( dev-ada/langkit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-ada/langkit[python_targets_python3_11(-)] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?]
+DESCRIPTION=high performance semantic engine for the Ada programming language
+EAPI=8
+HOMEPAGE=https://libre.adacore.com/
+INHERIT=ada python-single-r1 multiprocessing
+IUSE=test +static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyyaml <dev-ada/gnatcoll-bindings-2021 >=dev-ada/gnatcoll-bindings-23.0.0[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,gmp,iconv] dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?] ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-ada/langkit[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,shared,static-libs?,static-pic?] python_single_target_python3_10? ( dev-ada/langkit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-ada/langkit[python_targets_python3_11(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 )
+RESTRICT=!test? ( test )
+SLOT=0/23.0.0
+SRC_URI=https://github.com/AdaCore/libadalang/archive/refs/tags/v23.0.0.tar.gz -> libadalang-23.0.0.tar.gz
+_eclasses_=ada	8af8cc9968a30d4ac8eb99aa6c62eeba	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cf24ade2d22378f480789524d7a61bd0
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 5553d49544f0..e6aad76d13c9 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/asio-1.22.2 b/metadata/md5-cache/dev-cpp/asio-1.22.2
deleted file mode 100644
index 0fd69b5393e8..000000000000
--- a/metadata/md5-cache/dev-cpp/asio-1.22.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare
-DEPEND=test? ( dev-libs/boost dev-libs/openssl )
-DESCRIPTION=Asynchronous Network Library
-EAPI=8
-HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
-INHERIT=autotools
-IUSE=doc examples test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=Boost-1.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asio/asio/asio-1.22.2.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5f2881493bfb8d378cffb296a22740a0
diff --git a/metadata/md5-cache/dev-cpp/json11-1.0.0-r1 b/metadata/md5-cache/dev-cpp/json11-1.0.0-r1
new file mode 100644
index 000000000000..76559fc3c2ae
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/json11-1.0.0-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tiny JSON library for C++11
+EAPI=8
+HOMEPAGE=https://github.com/dropbox/json11
+INHERIT=cmake
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/dropbox/json11/archive/refs/tags/v1.0.0.tar.gz -> json11-1.0.0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8634af433a1a2ff64626f81a29dd2bad
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 9e8717857878..ccd714942a26 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/apgdiff-2.7.0 b/metadata/md5-cache/dev-db/apgdiff-2.7.0
index 10b56811e4e2..1c9b76e148d8 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.7.0
+++ b/metadata/md5-cache/dev-db/apgdiff-2.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fordfrog/apgdiff/archive/refs/tags/release_2.7.0.tar.gz -> apgdiff-2.7.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=276826446ef42e379bd1ed91fc028fb2
diff --git a/metadata/md5-cache/dev-db/mycli-1.24.1 b/metadata/md5-cache/dev-db/mycli-1.24.1
deleted file mode 100644
index 1efb87cdcf9e..000000000000
--- a/metadata/md5-cache/dev-db/mycli-1.24.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
-EAPI=7
-HOMEPAGE=https://www.mycli.net
-INHERIT=distutils-r1
-IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD MIT
-RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dbcli/mycli/archive/v1.24.1.tar.gz -> mycli-1.24.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b53248636fc800e832bcbbd514ea413f
diff --git a/metadata/md5-cache/dev-db/mycli-1.25.0 b/metadata/md5-cache/dev-db/mycli-1.25.0
deleted file mode 100644
index 6104484f0d1e..000000000000
--- a/metadata/md5-cache/dev-db/mycli-1.25.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
-EAPI=8
-HOMEPAGE=https://www.mycli.net
-INHERIT=distutils-r1
-IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD MIT
-RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dbcli/mycli/archive/v1.25.0.tar.gz -> mycli-1.25.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8b50f052af4445e687b7f19629adb9f1
diff --git a/metadata/md5-cache/dev-db/mycli-1.25.0-r1 b/metadata/md5-cache/dev-db/mycli-1.25.0-r1
deleted file mode 100644
index b1eed02f853c..000000000000
--- a/metadata/md5-cache/dev-db/mycli-1.25.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
-EAPI=8
-HOMEPAGE=https://www.mycli.net/ https://github.com/dbcli/mycli/ https://pypi.org/project/mycli/
-INHERIT=distutils-r1
-IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD MIT
-RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dbcli/mycli/archive/v1.25.0.tar.gz -> mycli-1.25.0.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c39e2599a1efedfd85f8d77bc1ba7462
diff --git a/metadata/md5-cache/dev-db/mycli-1.26.1 b/metadata/md5-cache/dev-db/mycli-1.26.1
new file mode 100644
index 000000000000..5d611eff13d1
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mycli-1.26.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mock[python_targets_python3_11(-)] dev-python/paramiko[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_11(-)] >=dev-python/click-7.0[python_targets_python3_11(-)] >=dev-python/configobj-5.0.6[python_targets_python3_11(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_11(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_11(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_11(-)] dev-python/pyaes[python_targets_python3_11(-)] >=dev-python/pygments-2.0[python_targets_python3_11(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_11(-)] dev-python/pyperclip[python_targets_python3_11(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_11(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_11(-)] ssh? ( dev-python/paramiko[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
+EAPI=8
+HOMEPAGE=https://www.mycli.net/ https://github.com/dbcli/mycli/ https://pypi.org/project/mycli/
+INHERIT=distutils-r1
+IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_11(-)] >=dev-python/click-7.0[python_targets_python3_11(-)] >=dev-python/configobj-5.0.6[python_targets_python3_11(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_11(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_11(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_11(-)] dev-python/pyaes[python_targets_python3_11(-)] >=dev-python/pygments-2.0[python_targets_python3_11(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_11(-)] dev-python/pyperclip[python_targets_python3_11(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_11(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_11(-)] ssh? ( dev-python/paramiko[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dbcli/mycli/archive/v1.26.1.tar.gz -> mycli-1.26.1.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a75cd4fad538eb25e9b3f2d737b99bc0
diff --git a/metadata/md5-cache/dev-db/mycli-9999 b/metadata/md5-cache/dev-db/mycli-9999
index e8faaa4fa859..a2f5197c3b3f 100644
--- a/metadata/md5-cache/dev-db/mycli-9999
+++ b/metadata/md5-cache/dev-db/mycli-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mock[python_targets_python3_11(-)] dev-python/paramiko[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_11(-)] >=dev-python/click-7.0[python_targets_python3_11(-)] >=dev-python/configobj-5.0.6[python_targets_python3_11(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_11(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_11(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_11(-)] dev-python/pyaes[python_targets_python3_11(-)] >=dev-python/pygments-2.0[python_targets_python3_11(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_11(-)] dev-python/pyperclip[python_targets_python3_11(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_11(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_11(-)] ssh? ( dev-python/paramiko[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
 EAPI=8
 HOMEPAGE=https://www.mycli.net/ https://github.com/dbcli/mycli/ https://pypi.org/project/mycli/
 INHERIT=distutils-r1 git-r3
-IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10
+IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_11(-)] >=dev-python/click-7.0[python_targets_python3_11(-)] >=dev-python/configobj-5.0.6[python_targets_python3_11(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_11(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_11(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_11(-)] dev-python/pyaes[python_targets_python3_11(-)] >=dev-python/pygments-2.0[python_targets_python3_11(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_11(-)] dev-python/pyperclip[python_targets_python3_11(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_11(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_11(-)] ssh? ( dev-python/paramiko[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=55458714d9c69bf988e4e832b5652a8a
+_md5_=6269a3a8d50033f8926ec22ef9aa22a8
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r4 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r4
index dcf804b842f4..9fdf6075d726 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r4
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r4
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1c0acc9b2a2bc362fbee8bf4560a6687
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 7ab09fe91739..2f95d6434945 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r2 b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r2
new file mode 100644
index 000000000000..97524fde9457
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev virtual/pkgconfig
+DESCRIPTION=A Device Firmware Update based USB programmer for Atmel chips
+EAPI=8
+HOMEPAGE=https://dfu-programmer.github.io/ https://sourceforge.net/projects/dfu-programmer/
+INHERIT=toolchain-funcs udev
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev
+SLOT=0
+SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.7.2.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=d6be8f85dffc4a8ad5eff1ad229f83c8
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.3.1 b/metadata/md5-cache/dev-embedded/esptool-3.3.1
deleted file mode 100644
index 36cf4cfaea87..000000000000
--- a/metadata/md5-cache/dev-embedded/esptool-3.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/wheel[python_targets_python3_10(-)] ) test? ( python_single_target_python3_9? ( dev-python/coverage[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/coverage[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
-EAPI=8
-HOMEPAGE=https://github.com/espressif/esptool
-INHERIT=distutils-r1
-IUSE=test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/espressif/esptool/archive/v3.3.1.tar.gz -> esptool-3.3.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=492e0249e9a953357a11a20f08e777da
diff --git a/metadata/md5-cache/dev-embedded/esptool-4.2.1 b/metadata/md5-cache/dev-embedded/esptool-4.2.1
deleted file mode 100644
index d2f5b7e917a6..000000000000
--- a/metadata/md5-cache/dev-embedded/esptool-4.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/wheel[python_targets_python3_10(-)] ) test? ( python_single_target_python3_9? ( dev-python/cffi[python_targets_python3_9(-)] dev-python/coverage[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cffi[python_targets_python3_10(-)] dev-python/coverage[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
-EAPI=8
-HOMEPAGE=https://github.com/espressif/esptool
-INHERIT=distutils-r1
-IUSE=test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/espressif/esptool/archive/v4.2.1.tar.gz -> esptool-4.2.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7c6fc7736a3921d73d9d7ae29db3968a
diff --git a/metadata/md5-cache/dev-embedded/esptool-4.3 b/metadata/md5-cache/dev-embedded/esptool-4.3
deleted file mode 100644
index e4cbe59e0d60..000000000000
--- a/metadata/md5-cache/dev-embedded/esptool-4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/wheel[python_targets_python3_11(-)] ) test? ( python_single_target_python3_9? ( dev-python/cffi[python_targets_python3_9(-)] dev-python/coverage[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cffi[python_targets_python3_10(-)] dev-python/coverage[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cffi[python_targets_python3_11(-)] dev-python/coverage[python_targets_python3_11(-)] dev-python/pyelftools[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
-EAPI=8
-HOMEPAGE=https://github.com/espressif/esptool
-INHERIT=distutils-r1
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/bitstring[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_11(-)] dev-python/pyserial[python_targets_python3_11(-)] dev-python/reedsolomon[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/espressif/esptool/archive/v4.3.tar.gz -> esptool-4.3.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=540f5669b186ce8e29f44cc45084018a
diff --git a/metadata/md5-cache/dev-embedded/esptool-4.5 b/metadata/md5-cache/dev-embedded/esptool-4.5
new file mode 100644
index 000000000000..01f124443c45
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/esptool-4.5
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/wheel[python_targets_python3_11(-)] ) test? ( python_single_target_python3_9? ( dev-python/cffi[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cffi[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cffi[python_targets_python3_11(-)] dev-python/pyelftools[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/bitstring[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_11(-)] dev-python/pyserial[python_targets_python3_11(-)] dev-python/reedsolomon[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
+EAPI=8
+HOMEPAGE=https://github.com/espressif/esptool
+INHERIT=distutils-r1
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/bitstring[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_11(-)] dev-python/pyserial[python_targets_python3_11(-)] dev-python/reedsolomon[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/espressif/esptool/archive/v4.5.tar.gz -> esptool-4.5.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=01149817ea1c635db24cf67a938d3244
diff --git a/metadata/md5-cache/dev-embedded/mspdebug-0.25 b/metadata/md5-cache/dev-embedded/mspdebug-0.25
deleted file mode 100644
index 9eaa92f4f231..000000000000
--- a/metadata/md5-cache/dev-embedded/mspdebug-0.25
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
-DESCRIPTION=A free debugger for use with MSP430 MCUs
-EAPI=6
-HOMEPAGE=https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug
-INHERIT=toolchain-funcs
-IUSE=readline
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
-SLOT=0
-SRC_URI=https://github.com/dlbeer/mspdebug/archive/v0.25.tar.gz -> mspdebug-0.25.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1d0a80edf5f7861d29014bedad0d8492
diff --git a/metadata/md5-cache/dev-embedded/mspdebug-0.25-r1 b/metadata/md5-cache/dev-embedded/mspdebug-0.25-r1
new file mode 100644
index 000000000000..fd9fbdad1fec
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/mspdebug-0.25-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
+DESCRIPTION=A free debugger for use with MSP430 MCUs
+EAPI=8
+HOMEPAGE=https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug
+INHERIT=toolchain-funcs
+IUSE=readline
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
+SLOT=0
+SRC_URI=https://github.com/dlbeer/mspdebug/archive/v0.25.tar.gz -> mspdebug-0.25.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fd8cff6a44142c44a55824a63f3b78a1
diff --git a/metadata/md5-cache/dev-embedded/stm32flash-0.7 b/metadata/md5-cache/dev-embedded/stm32flash-0.7
new file mode 100644
index 000000000000..68c8201c67f6
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/stm32flash-0.7
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Open source flash program for STM32 using the ST serial bootloader
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/stm32flash/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/project/stm32flash/stm32flash-0.7.tar.gz
+_md5_=06a3581f55451ebd062050aeed000ea0
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index e4d96bdab9b5..ee88e6848333 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/freecell-solver-6.6.0 b/metadata/md5-cache/dev-games/freecell-solver-6.6.0
deleted file mode 100644
index b7074a26db48..000000000000
--- a/metadata/md5-cache/dev-games/freecell-solver-6.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/rinutils python_single_target_python3_9? ( dev-python/pysol_cards[python_targets_python3_9(-)] dev-python/random2[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pysol_cards[python_targets_python3_10(-)] dev-python/random2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) tcmalloc? ( dev-util/google-perftools ) dev-perl/Moo dev-perl/Path-Tiny dev-perl/Template-Toolkit
-DESCRIPTION=C library for automatically solving Freecell and some other solitaire variants
-EAPI=8
-HOMEPAGE=https://fc-solve.shlomifish.org/
-INHERIT=cmake python-single-r1
-IUSE=tcmalloc python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/rinutils python_single_target_python3_9? ( dev-python/pysol_cards[python_targets_python3_9(-)] dev-python/random2[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pysol_cards[python_targets_python3_10(-)] dev-python/random2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) tcmalloc? ( dev-util/google-perftools )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-6.6.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7ba8c6babdc529248efe6dc8d5a0993f
diff --git a/metadata/md5-cache/dev-games/godot-4.0 b/metadata/md5-cache/dev-games/godot-4.0
new file mode 100644
index 000000000000..64182f074df7
--- /dev/null
+++ b/metadata/md5-cache/dev-games/godot-4.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
+DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
+EAPI=8
+HOMEPAGE=https://godotengine.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+IUSE=alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RESTRICT=test
+SLOT=4
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/godot-4.0-stable.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4c27930428b5840321f53d1583ca5eb1
diff --git a/metadata/md5-cache/dev-games/godot-4.0_rc5 b/metadata/md5-cache/dev-games/godot-4.0_rc5
deleted file mode 100644
index 4fd0eb650fab..000000000000
--- a/metadata/md5-cache/dev-games/godot-4.0_rc5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
-DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
-EAPI=8
-HOMEPAGE=https://godotengine.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-IUSE=alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
-RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/rc5/godot-4.0-rc5.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dc86ef9d99400684b6524c7ca55f8eea
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 260eec3a2f24..8d1660528204 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/angus-activation-1.0.0-r1 b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
index 61843daa0a58..275de4c59a0a 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/angus-activation/archive/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b16ce2302a00a68ea3ee76320ecdd221
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
index 87381d947609..cd3e2b6cb234 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5365b105212193b14dbba1b0a2109750
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
index f4de0490c4c3..46ab8d1d3930 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fa7c24e7af94c93a09a703c266c268bc
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
index 50f7f4562012..389cb175b514 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.15:4.15 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=1b628cead7c3a75ec3360a1af96cd2b8
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2
index 5ee29643023a..9b7e29b2e653 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r2
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.22
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=696c056c9fbd673259233ad9bded3eb9
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25
index c7e8d2ad388a..8bc9ae1ed7da 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.25
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.25:4.25 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.25
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/ecjsrc-4.25.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=847811be022429fa6e3990b1a7e8325e
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
index 85e8d9bd5038..f03fc28415a1 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.26:4.26 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=c3026e0fb107624661a73bbf1e2adf8f
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
index 7639f22f4686..310f9aabd2a1 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcompo
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b8ffa063f56d10f6081980a097bcb278
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
index 32264a8c64f7..602f2ab758d5 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7cea84226e935ddb81d4f1d650e012d1
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r1 b/metadata/md5-cache/dev-java/antlr-3.2-r1
index aed22a63eb3a..c32588436339 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r1
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=030dfc1ef28d4465566f94832b3197fb
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
index cc0138256b70..9fa40a55bb6b 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fb3a34e1933a20bfb2882d4c7a9470ec
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3 b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
index c698bb64a88e..13dee6749612 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=24940d00dbb98aa66e931290836ae633
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.3 b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
index 2a88e6ec4549..64dba67cce2a 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtem
 RESTRICT=!test? ( test )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.3/antlr-3.5.3-sources.jar -> antlr-tool-3.5.3-sources.jar https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fdace0a03a36bbde4e83973477982685
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
index 9e18eee8886b..939004abfa64 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runti
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz https://repo1.maven.org/maven2/org/antlr/antlr4/4.9.3/antlr4-4.9.3-sources.jar -> antlr-tool-4.9.3-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ffc0a7a373c6934a5c70e4561bad36f7
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index b1869c993ce3..85a2878f1e11 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0bcbc7cba4df84544947602428a6dd59
diff --git a/metadata/md5-cache/dev-java/apache-rat-core-0.13 b/metadata/md5-cache/dev-java/apache-rat-core-0.13
index 99d9783b627a..dedd564e3584 100644
--- a/metadata/md5-cache/dev-java/apache-rat-core-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-core-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-cli-1.3.1:1 >=dev-java/commons-co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d22bad28e451f95f75c485378fececf2
diff --git a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13 b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
index 14203008ee13..a096da876c48 100644
--- a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 ~dev-java/apache-rat-core-0.13:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7c5b860615c9f5b27aa0563531da9afa
diff --git a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1 b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
index 656ef0e89915..30cf6097b6e5 100644
--- a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/apiguardian-team/apiguardian/archive/r1.1.2.tar.gz -> apiguardian-api-1.1.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5f020dc4845edbebc486fb168740816f
diff --git a/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1 b/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
index 740de3e94278..e5fc0fe6e862 100644
--- a/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
+++ b/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9b6924a56bbe5d84137a134d5a652054
diff --git a/metadata/md5-cache/dev-java/asm-5.1-r1 b/metadata/md5-cache/dev-java/asm-5.1-r1
deleted file mode 100644
index 79e604af556b..000000000000
--- a/metadata/md5-cache/dev-java/asm-5.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=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
-DESCRIPTION=Bytecode manipulation framework for Java
-EAPI=7
-HOMEPAGE=https://asm.ow2.io
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_5_1/asm-ASM_5_1.tar.bz2 https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.bz2
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=744d68a9161e33c0127f8becaa8b5ec9
diff --git a/metadata/md5-cache/dev-java/asm-9.4 b/metadata/md5-cache/dev-java/asm-9.4
index 98929327f3e7..f92b763a5cc5 100644
--- a/metadata/md5-cache/dev-java/asm-9.4
+++ b/metadata/md5-cache/dev-java/asm-9.4
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_4/asm-ASM_9_4.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ccff5e12a3cc549d89f6c731d27e2e5d
diff --git a/metadata/md5-cache/dev-java/aspectj-1.9.7 b/metadata/md5-cache/dev-java/aspectj-1.9.7
index 09c3e9dce55c..7e2e5bd99996 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/ant-apache-regexp:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse/org.aspectj/archive/refs/tags/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=72e4c000f4d64ad768a7fcfd8c05933c
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1 b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
index 32fed53251f8..d354f8e2ef0a 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=74c0f187f05a2b4e485e2e4d881f1e45
diff --git a/metadata/md5-cache/dev-java/assertj-core-3.10.0 b/metadata/md5-cache/dev-java/assertj-core-3.10.0
index 838b9400f436..1bb9c3295539 100644
--- a/metadata/md5-cache/dev-java/assertj-core-3.10.0
+++ b/metadata/md5-cache/dev-java/assertj-core-3.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/byte-buddy-1.12.12:0 >=dev-java/java-conf
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-3.10.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2d7798708bdc2edb66c9421153a5a1ba
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
index 29cc58ff97f6..ad4368340825 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/avalon-logkit:2.0 dev-java/log4j-12-api:2 >
 RESTRICT=!test? ( test )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a24a1c659a325216db06ccb8934a21df
diff --git a/metadata/md5-cache/dev-java/batik-1.14-r1 b/metadata/md5-cache/dev-java/batik-1.14-r1
index e1375585030d..7872dc7c1d51 100644
--- a/metadata/md5-cache/dev-java/batik-1.14-r1
+++ b/metadata/md5-cache/dev-java/batik-1.14-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jacl:0 dev-java/jython:2.7 dev-java/rhino:1.6 dev-java/xalan:0
 RESTRICT=!test? ( test )
 SLOT=1.14
 SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=44313ea3fef478caa985c1bb56c99e8e
diff --git a/metadata/md5-cache/dev-java/bcel-6.6.0 b/metadata/md5-cache/dev-java/bcel-6.6.0
index 8873785af7d4..2a0bf364e106 100644
--- a/metadata/md5-cache/dev-java/bcel-6.6.0
+++ b/metadata/md5-cache/dev-java/bcel-6.6.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/bcel/source/bcel-6.6.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-6.6.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=334382a5b12c2be82f23086eb5e33fc0
diff --git a/metadata/md5-cache/dev-java/bcmail-1.72 b/metadata/md5-cache/dev-java/bcmail-1.72
index 0c7d07b19404..fdb5121da852 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.72
+++ b/metadata/md5-cache/dev-java/bcmail-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcpkix-1.72:0 ~dev-java/bcprov-1.72:0 ~dev-java/bcutil-1.72:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=392e33e4210b7288b9ffd1d8de00aa0c
diff --git a/metadata/md5-cache/dev-java/bcpg-1.72 b/metadata/md5-cache/dev-java/bcpg-1.72
index 6ff357999772..a010c8ec664a 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.72
+++ b/metadata/md5-cache/dev-java/bcpg-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.72:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=31e7099838e87b12597cdc2c2f59290f
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.72 b/metadata/md5-cache/dev-java/bcpkix-1.72
index 167556fe0531..1ce28eb0c644 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.72
+++ b/metadata/md5-cache/dev-java/bcpkix-1.72
@@ -12,5 +12,5 @@ RDEPEND=~dev-java/bcprov-1.72:0 ~dev-java/bcutil-1.72:0 >=virtual/jre-1.8:* >=de
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=04597e54bfdaeb887510228c3081eca4
diff --git a/metadata/md5-cache/dev-java/bcprov-1.72 b/metadata/md5-cache/dev-java/bcprov-1.72
index 69469433e87d..a84be5249302 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.72
+++ b/metadata/md5-cache/dev-java/bcprov-1.72
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d9513ba3face8d44d2e6e0a249976f61
diff --git a/metadata/md5-cache/dev-java/bcutil-1.72 b/metadata/md5-cache/dev-java/bcutil-1.72
index 2fa55e16bbc0..a5f85e531cd7 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.72
+++ b/metadata/md5-cache/dev-java/bcutil-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.72:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=15e19954de3e22bcffcf3fcb7903ef8c
diff --git a/metadata/md5-cache/dev-java/brotli-dec-0.1.2 b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
index 2c6690e8511d..d77f9f184f84 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> brotli-dec-0.1.2-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5798bdfffc623c3300d063ff927ff233
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
index b6f1b38430bf..6b40eca02f1e 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/1.3/BrowserLauncher2-all-1_3.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6980f4df76aae52005da887f43702c95
diff --git a/metadata/md5-cache/dev-java/bsh-2.1.1 b/metadata/md5-cache/dev-java/bsh-2.1.1
new file mode 100644
index 000000000000..9ddc313813d9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bsh-2.1.1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/bsf:2.3 dev-java/jakarta-servlet-api:4 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A small embeddable Java source interpreter
+EAPI=8
+HOMEPAGE=https://github.com/beanshell/beanshell
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+PROPERTIES=test_network
+RDEPEND=dev-java/bsf:2.3 dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beanshell/beanshell/archive/2.1.1.tar.gz -> bsh-2.1.1.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=bca35b1591d5b1509b43514309ca9a53
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.21 b/metadata/md5-cache/dev-java/byte-buddy-1.12.21
index 41a0a164fd6b..dc4380199783 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.12.21
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.21
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.21.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bc02af28c1e265a09ca0d9ab2ddd86ba
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 06907fd5c318..8346aeeda97e 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0660b455429dbdf902b31d8f1befb67c
diff --git a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2 b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
index c36857e6f5ed..425a7be3d439 100644
--- a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
+++ b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz -> cdi-api-4.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=19b90d3f7f970c0b52c793432bcfac4a
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r1 b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
index f75fe18a4cb2..2b4253f57c19 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-c
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/cglib/cglib/archive//RELEASE_3_3_0.tar.gz -> cglib-RELEASE_3_3_0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ce17e92c57e18188a5d7ac54ab915579
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
index 4b0d317b60ea..0f2b6e9a5f07 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/typetools/checker-framework/tar.gz/refs/tags/checker-framework-3.14.0 -> checker-framework-3.14.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7ee370ee2561a156f144a8211a56d9c5
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
index f85a4c7efc19..7e2e0d2cce18 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=virtual/jre-
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b818ee63d0978430ab19080ede8dc626
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.5.0 b/metadata/md5-cache/dev-java/commons-cli-1.5.0
index 4911ba65584e..7c207871a028 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.5.0
+++ b/metadata/md5-cache/dev-java/commons-cli-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.5.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bbc0e4f273d7d83ad71d8f24d2de6bed
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15-r1 b/metadata/md5-cache/dev-java/commons-codec-1.15-r1
index 363414df3d84..b0616ef0dd18 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.15-r1
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.15-src.tar.gz -> commons-codec-1.15.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9786abaa80d21cbee5f20605f2cb2029
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4-r1 b/metadata/md5-cache/dev-java/commons-collections-4.4-r1
index 36da9751cdc3..e98056a8e402 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz -> commons-collections-4.4-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=49a17da70c32257347df61e3627074af
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21-r1 b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
index c6a851a30d29..6bead51b2ca0 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.21-r1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/brotli-dec:0 dev-java/xz-jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8b5aadb2b4ca8069e0e557c0cddf51f3
diff --git a/metadata/md5-cache/dev-java/commons-csv-1.9.0 b/metadata/md5-cache/dev-java/commons-csv-1.9.0
index 9114bb23d8da..3dafdcbc3f7d 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz -> commons-csv-1.9.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ee03a72c337c9e519e3ed23d324e9281
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.3 b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
index e980065c34f6..804cd2e6f313 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.3
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=7902829c493349f239b87ed827604b4a
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index f47ec1e49b61..4d6b3aab52f4 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d9a856c9a26947e6aff0cc6a26b497a4
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r3 b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
index 332b1b488565..a8f41ade0346 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-ja
 RESTRICT=test !test? ( test )
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz -> commons-digester-3.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=32cba32ff0bd4c3adba31f8ed800b86a
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
index b3d736c84565..92bdb97ed3a3 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f45b2c70456dad769a00122939de99c6
diff --git a/metadata/md5-cache/dev-java/commons-io-2.11.0-r1 b/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
index ec15360a607e..32936ada383e 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
+++ b/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.11.0-src.tar.gz -> commons-io-2.11.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e5a106d98aa839ebd22eb6bb55e57911
diff --git a/metadata/md5-cache/dev-java/commons-junit4-1.2.17 b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
index 9fe47a3b5e20..352d239e76ff 100644
--- a/metadata/md5-cache/dev-java/commons-junit4-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/commons-nullanalysis-1.2.17:0 dev-java/jun
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f6b48236edef7d1d31fadc2b19014938
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0 b/metadata/md5-cache/dev-java/commons-lang-3.12.0
index e0b156264dee..869896c91298 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8c91cc1d0458203f6d62f3d899d2c212
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
index aa27ab315f4e..3ff7bb27edb3 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1fd4d625058082bf003538d4bdbbc790
diff --git a/metadata/md5-cache/dev-java/commons-net-3.9.0 b/metadata/md5-cache/dev-java/commons-net-3.9.0
index eb4bc3d1fe9a..4bb0269ce0c4 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.9.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.9.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.9.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-3.9.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=dcce41fb3acf31b61d97c118010bc1a3
diff --git a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17 b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
index 33f027259270..be2fffb33dc8 100644
--- a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b83918bf0874a5e01d61969486095419
diff --git a/metadata/md5-cache/dev-java/commons-text-1.10.0 b/metadata/md5-cache/dev-java/commons-text-1.10.0
index 2269b185f09c..2016c3da82fe 100644
--- a/metadata/md5-cache/dev-java/commons-text-1.10.0
+++ b/metadata/md5-cache/dev-java/commons-text-1.10.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache//commons/text/source/commons-text-1.10.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=172fcf75d090f02f6c1633d2d3ab5e05
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.7 b/metadata/md5-cache/dev-java/commons-validator-1.7
index ceb94cf4ed72..145aec21d696 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.7
+++ b/metadata/md5-cache/dev-java/commons-validator-1.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.7-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=77e3c85c5463e21f4a84ecf440783bc6
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
index 6fe172710c1a..d38b9374000c 100644
--- a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conversant/disruptor/archive/1.2.20.tar.gz -> conversant-disruptor-1.2.20.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7dfbbc14f3b4d030fa22ed4419b26518
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index f524f24e80ae..4166acf44327 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 ja
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6b7b54ce52fe6dc61ec15e131c7cb961
diff --git a/metadata/md5-cache/dev-java/easymock-2.5.2 b/metadata/md5-cache/dev-java/easymock-2.5.2
index 3f58ace7d2cb..e83bdad24600 100644
--- a/metadata/md5-cache/dev-java/easymock-2.5.2
+++ b/metadata/md5-cache/dev-java/easymock-2.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.5
 SRC_URI=https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6596ee8a8359d0683a88aa56a853df16
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index c3f54a54c9f0..02130b0f8fab 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis
 RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8756a40188a88794646f84faaea90d85
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
index 8eba2f32dbf9..21b36931ba6f 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.15 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=05f6212f9979277996675e568acca2f3
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
index 9dc6dbe1b177..a04f9d5a645c 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.22 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.22
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=631d5cd55d963525b62dcecdd68515dd
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.25 b/metadata/md5-cache/dev-java/eclipse-ecj-4.25
index 920ed4c790a2..0d08fd84db9e 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.25
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.25
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.25 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.25
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/ecjsrc-4.25.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=231a2375b5786afdeacde104787676b9
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
index 1af72093155f..015edcb647f7 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.26
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.26 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=eca1dd14ee8157fad7e6d509c0935fff
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.16 b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
index b2f920084bb4..4737c27fbd21 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.16
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/error-prone/archive/v2.16.tar.gz -> error-prone-2.16.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=55bb72f733ad3d4d757502160948de14
diff --git a/metadata/md5-cache/dev-java/failureaccess-30.1.1 b/metadata/md5-cache/dev-java/failureaccess-30.1.1
index 9d393164863c..fc944c0acd4d 100644
--- a/metadata/md5-cache/dev-java/failureaccess-30.1.1
+++ b/metadata/md5-cache/dev-java/failureaccess-30.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d6db1f05beb39924e4e2962ca8ff6226
diff --git a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1 b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
index 52f74735b9cd..9be1ce540bb9 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-fi/archive/2.1.0.tar.gz -> fastinfoset-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b93a01473a3b85d97ac919e1f953a169
diff --git a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1 b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
index d58780100486..832cd98a8cb0 100644
--- a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
+++ b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/animal-sniffer-annotations:0 >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz -> felix-framework-7.0.5.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=49595e311a7193698e526e1948b54bb9
diff --git a/metadata/md5-cache/dev-java/felix-main-7.0.5-r1 b/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
index ba122bd29f0d..7617fb8c2f01 100644
--- a/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
+++ b/metadata/md5-cache/dev-java/felix-main-7.0.5-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/felix-framework-7.0.5:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz -> felix-main-7.0.5.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9f95cadccc5e4d0542f6a660c1f5f031
diff --git a/metadata/md5-cache/dev-java/felix-resolver-2.0.4 b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
index 9c4ce887a20f..ed7e0cda7a9f 100644
--- a/metadata/md5-cache/dev-java/felix-resolver-2.0.4
+++ b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz -> felix-resolver-2.0.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9a1fcc33ad98ef2cbf72ca5d7bd563de
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.11.8 b/metadata/md5-cache/dev-java/felix-utils-1.11.8
index 89285c9bf2e9..64874389a031 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.11.8
+++ b/metadata/md5-cache/dev-java/felix-utils-1.11.8
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz -> felix-utils-1.11.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1a8a5146cec6987efa2cac823f952c23
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
index 3153414a46c0..af5d318e8f02 100644
--- a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -11,5 +11,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6c535dd2eb7bf22f692a9291758ff87b
diff --git a/metadata/md5-cache/dev-java/fishbowl-1.4.1 b/metadata/md5-cache/dev-java/fishbowl-1.4.1
index 1682103d0637..2eaba011e4f4 100644
--- a/metadata/md5-cache/dev-java/fishbowl-1.4.1
+++ b/metadata/md5-cache/dev-java/fishbowl-1.4.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/fishbowl/archive/fishbowl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7926431a9c1ad7f82f68dfb45fabc973
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.27 b/metadata/md5-cache/dev-java/fontbox-2.0.27
index 5ddb44fd4e57..90ca15d150dc 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.27
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.27
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf https://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=beabd835debe0df66cdc641ad9f639b3
diff --git a/metadata/md5-cache/dev-java/fop-2.7 b/metadata/md5-cache/dev-java/fop-2.7
index ecedfb611925..2e2e6ddaf4cc 100644
--- a/metadata/md5-cache/dev-java/fop-2.7
+++ b/metadata/md5-cache/dev-java/fop-2.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/batik:1.14 dev-java/commons-io:1 dev-java/fontbox:0 dev-java/qd
 RESTRICT=!test? ( test )
 SLOT=2.7
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.7-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=36f2a45a101f85662f10d4281493ee8e
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
index e49b71b4bd61..d5746718e2af 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/gnu-regexp-1.1.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3e2b517468bb0aaf8aa31524c2242598
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.6 b/metadata/md5-cache/dev-java/gradle-bin-7.6
deleted file mode 100644
index b01b4a3543a4..000000000000
--- a/metadata/md5-cache/dev-java/gradle-bin-7.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A project automation and build tool with a Groovy based DSL
-EAPI=8
-HOMEPAGE=https://www.gradle.org/
-INHERIT=java-pkg-2
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=7.6
-SRC_URI=https://services.gradle.org/distributions/gradle-7.6-all.zip -> gradle-bin-7.6.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=22cedbcff90d310938d35aeb0368bfde
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.6.1 b/metadata/md5-cache/dev-java/gradle-bin-7.6.1
new file mode 100644
index 000000000000..8399f97b5568
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.6.1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=app-eselect/eselect-gradle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A project automation and build tool with a Groovy based DSL
+EAPI=8
+HOMEPAGE=https://www.gradle.org/
+INHERIT=java-pkg-2
+IUSE=doc source
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=7.6.1
+SRC_URI=https://services.gradle.org/distributions/gradle-7.6.1-all.zip -> gradle-bin-7.6.1.zip
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=22cedbcff90d310938d35aeb0368bfde
diff --git a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2 b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
index fb6368787db4..d2c45668cf3f 100644
--- a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
+++ b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:2 dev-java/jakarta-mail:0 dev-java/junit:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/greenmail-mail-test/greenmail/archive/release-2.0.0-alpha-2.tar.gz -> greenmail-2.0.0_alpha2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b9df8132f54d1cc77e67c59f605680b2
diff --git a/metadata/md5-cache/dev-java/gson-2.9.1 b/metadata/md5-cache/dev-java/gson-2.9.1
index 1f0e083b1d18..49fad5c400ee 100644
--- a/metadata/md5-cache/dev-java/gson-2.9.1
+++ b/metadata/md5-cache/dev-java/gson-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.6
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.9.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1c98b14925b26986c54e071aff180697
diff --git a/metadata/md5-cache/dev-java/guava-31.1 b/metadata/md5-cache/dev-java/guava-31.1
index 02c0a871ce8b..58f2a7e8ccfa 100644
--- a/metadata/md5-cache/dev-java/guava-31.1
+++ b/metadata/md5-cache/dev-java/guava-31.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/checker-framework-qual-3.14.0:0 >=dev-java/error-prone-annotations-2.16:0 >=dev-java/failureaccess-30.1.1:0 >=dev-java/j2objc-annotations-2.8:0 >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v31.1.tar.gz -> guava-31.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3c4311d3d6638d5cdbfff7183ba23482
diff --git a/metadata/md5-cache/dev-java/guava-testlib-31.1 b/metadata/md5-cache/dev-java/guava-testlib-31.1
index a0f9aa170e12..9f07ada70dfe 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-31.1
+++ b/metadata/md5-cache/dev-java/guava-testlib-31.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/guava-31.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v31.1.tar.gz -> guava-31.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4c6a995db14bd05a7bb35a4b0a251461
diff --git a/metadata/md5-cache/dev-java/guice-5.1.0 b/metadata/md5-cache/dev-java/guice-5.1.0
index 21a6766b6754..c3bbc1077349 100644
--- a/metadata/md5-cache/dev-java/guice-5.1.0
+++ b/metadata/md5-cache/dev-java/guice-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/aopalliance:1 dev-java/asm:9 dev-java/guava
 RESTRICT=test !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/5.1.0.tar.gz -> guice-5.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=685cafffd922ef9f81fe437e0f590464
diff --git a/metadata/md5-cache/dev-java/hamcrest-2.2 b/metadata/md5-cache/dev-java/hamcrest-2.2
index fd1eb4b5ec3c..1e06da143e51 100644
--- a/metadata/md5-cache/dev-java/hamcrest-2.2
+++ b/metadata/md5-cache/dev-java/hamcrest-2.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz -> hamcrest-2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=47d0acb6210acbce27298ff1935d1ac8
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
index aff4b83bc840..69b3f448fdf3 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=256f3602ef99cd08a39d6f66f124e7aa
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
index 435a0a41b771..5428ac4f3a4b 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5f6f53542f0b38b80d70c6316ae7ce8f
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
index 7bedd3d6a55e..a04d5dc36214 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=82c4192babddf478374f5cab7cca984d
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
index 9b7558412f2c..d164d7457c03 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5cc69385ac64a49c82035e357d933a72
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
index 214dd1192166..650a02fa8b3d 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.18.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4124437359740c8d9cb9da5c6f7fb6ec
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.26 b/metadata/md5-cache/dev-java/htmlcleaner-2.26
index c448aca21507..482bced1f411 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.26
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.26
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v2.26/htmlcleaner-2.26-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8e7fc31f99f05f7c15a65a1edc87ad8d
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
index 8317530dfd4a..73abdf4dd301 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bb83a3c6a052302645f9eefbde882a6d
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14 b/metadata/md5-cache/dev-java/httpcore-4.4.14
index 05ebc97288e7..78b8e4311375 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=98ecdd55b66865a821b1bdfbd1cd4777
diff --git a/metadata/md5-cache/dev-java/icu4j-72.1 b/metadata/md5-cache/dev-java/icu4j-72.1
index 561bc2fc16dd..2009b82c39e7 100644
--- a/metadata/md5-cache/dev-java/icu4j-72.1
+++ b/metadata/md5-cache/dev-java/icu4j-72.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=70
 SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-72-1.tar.gz -> icu-72.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e21ef841ad89e488a1b640105f7feaa5
diff --git a/metadata/md5-cache/dev-java/injection-api-2.0.1 b/metadata/md5-cache/dev-java/injection-api-2.0.1
index 7b756a1e2a00..edb2c817c31f 100644
--- a/metadata/md5-cache/dev-java/injection-api-2.0.1
+++ b/metadata/md5-cache/dev-java/injection-api-2.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/injection-api/archive/2.0.1.tar.gz -> injection-api-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=70ee83e00158f1bb21c72545d2f43857
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r5 b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
index e01c5f758a08..5a78570da17e 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r5
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a84f38d6a933e9fd22f734b3820885cc
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
index e9f6ce8dc2c7..f7d8d2f26625 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c4d9deeb2ade4e71cae767046f3da2a1
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-2.8 b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
index e068e8aa2f1c..8462c4cd496c 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-2.8
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/j2objc/archive/2.8.tar.gz -> j2objc-2.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f9c8f7f050feb6ce0924b131ebee4d5e
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index 4b676a7c7bbd..14f36d6cb9d9 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz -> jackcess-4.0.0-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fd99cefd0c2a4a69979b4f073dad2243
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
index 4df40ba9c465..81f7ae40a5f8 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8d15c4e0f6ad1bf14b3e7aa0cff332c8
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
index a335d27a0da4..267cf75213f5 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=01744e32eb429a6bdb099cdd01148416
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.4 b/metadata/md5-cache/dev-java/jackson-core-2.13.4
index 9aed3f30ec40..128a60e085c9 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=27d6ce84bbecfa62c456d0dff55d15ac
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1 b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
index 190bf878a984..2e6c7314910d 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1beae1ec3e358073c387e888ab7c5c79
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
index 204788817932..ceb2fb72eb67 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a556215f64a068c6ff8526cdaf42f060
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
index fd67bd036c7b..431278451e6b 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=23becb40922325710ba33cc37a83046e
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
index 0b18425aeb80..164668920d8a 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.4.tar.gz -> jackson-module-jakarta-xmlbind-2.13.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c7e07827ca3d7f9ab81ce2586209c9a7
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
index ebb92e2e1c05..e2b870dddf1b 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2b2f769227fc69a612651c02ccdd38b5
diff --git a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
index a871bffa7bb8..ba216eb4d149 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e5cd2fcf459b16f769f8d218ff456f1e
diff --git a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
index 96e504a56414..10e5f2607ae6 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jai-imageio-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=29d1ba28d03d99db56ce402c2535dff7
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
index 2aaa78522a20..5e9a37dbc5e8 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b99f05dd12cac00e435ee47ecf965e4d
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
index 96e973ae9cba..5ee1245b4e47 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=93e0c276aeccbc963839590ab4f681d9
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
index 65e46902502a..488195bb71c6 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-api-1.2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c34af806732c7e489f11860f6501ea3a
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
index 7967bf74eec2..5cc82d54a44b 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1ab8555b3a957d389e447120417be772
diff --git a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
index a8ae80950bc9..edcf8980fdfa 100644
--- a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/common-annotations-api/archive/2.1.1.tar.gz -> jakarta-annotations-api-2.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ad8892a8f51d782522e4f2249619a388
diff --git a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
index d59bb3d077ad..a0b8193b4304 100644
--- a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=https://github.com/jakartaee/expression-language/archive/5.0.1-RELEASE-api.tar.gz -> jakarta-el-api-5.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=07fa9f90f0e0056d7914119cd29e1324
diff --git a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0 b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
index 3f0d8d0eb208..6c0f5800869a 100644
--- a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/interceptors/archive/2.1.0-RELEASE.tar.gz -> jakarta-interceptors-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=52a655ead01220649dc1647d958d5827
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
index ae3352f4a7b3..3685347958e0 100644
--- a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=16e7a8330d20712e4a37c8dfb8291e1f
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1 b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
index c3a8e5a05a33..09bbfd3e4ed7 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation:2 >=dev-java/java-config
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz -> jakarta-mail-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8cdd8992109772f04714d6e851383ff6
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
index 558123b21167..3baa04942027 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/mail/archive/2.1.0.tar.gz -> jakarta-mail-api-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0810dff242e2f1357599c43528311fad
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
index 522da0988e3a..bde3d3e828f7 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=https://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3ae2e6df0f95075b5e750e7dae925af4
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
index d58da9c777e2..35ee20ebd185 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4715ec34bfa34c1bcc3f2b1d512e12e1
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4 b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
index dd42a47ceae5..5a1f3986d4ac 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/jakartaee/servlet/archive/4.0.4-RELEASE.tar.gz -> jakarta-servlet-api-4.0.4-RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f896dde4a1aa06afdf3cc58cb1ec6b6c
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0 b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
index af910f8c1e07..6f5a90ff38a9 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz -> jakarta-servlet-api-6.0.0-RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a2e13785d9e40e2220de63b1b386fda0
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
index de9fb05fa1cb..dcbf171bb504 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=59335730ce52755d0fd0bcfb5957b2a4
+SRC_URI=https://github.com/jakartaee/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=8212132e29f76e010a845b20bd15d1a2
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
index 44a4a502dbf5..57bc40e6b183 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.6.0:0 >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.tar.gz -> jakartaee-migration-1.0.6-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2a62c65d2ff167ad3b5d52dffc45b386
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r6 b/metadata/md5-cache/dev-java/jal-20031117-r6
index 35d3fd022d16..ab44354028b8 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r6
+++ b/metadata/md5-cache/dev-java/jal-20031117-r6
@@ -10,5 +10,5 @@ LICENSE=HPND
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c8457e8bbe91555b895391aab6235604
diff --git a/metadata/md5-cache/dev-java/janino-3.1.7 b/metadata/md5-cache/dev-java/janino-3.1.7
index 8156f0dbc757..5cd16bb4f2f8 100644
--- a/metadata/md5-cache/dev-java/janino-3.1.7
+++ b/metadata/md5-cache/dev-java/janino-3.1.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> janino-3.1.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7a96833bceb5c0e26b9ef0a7c97261f2
diff --git a/metadata/md5-cache/dev-java/janino-3.1.8 b/metadata/md5-cache/dev-java/janino-3.1.8
index 8a7eb8b49f54..db03f8b5751e 100644
--- a/metadata/md5-cache/dev-java/janino-3.1.8
+++ b/metadata/md5-cache/dev-java/janino-3.1.8
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janino-compiler/janino/archive/v3.1.8.tar.gz -> janino-3.1.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=54c33442dc1cc8f3f47cf711f67a3316
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index 7c6d8330072d..db2de709d79f 100644
--- a/metadata/md5-cache/dev-java/jansi-1.13
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-project-1.13.tar.gz -> jansi-1.13.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ee1233c04a41ea2639d3127438b6cc82
diff --git a/metadata/md5-cache/dev-java/jansi-2.4.0-r1 b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
index 8aaefca7a5ac..f574f5e6039f 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7c3b952cdf55a9fb767e8b28506fb677
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index d9384df5cbb5..8a150cb50b81 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=758fbbc82194cc75be177b62685c36a1
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5 b/metadata/md5-cache/dev-java/java-dep-check-0.5
deleted file mode 100644
index 2d8c63986eea..000000000000
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java Dependency checker
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-INHERIT=java-pkg-2 java-pkg-simple
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:4 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=f1e7c2d211ebef2a07d44c9226e5a9e8
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5-r1 b/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
index ee2fbc4ec0d0..efb4477da08d 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Java Dependency checker
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 INHERIT=java-pkg-2 java-pkg-simple
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=8f0145075fda168338e0666f71030b4f
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=04076e4d2385022294374d78ef955ca9
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0 b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
index 5e8f8c29e80d..941f495a820d 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
+++ b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8a28218570abaa15bfa2f5a82611068b
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
index ef35f419757a..e49ba4d7e1a0 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2b94cb592f55e6627bbaede31c2872b6
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
new file mode 100644
index 000000000000..a51f7f903a37
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=virtual/jdk:1.8 dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=The JavaHelp system online help system
+EAPI=8
+HOMEPAGE=https://javaee.github.io/javahelp/
+INHERIT=java-pkg-2 java-ant-2
+IUSE=examples source
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=>=virtual/jre-1.8:* dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c733f948b0ac4fbe7eae5984f2a6e157
diff --git a/metadata/md5-cache/dev-java/javassist-3.29.2 b/metadata/md5-cache/dev-java/javassist-3.29.2
index eb2e7b84ce37..e23e2a60719f 100644
--- a/metadata/md5-cache/dev-java/javassist-3.29.2
+++ b/metadata/md5-cache/dev-java/javassist-3.29.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz -> javassist-3.29.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8aece1c5cd2cf76569b48bab5d6df69e
diff --git a/metadata/md5-cache/dev-java/javax-el-api-2.2 b/metadata/md5-cache/dev-java/javax-el-api-2.2
new file mode 100644
index 000000000000..d182d102cff6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-el-api-2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Expression Language API
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=CDDL GPL-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.2
+SRC_URI=https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2-sources.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=bf8ae79c6a6d295513194249a983696b
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r4 b/metadata/md5-cache/dev-java/javax-inject-1-r4
index e314ee95c615..4f7d2f1bc78e 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d3143b886eb166ae748f79f144ce16dd
diff --git a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3 b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
index 09b8eb73b7c2..2be39906480a 100644
--- a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
+++ b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/messaging/archive/2.0.3-RELEASE.tar.gz -> javax-jms-api-2.0.3-RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1ced834445483cce34ed735111921f4d
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.0 b/metadata/md5-cache/dev-java/javax-jsp-api-2.0
new file mode 100644
index 000000000000..2fec285b39af
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/javax-servlet-api:2.5 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JavaServer Pages(TM) API JSR-000152 JSR-000245
+EAPI=8
+HOMEPAGE=https://jcp.org/aboutJava/communityprocess/final/jsr152/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=CDDL GPL-2-with-classpath-exception
+RDEPEND=dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.0
+SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.0/jsp-api-2.0-sources.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=1bc878b29cd769d45633510e47e4eab1
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.2 b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
new file mode 100644
index 000000000000..90cb8173c5df
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/javax-el-api:2.2 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JavaServer Pages(TM) API JSR-000152 JSR-000245
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=CDDL GPL-2-with-classpath-exception
+RDEPEND=>=virtual/jre-1.8:* dev-java/javax-el-api:2.2 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.2
+SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.2/jsp-api-2.2-sources.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=22a7968e64ab038619d5daa2575a980d
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1 b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
index 252bb9d57ab4..86e6ba2a59a4 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/mail/archive/refs/tags/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4f2134451cece532730774e7a4819886
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-2.5 b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
new file mode 100644
index 000000000000..81c4e3e25d47
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JavaServlet(TM) Specification
+EAPI=8
+HOMEPAGE=https://javaee.github.io/servlet-spec/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=CDDL GPL-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.5
+SRC_URI=https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=5b31379ed2103461f60945e3a677d88e
diff --git a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4 b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
new file mode 100644
index 000000000000..5f79a7de9387
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-servlet-api:4 dev-java/jakarta-xml-soap-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Eclipse Project for Stable EE4J APIs
+EAPI=8
+HOMEPAGE=https://github.com/eclipse-ee4j/jax-rpc-api
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/jakarta-xml-soap-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/jax-rpc-api/archive/1.1.4.tar.gz -> jax-rpc-api-1.1.4.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=93115b51d085b42fa985f8bdd47e9f96
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
index eab929c70391..ac615bd5ab86 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-co
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=eaad392d1fe1f2dd6238ab66a6d755c8
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
index 48b036ca328c..ee42a402d25f 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/3.0.1.tar.gz -> jaxb-api-3.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=189e24d7f81c9503e4d29c01dd6706b9
diff --git a/metadata/md5-cache/dev-java/jaxb-api-4.0.0 b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
index b67d8a843b0f..b0f7aca90ffa 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-4.0.0
+++ b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/4.0.0.tar.gz -> jaxb-api-4.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6c076d76bd637bb68d4877add518a21f
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1 b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
index f74e63dcd3ac..6d3b35f13b7f 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz -> jaxb-ri-4.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=be0384ebec034698b0cc7fadfac21251
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1 b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
index 35a4e7eb3c0f..16ff78983189 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/2.1.0.tar.gz -> jaxb-stax-ex-2.1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8ce9422c25c8484b4dd45329151adf98
diff --git a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1 b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
index a9bd5d93f405..ab2bd5b0d37d 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( dom4j jdom xom )
 RESTRICT=!test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz -> jaxen-1.2.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=40233440ad9fc6c27b7884eb9f32577c
diff --git a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6 b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
index bb643d4554dd..e3edfead9ec4 100644
--- a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
+++ b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/rest/archive/2.1.6.tar.gz -> jaxrs-api-2.1.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=19bdf442bae5c4fca38343ac70ee1005
diff --git a/metadata/md5-cache/dev-java/jaxws-api-2.3.3 b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
index 3b77a830eba7..db9584bd679c 100644
--- a/metadata/md5-cache/dev-java/jaxws-api-2.3.3
+++ b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-ws-api/archive/2.3.3.tar.gz -> jaxws-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=520b92f115908b456c7f99746eb67b1f
diff --git a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3 b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
index 5981bb5fa1c7..e065b06bac10 100644
--- a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3ed85986046b86bfe4923b43b92aa74a
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
index ac391b407a1f..14b35bb16eb1 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=650aabbae482fd484ab5cfeeff14885c
diff --git a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1 b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
index 823ba1b25a95..f2eec15c2cda 100644
--- a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
+++ b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz -> jboss-jms-api-1.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5d60f8328a4acde2dd87178749caf147
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
index 0806ef8e69ad..33678f3fb2b8 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.3-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=464b16ed641d1a1dc99e77febba64fd3
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
index 3d4282188233..bcdebf53346c 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8ee1afeba3f37c7129584659dbe505fb
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
index 314279a76d67..df60b6244d9b 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f0e312c2ab9d25d016eacd88a6b13b99
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
index 127c47b1bca5..fe67becebec1 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f35d1dc80b7b4303d72959c9c2d49538
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
index 74238700c731..86cce4933320 100644
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2102558eeb9f6633f492229e3b75c6f1
diff --git a/metadata/md5-cache/dev-java/jcommander-1.82 b/metadata/md5-cache/dev-java/jcommander-1.82
index f52b51229598..b7a16e931efd 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.82
+++ b/metadata/md5-cache/dev-java/jcommander-1.82
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/1.82.tar.gz -> jcommander-1.82.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=78b36510eb443bcc396ec20166e65ae3
diff --git a/metadata/md5-cache/dev-java/jctools-core-4.0.1 b/metadata/md5-cache/dev-java/jctools-core-4.0.1
index 094271a6f28e..fe653a1cbe5d 100644
--- a/metadata/md5-cache/dev-java/jctools-core-4.0.1
+++ b/metadata/md5-cache/dev-java/jctools-core-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/JCTools/JCTools/archive/v4.0.1.tar.gz -> jctools-4.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=fa033cd4ecfca3a23491c0ced6fcaa16
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26 b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
index 4166980b686a..639686987d08 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.0.26
@@ -11,5 +11,5 @@ LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26-sources.jar -> jdbc-mysql-8.0.26-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e77b7ef9974dc977efe71afc9322d6fb
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0
index 4029db55ad69..30332e5b974b 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.5.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.5.0.src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bc72f77cd59bbdfb833dd5d32812876d
diff --git a/metadata/md5-cache/dev-java/jdisasm-1.0.6 b/metadata/md5-cache/dev-java/jdisasm-1.0.6
index ae6354d677c4..51f6eeece8d2 100644
--- a/metadata/md5-cache/dev-java/jdisasm-1.0.6
+++ b/metadata/md5-cache/dev-java/jdisasm-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-nullanalysis:0 >=dev-java/java-conf
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/jdisasm/archive/5e354d659e4320d154b3f1fbff24c89c1ba48987.tar.gz -> jdisasm-1.0.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3d5f950cf0c07cab5cc6d7ceab608f73
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6.1 b/metadata/md5-cache/dev-java/jdom-2.0.6.1
index d6c025c67cd9..5221f2ba928d 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6.1
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xal
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1151c4b0c84ce6383754007044d0e5f7
diff --git a/metadata/md5-cache/dev-java/jeromq-0.5.2 b/metadata/md5-cache/dev-java/jeromq-0.5.2
index 7ae760af2357..fa4157b0a38b 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.5.2
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jnacl:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/jeromq/archive/v0.5.2.tar.gz -> jeromq-0.5.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=cbdf1b7c47907d1fd626e6f811fc62be
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.10 b/metadata/md5-cache/dev-java/jffi-1.3.10
new file mode 100644
index 000000000000..d00aa3a35649
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jffi-1.3.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Foreign Function Interface
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jffi
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1.3
+SRC_URI=https://github.com/jnr/jffi/archive/jffi-1.3.10.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=91b70ea99e6f59259f10c448703d4c17
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.9-r1 b/metadata/md5-cache/dev-java/jffi-1.3.9-r1
index 0a860ede6ac9..2c0446ca78ac 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.9-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.3.9-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-
 RESTRICT=!test? ( test )
 SLOT=1.3
 SRC_URI=https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b629ec12c379285a30c13dec37c157ba
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index fe09814615e7..225cc5ad602a 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=479edb30c65ebe69783faaf5f7ffa02e
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1 b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
index 70530629b75c..5aa50c7dbf13 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b8ac9859bde44b536280eca8b7171498
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
index 4e3a66f775ae..35ac65012d47 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=d52a14c07ec78008e65c2d3c455d6c4a
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
index 46ef066318a6..afd30fbfd18a 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jgoodies-common:1.8 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.6
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=10aea06f77390c986abddf2e4041a2ee
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.7.12 b/metadata/md5-cache/dev-java/jide-oss-3.7.12
index 63aed018e869..7279f8aa28ce 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.7.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.7.12
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz -> jide-oss-3.7.12.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c56dd1b825e9b9b216e38d167a33cb19
diff --git a/metadata/md5-cache/dev-java/jline-2.14.6 b/metadata/md5-cache/dev-java/jline-2.14.6
index fb31c327d8c7..65baa4503b26 100644
--- a/metadata/md5-cache/dev-java/jline-2.14.6
+++ b/metadata/md5-cache/dev-java/jline-2.14.6
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/
 RESTRICT=!test? ( test ) test
 SLOT=2
 SRC_URI=https://github.com/jline/jline2/archive/jline-2.14.6.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5e27aa77287fd305780286a6ca2c1ae1
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.35 b/metadata/md5-cache/dev-java/jmh-core-1.35
index 67373baabc44..48d0e43cca36 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.35
+++ b/metadata/md5-cache/dev-java/jmh-core-1.35
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-math:3 dev-java/jopt-simple:0 >=dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jmh/archive/1.35.tar.gz -> jmh-core-1.35.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e9ebc246564e61aa07ef11575c206054
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r2 b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
index c2f1bb184078..205bb6dfaf0f 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=aff79e108dae2fe4b9e30b2acf617385
diff --git a/metadata/md5-cache/dev-java/jmock-2.12.0 b/metadata/md5-cache/dev-java/jmock-2.12.0
index 4d98fececfea..39d3616c5bee 100644
--- a/metadata/md5-cache/dev-java/jmock-2.12.0
+++ b/metadata/md5-cache/dev-java/jmock-2.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jmock-developers/jmock-library/archive/2.12.0.tar.gz -> jmock-2.12.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1521abaefb5ec042b7d304daf626e49e
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index 236d1b577c74..0a4bd9ea6984 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neilalexander/jnacl/archive/v1.0.tar.gz -> jnacl-1.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5e705f6ce84403d0bef9d073976f8796
diff --git a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0 b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
index db31e750510c..7679229da65d 100644
--- a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
+++ b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5989a8289a9d4ccdc925dbb833bf93fa
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.3 b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
index 0a362eb58f21..ec13b89b4cb3 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.10.3
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/refs/tags/jnr-constants-0.10.3.tar.gz -> jnr-constants-0.10.3-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6bc0cca0013ff6c3cddddfb28b1557ea
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.4 b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
new file mode 100644
index 000000000000..51e046a2279a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=A set of platform constants (e.g. errno values)
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jnr-constants
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.10.4.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=dc4948acc29d88e782801b8b9193dea6
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
index 8629d39ff34f..ccaa844e7fe1 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 >=dev-java/jffi-1.3.8:1.3 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1e272bab07b149a97a96c8484e5ce448
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0 b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
index 1906bb0be512..021a3efdae65 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/jnr-netdb-1.2.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=df5501fd7e0f29e0b38f9702b8b75f67
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.15 b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
index 928adcda8297..b18ca4fd07b0 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.1.15
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.15
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:*
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.15.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0e7abf65610f6fd786846a3d990a5679
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.16 b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
new file mode 100644
index 000000000000..dc7dcd7b6a9b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Common cross-project/cross-platform POSIX APIs
+EAPI=8
+HOMEPAGE=https://github.com/jnr/jnr-posix
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=3.0
+SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.16.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=259b90296ca349f3611c1e75ae18f3fe
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
index efa811e4355a..a64d95c2c4cc 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/archive/refs/tags/1.0.2.tar.gz -> jnr-x86asm-1.0.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=39e0820ac165bd3223bf2966ddddad04
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
index dcde92d1216e..ee7256f2f3a9 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-convert/archive/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ad7d4d09859c742a3e23f31d33dbd0d7
diff --git a/metadata/md5-cache/dev-java/joda-time-2.11.2 b/metadata/md5-cache/dev-java/joda-time-2.11.2
index 87468e1ff778..ef3caf048382 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.11.2
+++ b/metadata/md5-cache/dev-java/joda-time-2.11.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/v2.11.2.tar.gz -> joda-time-2.11.2.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=620aaeb4f8dc25286f126dd781672f71
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16-r1 b/metadata/md5-cache/dev-java/jol-core-0.16-r1
index 842e8d1fedc2..7647ef4f7f2d 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16-r1
+++ b/metadata/md5-cache/dev-java/jol-core-0.16-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jol/archive/0.16.tar.gz -> jol-0.16.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=44c3b43f7d481c5f616d3b26b4ea5dba
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0.4 b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
index d97c4155f030..9c257b6aa584 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0.4
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-5.0.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bce8e250c8a37943c395146ee848e74c
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
index 56f313fe5379..a185ae34b494 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c518f3b0782e0d8a81457374013abe21
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.55 b/metadata/md5-cache/dev-java/jsch-0.1.55
index 8fc3e6cda4dd..3d51cc54886e 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.55.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=3c67018e37f64ad1b88f0747698b03d1
diff --git a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9 b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
index abe9f89ff736..631eb650d69f 100644
--- a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
+++ b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz -> jsch-agent-proxy-0.0.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f0145b7f42bda4b62567a4fe7ed159e0
diff --git a/metadata/md5-cache/dev-java/json-20220320 b/metadata/md5-cache/dev-java/json-20220320
index de3b186dc98d..958debc4287e 100644
--- a/metadata/md5-cache/dev-java/json-20220320
+++ b/metadata/md5-cache/dev-java/json-20220320
@@ -10,5 +10,5 @@ LICENSE=JSON
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 -> json-20220320.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0c4b904e5a8e6d956a21cdf4f4e42532
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1-r2 b/metadata/md5-cache/dev-java/json-simple-1.1-r2
index b7f85dd13ed9..2b7b19d42633 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1-r2
+++ b/metadata/md5-cache/dev-java/json-simple-1.1-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fangyidong/json-simple/archive/tag_release_1_1_1.tar.gz -> json-simple-1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=582d7ea68716f01a3bafa1082f0145c6
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1 b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
index 41b6aa59288c..8204bc2d08c5 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f010bcb7603d30304cccc69595761b8d
diff --git a/metadata/md5-cache/dev-java/jstl-1.2.7 b/metadata/md5-cache/dev-java/jstl-1.2.7
new file mode 100644
index 000000000000..22a16488b855
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jstl-1.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 dev-java/jstl-api:0 dev-java/xalan:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Standard Tag Library API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 dev-java/jstl-api:0 dev-java/xalan:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=3a0e28ac455feedad0092e2af7622b2c
diff --git a/metadata/md5-cache/dev-java/jstl-api-1.2.7 b/metadata/md5-cache/dev-java/jstl-api-1.2.7
new file mode 100644
index 000000000000..e66f47d03faf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jstl-api-1.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Standard Tag Library API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jstl
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=2e5ad26438d02c84c4d5188dc61e6abe
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1-r1 b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
index fb32c3382787..b9e9de8af78a 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://sourceforge/project/jtds/jtds/1.3.1/jtds-1.3.1-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=730dfb2314979eb49a33d1e6e2b55e02
diff --git a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3 b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
index 955d1cb78d25..52f0a14f2dff 100644
--- a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=599b9d6b63bfc64b83d60d99fae2808f
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 54e948589a11..c663fcefd441 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2cb66bdc1fddf90655369bf84c447628
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2 b/metadata/md5-cache/dev-java/junit-4.13.2
index 51d66dd50e1b..73b7cb4382d6 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2
+++ b/metadata/md5-cache/dev-java/junit-4.13.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz -> junit-4.13.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=367ad502a59941823b7c663f9f0086d3
diff --git a/metadata/md5-cache/dev-java/junit-clptr-1.2.2 b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
index 3342234290af..4eacf9a9247d 100644
--- a/metadata/md5-cache/dev-java/junit-clptr-1.2.2
+++ b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz -> junit-clptr-1.2.2-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=cf422be6a5523815b02e67c5e3ea8ca8
diff --git a/metadata/md5-cache/dev-java/junit-dataprovider-2.9 b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
index c0ac9475470f..fd94933b976c 100644
--- a/metadata/md5-cache/dev-java/junit-dataprovider-2.9
+++ b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/findbugs-annotations:0 >=dev-java/java-conf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TNG/junit-dataprovider/archive/v2.9.tar.gz -> junit-dataprovider-2.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c09c87b5499b157c615b736a11a00218
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1 b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
index 2aed0d5df8c9..de7d46cbd977 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=65bbce8fa50be869136354dd1522ad59
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2 b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
index 4cf98325b714..f54d23f7f4ce 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.tar.gz -> jzlib-1.1.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c7f98be39fac6bb494bcd0bf1b9d1786
diff --git a/metadata/md5-cache/dev-java/kafka-clients-1.1.1 b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
index 0ff716719e92..bd7e0414b973 100644
--- a/metadata/md5-cache/dev-java/kafka-clients-1.1.1
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.25:0 >=dev-java/snappy-1.1.7.1:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/kafka/1.1.1/kafka-1.1.1-src.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4 b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
index 16d216f02a83..d79141492f01 100644
--- a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LMAX-Exchange/disruptor/archive/3.4.4.tar.gz -> lmax-disruptor-3.4.4.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b146537d280a8b896c6cc08bc4f64ed5
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
index 45b1f5288239..d6f10fbff9e0 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/log4j-api-2.19.0:2 ~dev-java/log4j-core-2.19.0:2 >=virtual/jre
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1f9446a990e19064b14a6d76721a9620
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-api-2.19.0
index 696ca65022e1..045fe7d92e32 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-api-2.19.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz verify-sig? ( https://www.apache.org/dist/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=27aa05fa1790c2623c6d60c4cd05d99b
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.19.0 b/metadata/md5-cache/dev-java/log4j-core-2.19.0
index 7b7f661e00e1..61958850a681 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-core-2.19.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 d
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9d8ca8868613ba66dd901fcdb5c11444
diff --git a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3 b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
index 218f234ce02d..44cb8926bf99 100644
--- a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b901993a7a54d46a3a5ee0cb962d78df
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.4.1 b/metadata/md5-cache/dev-java/logback-classic-1.4.1
index 04a5383666cf..e0e7cdf22991 100644
--- a/metadata/md5-cache/dev-java/logback-classic-1.4.1
+++ b/metadata/md5-cache/dev-java/logback-classic-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/janino-3.1.7:0 dev-java/jakarta-mail-api:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz -> logback-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=14741cc4abd85227aabf0ccf826d15d6
diff --git a/metadata/md5-cache/dev-java/logback-core-1.4.1 b/metadata/md5-cache/dev-java/logback-core-1.4.1
index 201bc4f03467..89d8362da7ef 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.4.1
+++ b/metadata/md5-cache/dev-java/logback-core-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-mail:0 dev-java/jakarta-mail-api:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.4.1.tar.gz -> logback-1.4.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=62648581b88455f373c665dfa72cfa1f
diff --git a/metadata/md5-cache/dev-java/lzma-22.01 b/metadata/md5-cache/dev-java/lzma-22.01
index 24cb079d34ac..2dec34301f40 100644
--- a/metadata/md5-cache/dev-java/lzma-22.01
+++ b/metadata/md5-cache/dev-java/lzma-22.01
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://7-zip.org/a/lzma2201.7z -> lzma-22.01.7z
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
 _md5_=c1691f5689ab4c5928981f3e5e407225
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index f6aa0141fe83..5001dd649207 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a7faba087b41216fdacdba3c45dc711c
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.20 b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
index 78f87567be53..12ae22d86c24 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.20
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0 LGPL-2.1
 RDEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz -> mchange-commons-0.2.20.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8ebed4da60f3daa69ceb2c883b13c2b6
diff --git a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0 b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
index 679e1a0813e8..90fc6f9b7367 100644
--- a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
+++ b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-annotations-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/marschall/memoryfilesystem/archive/2.3.0.tar.gz -> memoryfilesystem-2.3.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=0a08875c58dcd668ede850fa6a6be13d
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
index 4c19f357bf18..5ee93dfdea57 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=86bf981925d944a72a08255619983dd7
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.9 b/metadata/md5-cache/dev-java/metainf-services-1.9
index e448aa8cc89f..17e5effca201 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.9
+++ b/metadata/md5-cache/dev-java/metainf-services-1.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.9.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a863b6624348b4e4434b9b84a7a7c4cf
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r3 b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
index d458323f200b..0fbe7772a372 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r3
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=10c25dacd87e87de7303cf8301c1d000
diff --git a/metadata/md5-cache/dev-java/mockito-4.11.0 b/metadata/md5-cache/dev-java/mockito-4.11.0
index 92acbe28dc52..62e1ca75c43e 100644
--- a/metadata/md5-cache/dev-java/mockito-4.11.0
+++ b/metadata/md5-cache/dev-java/mockito-4.11.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/mockito/mockito/archive/v4.11.0.tar.gz -> mockito-4.11.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=229e6f420f458da610051287c9fce3c6
diff --git a/metadata/md5-cache/dev-java/msv-2022.7 b/metadata/md5-cache/dev-java/msv-2022.7
index 34dd59b7b043..af12689673b8 100644
--- a/metadata/md5-cache/dev-java/msv-2022.7
+++ b/metadata/md5-cache/dev-java/msv-2022.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=52e706ca10a7d66f6ba1ca038a131112
diff --git a/metadata/md5-cache/dev-java/mvel-2.3.2-r1 b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
index 4f11e939f657..5996ecbe3e52 100644
--- a/metadata/md5-cache/dev-java/mvel-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.3
 SRC_URI=https://github.com/mvel/mvel/archive/refs/tags/mvel2-2.3.2.Final.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=36977dbfaeea9af5404e6b16fb157e42
diff --git a/metadata/md5-cache/dev-java/netty-4.1.35-r1 b/metadata/md5-cache/dev-java/netty-4.1.35-r1
index 022c170ce9f5..ddb484f543b8 100644
--- a/metadata/md5-cache/dev-java/netty-4.1.35-r1
+++ b/metadata/md5-cache/dev-java/netty-4.1.35-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:3 d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.1.35.Final.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a07515be97ed0a7aa5a7cf04f6552d8c
diff --git a/metadata/md5-cache/dev-java/objenesis-3.3 b/metadata/md5-cache/dev-java/objenesis-3.3
index 2980c3b29c7d..1d1347490c16 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.3
+++ b/metadata/md5-cache/dev-java/objenesis-3.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/easymock/objenesis/archive/3.3.tar.gz -> objenesis-3.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=51c4f7dbd5eb1ef479c46a2865917463
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000 b/metadata/md5-cache/dev-java/openjfx-8.1000
index 7a044e6edc72..17bf77bd9c9e 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000
@@ -12,5 +12,5 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://services.gradle.org/distributions/gradle-4.10.3-bin.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=498092692a9d4a8c0dbccc4a78cef95a
diff --git a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1 b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
index 9ff2c7a7522c..dc4659fa4013 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/opentest4j/archive/r1.2.0.tar.gz -> opentest4j-1.2.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c67c7829cc4f727e0e6a8ef230e7f448
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0 b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
index 44a4fa200139..2f87885ad36d 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
+++ b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r8/osgi.annotation-8.1.0.jar -> osgi-annotation-8.1.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a03a56d045b6a08896036b2c3878277c
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1 b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
index 7a7ca6024c5f..a51853939dae 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
+++ b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar -> osgi-annotation-versioning-1.1.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a9d6c762ca136920c7f039fc17bcc66c
diff --git a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0 b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
index a888d075b758..60eaaff1e9b7 100644
--- a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
+++ b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/cdi-api:0 dev-java/glassfish-persistence:0 dev-java/jakarta-servlet-api:4 dev-java/javax-inject:0 dev-java/jaxrs-api:0 dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8
 SRC_URI=https://docs.osgi.org/download/r8/osgi.cmpn-8.0.0.jar -> osgi-cmpn-8.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=bfbcd2c44da033d978257c1dd34ae17e
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
index 6662fb555d0a..8ef832102b41 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=31e1c2ea69990e4a833b309fe114c209
diff --git a/metadata/md5-cache/dev-java/osgi-core-8.0.0 b/metadata/md5-cache/dev-java/osgi-core-8.0.0
index 61627d6b4798..05dc06aa9502 100644
--- a/metadata/md5-cache/dev-java/osgi-core-8.0.0
+++ b/metadata/md5-cache/dev-java/osgi-core-8.0.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r8/osgi.core-8.0.0.jar -> osgi-core-8.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=37cb8ebdfc7a261503a25c2be40c1e56
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
index 36d163a46d29..22b404743717 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5af090f872a5bf2c3cff9ab2c3e5a826
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
index 44ea2e367cff..f9c0daa36d2e 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/tomca
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=73a08ca162cb397a8ba5dd880f377f29
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
new file mode 100644
index 000000000000..324b7bd50549
--- /dev/null
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/javax-servlet-api:2.5 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=OSGi Enterprise Release 5 Companion Code
+EAPI=8
+HOMEPAGE=http://www.osgi.org/Main/HomePage
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=38ddbfe10015659edb474e7788a0c025
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
index cd3ca8f7da3c..8c1676ac4440 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2c78499f210b111fd94d81bd4618a5cc
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.27 b/metadata/md5-cache/dev-java/pdfbox-2.0.27
index b3fc793e9739..9f1e4c1c884f 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.27
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.27
@@ -13,5 +13,5 @@ RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=24274850be687a530ffdbff6cb6971a6
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.3-r1 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index 9874bd0a7062..882641c62886 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.3-r1
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remkop/picocli/archive/v4.6.3.tar.gz -> picocli-4.6.3-sources.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=db5e2ea1ef3c5fff4dd8d4e5c43dbe0a
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0 b/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
index 8a3bdcc153cc..cadb7026826b 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-2.6.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6ee76b6ffed94c3ca241032f10d11f7a
diff --git a/metadata/md5-cache/dev-java/poi-5.2.3 b/metadata/md5-cache/dev-java/poi-5.2.3
index 975de5017646..4614a378aa4b 100644
--- a/metadata/md5-cache/dev-java/poi-5.2.3
+++ b/metadata/md5-cache/dev-java/poi-5.2.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/poi/release/src/poi-src-5.2.3-20220909.tgz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1f34718ed49e41427652b9b5e773b2d1
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.21.12 b/metadata/md5-cache/dev-java/protobuf-java-3.21.12
index faf3ef87c5a9..0e287a0745e8 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.21.12
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.21.12
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.12.tar.gz -> protobuf-21.12.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=435d8c2f1c047d369dcc3a466b7b2e15
diff --git a/metadata/md5-cache/dev-java/qdox-2.0.1 b/metadata/md5-cache/dev-java/qdox-2.0.1
index 775a9f01498c..213cc48a818b 100644
--- a/metadata/md5-cache/dev-java/qdox-2.0.1
+++ b/metadata/md5-cache/dev-java/qdox-2.0.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/paul-hammant/qdox/archive/qdox-2.0.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=13e8dbdb52a315b4ee9b2842be5f9441
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.8.0 b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
index 4fd1bcd38ab7..5e853fe668bf 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.8.0
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz -> randomized-runner-2.8.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ffa4a8dedf4d659af3f555a344b67949
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r4 b/metadata/md5-cache/dev-java/reflections-0.9.12-r4
index e055a58de7b4..032bfcd9ee85 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r4
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassis
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=85285738ca805c1f64eef5581645f7f5
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r5 b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
new file mode 100644
index 000000000000..e93bdbd5d2ef
--- /dev/null
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/javax-servlet-api:2.5 >=virtual/jdk-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Reflections - a Java runtime metadata analysis
+EAPI=8
+HOMEPAGE=https://github.com/ronmamo/reflections
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=WTFPL-2 BSD-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassist:3 dev-java/slf4j-api:0 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=2494bd189d9b308ebb5f128355bfb030
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
index 559146c23f1a..c7c6dcf0e84b 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip -> relaxng-datatype-1.0.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6b41635752749efe6c795a098b293ad6
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-20020414 b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
index ace4e7b6185c..d888db22f23c 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-20020414
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/relaxngDatatype/relaxngDatatype/20020414/relaxngDatatype-20020414-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=6848b08a00e005ea214e14d903654d1f
diff --git a/metadata/md5-cache/dev-java/reload4j-1.2.22 b/metadata/md5-cache/dev-java/reload4j-1.2.22
index b5d30370a8c3..68a84c2817b2 100644
--- a/metadata/md5-cache/dev-java/reload4j-1.2.22
+++ b/metadata/md5-cache/dev-java/reload4j-1.2.22
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 >=d
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/reload4j/archive/v_1.2.22.tar.gz -> reload4j-1.2.22.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=b3ff7d60da0064d7d74c7fca86bf26ed
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14
index d42c60be6083..0bffa5721b46 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_14_Release.tar.gz -> rhino-1.7.14.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=e22c22e09284defb9a49b15e471af42c
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
index 30b023b68429..43f9c9d9fa91 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r4
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/rome-0.9.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=213f0e66eb276ced3a6c501f727e5592
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r4 b/metadata/md5-cache/dev-java/sac-1.3-r4
index 6838426e901b..3a4a63943af4 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r4
+++ b/metadata/md5-cache/dev-java/sac-1.3-r4
@@ -11,5 +11,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.w3.org/2002/06/sacjava-1.3.zip -> sac-1.3.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=1b00e55158cbaeeb6aeb966bb8d0e47e
diff --git a/metadata/md5-cache/dev-java/saslprep-1.1-r1 b/metadata/md5-cache/dev-java/saslprep-1.1-r1
index 558600eaeae7..972dc04fdc70 100644
--- a/metadata/md5-cache/dev-java/saslprep-1.1-r1
+++ b/metadata/md5-cache/dev-java/saslprep-1.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/stringprep:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/1.1/saslprep-1.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8479af41ff6c2a238ee56ac3abafdaa4
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r5 b/metadata/md5-cache/dev-java/sax-2.2.1-r5
index 4a2d4ec03d3d..616f0a95742c 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7a2c78e8c769fc141720a601e6ffdfdf
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r3 b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
index f25cd0e37394..ebc7bfeb489c 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r3
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
@@ -11,5 +11,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=mirror://sourceforge/project/saxon/saxon6/6.5.5/saxon6-5-5.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=58ccce8abcdbad8e38d4e11952e2031c
diff --git a/metadata/md5-cache/dev-java/scram-2.1 b/metadata/md5-cache/dev-java/scram-2.1
index 1944b0001ed9..a85cbbcb1fe1 100644
--- a/metadata/md5-cache/dev-java/scram-2.1
+++ b/metadata/md5-cache/dev-java/scram-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/saslprep:0 >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f03d39f288f35be24e795d74483b0153
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
index 69abe6333552..8e75e0016f8e 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=308d0100ae4ba811f4261b0944400eaf
diff --git a/metadata/md5-cache/dev-java/slf4j-api-2.0.3 b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
index acc6aad904e3..b72130d18d12 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8d3e2c14d46b04c10587b5e30cd66c85
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3 b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
index 3bae734c0e82..af3bea21ba9f 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/javassist:3 ~dev-java/slf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=296eeb74c0907f93c5473a9e8ed14a52
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3 b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
index c5dc780532b0..094ed372e493 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f6498be8910a028b01ef1c4a659fb4e6
diff --git a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3 b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
index a03a1dfa5ca0..6545ce296084 100644
--- a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/reload4j:0 ~dev-java/slf4j-api-2.0.3:0 >=de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c0d8ae144a3cd2102f5ec172801b0cce
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3 b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
index 14f0260c02e4..c3ec66018e80 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=778d0b8809400ec08a6ea785cec13279
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.33 b/metadata/md5-cache/dev-java/snakeyaml-1.33
index 89a8fc62ef54..2fa91c720548 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.33
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.33
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.33.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8f519c2540dfaf4f22e4c33e3b90e8f2
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index 3c5a6b0b4f9c..8b0c420487bc 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.2
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-1.2.tar.gz -> sparsebitset-1.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5f69a03feebea29a78b517f77e5b9cf8
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1 b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
index 01a1b1ebf040..6d64e01eecf8 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=950511a8e1083c5f4ad34a160222c06e
diff --git a/metadata/md5-cache/dev-java/stringprep-1.1 b/metadata/md5-cache/dev-java/stringprep-1.1
index 5f1b0b5eda9c..50eb8190a50c 100644
--- a/metadata/md5-cache/dev-java/stringprep-1.1
+++ b/metadata/md5-cache/dev-java/stringprep-1.1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/1.1/stringprep-1.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=60be8cc441cc9801b4844c531d85b0ca
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
index 3f17413fc237..359aeee0cd39 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr:0 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=ce2be796703b4a85cc2dc9fa30c706f7
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.2 b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
index cb958295db40..b6c86f4c6962 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.2
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.2/ST4-4.3.2-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.2.tar.gz -> stringtemplate-4.3.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7a97a65cb993f6578b85ff5c07499110
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2 b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
index 859d3c6c209d..2519674668e4 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=2676b345338fb20e84e5cddcba153511
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
index 42e674d7d254..21db5d9fde98 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/jre:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/1.6.4/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8b75665f7ccbc2320259e96eef6cebf2
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
index e2bdaba8d168..eb7524548f60 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=f12e43df4ba1e563f1b2e5f55c8df20c
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
index 4c97c6aa3e64..8d1891f97a54 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=bt747
 SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=48ea44ce683e8616b1bf5804c5571b74
diff --git a/metadata/md5-cache/dev-java/system-rules-1.19.0 b/metadata/md5-cache/dev-java/system-rules-1.19.0
index 120ee1bf493a..10da4e81d3ff 100644
--- a/metadata/md5-cache/dev-java/system-rules-1.19.0
+++ b/metadata/md5-cache/dev-java/system-rules-1.19.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/system-rules/archive/system-rules-1.19.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=99c09d7bec18b6cb525588968c5568bf
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10-r1 b/metadata/md5-cache/dev-java/testng-6.9.10-r1
index 5dcf01429649..5510225ff6ed 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10-r1
+++ b/metadata/md5-cache/dev-java/testng-6.9.10-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5de2015633ade6be261ed58d4f3809b1
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
index 1efd2a5d06b2..c2607d76a752 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=cf50e26184f54a76c3a9c592977851f3
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
index 45cc59a4b3af..2d2d91254176 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=f6fe1875197197849063a7fc4dcb037f
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
index 8f644a86b504..ece0dc1ea5aa 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=df8f695d1d7bbad39f5267e98f1b3de6
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
index a60d829af48a..4a23ee3bf1eb 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 ~dev-java/tomcat-servlet-api-10.1.5:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=0bb551a7c7bfe9714ad793d2fe88e3b1
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
index d696d677d07d..ca02147fbc35 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-8.5.85:3.0 ~dev-java/tomcat-servlet-api-8.5.85:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=6625c15023b978c345ecbbf41e4d2c87
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
index 3ced3f33ce87..2e2423c9dcec 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 ~dev-java/tomcat-servlet-api-9.0.71:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=aa21f88ea41778645f03b852172c58a7
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1 b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
index 809aebf66388..90fe1c528e8b 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=a1c9a6ba8179f9c6668bafe36b75ab9d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
index a93b834f1639..d9868995f3c0 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=2374a7418f92bcc4545343cb34a0b633
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
index cb4416452f05..3d55cc2b0cde 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.109/src/apache-tomcat-7.0.109-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8b2861f02a5c0fc5d82edcfef67e2583
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
index a2a8af5bda06..3e623dfdefa9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=3ded8a4c54cf3ab99d25dee9cf6dad3c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
index 32a475dbc257..278f387243f0 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=62647a5fa80f845bd380fba7c962a9fb
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1 b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
index 43aa36168eec..0123a017a7c0 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.3.tar.gz -> treelayout-1.0.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=8887a0352989a252aa1bba63953ac9bb
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.4.2 b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
index 8907e61f213e..43494a44a7b2 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.4.2
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/lightbend/config/archive/v1.4.2.tar.gz -> typesafe-config-1.4.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=908813cab4fcc930cc4aecdd557ee93d
diff --git a/metadata/md5-cache/dev-java/unbescape-1.1.6 b/metadata/md5-cache/dev-java/unbescape-1.1.6
index d55eb85a125c..3a9fe376f016 100644
--- a/metadata/md5-cache/dev-java/unbescape-1.1.6
+++ b/metadata/md5-cache/dev-java/unbescape-1.1.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/unbescape/unbescape/archive/unbescape-1.1.6.RELEASE.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c1e16e907ccc62ebf561f004e95db972
diff --git a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1 b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
index 9eb1f8c21049..669f0c4891e7 100644
--- a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
+++ b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v2.9.1.tar.gz -> univocity-parsers-2.9.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=19253877fdd33c094d6d50c427f7f224
diff --git a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
index 1b5c6257fabc..3d3a57888072 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=a0a24c2ae72b3e51abe0c0d08b649679
diff --git a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
index a54777552b66..538463ffd7c4 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=5e3cfb69d85910d60d651cc0a669454d
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index e81d9c579f3f..f1ec028bd1ad 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=196e2c49434cac18d569e94ce794c2cf
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.4.0 b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
index 16ef0ee50300..8c8749cff60e 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.4.0
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.4.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=950d670ebe48986ff8af948e4eb973ea
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.3 b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
index d0dc6421d746..d69ef6ad7a4b 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.3
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/wsdl4j/WSDL4J/1.6.3/wsdl4j-src-1.6.3.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=25305cc789027193056fb86672482904
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
index 12ff417980f1..6f26fae2832e 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=cd902d6eff7e78d19623f8568ba74796
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2 b/metadata/md5-cache/dev-java/xerces-2.12.2
index ef9ad559d01f..c0a71151016d 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=7fa4e7df315d179713b3fd20c507a16c
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.1 b/metadata/md5-cache/dev-java/xerial-core-2.1
index a233f2017de0..e42678259a51 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xerial/xerial-java/archive/2.1.tar.gz -> xerial-core-2.1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=79739ea4111dfa331b7d9653f0054d92
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
index 92d32f355d6a..f984c0dfd961 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=11df5eb34ec712c6d6bd68a8a8901ed0
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
index ac959a9e8596..d99a355f63d7 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xerces/xml-commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=62cf7cdb0ea6134a378cdae8184a8d35
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
index ea13cc0cf3b8..dcb63819e9e4 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=d
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=96f14e668236d46c2c26e991cfd6703c
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.27 b/metadata/md5-cache/dev-java/xmpbox-2.0.27
index c4b67fdfb761..8db6b2ec8439 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.27
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.27
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=62031f511db190b6effb65117fcb0f55
diff --git a/metadata/md5-cache/dev-java/xom-1.3.7 b/metadata/md5-cache/dev-java/xom-1.3.7
index 144a376fd538..5f96d926c404 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.7
+++ b/metadata/md5-cache/dev-java/xom-1.3.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.7/xom-1.3.7-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=9c30cff4e1a02cc0ffcbe68aa5a5c148
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
index 4919028e9425..ff12b206d16c 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=805b3964c2455242a09dcf8a33a87ccd
diff --git a/metadata/md5-cache/dev-java/xsdlib-2022.7 b/metadata/md5-cache/dev-java/xsdlib-2022.7
index d6fd160f2fef..e16e3aaeac98 100644
--- a/metadata/md5-cache/dev-java/xsdlib-2022.7
+++ b/metadata/md5-cache/dev-java/xsdlib-2022.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/relaxng-datatype:0 dev-java/xerces:2 >=dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4cc194c182c5d9ca153f772172cb40d1
diff --git a/metadata/md5-cache/dev-java/xz-java-1.9 b/metadata/md5-cache/dev-java/xz-java-1.9
index 5a321ceb9eb8..f3360e25c975 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9
+++ b/metadata/md5-cache/dev-java/xz-java-1.9
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-java-1.9.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=4c9fa9f91e413a04f4e7bf627a55dad3
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
index 7d391ba63034..88ef0ebb8a26 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/c1.5.2-5.tar.gz -> zstd-jni-1.5.2.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9b364aea5da8cf709ebb9db674de07ce
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8ee1098f64e7..9054f64bfff4 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/eisl-2.70 b/metadata/md5-cache/dev-lang/eisl-2.70
index 33ad3994438f..d39297b67a89 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.70
+++ b/metadata/md5-cache/dev-lang/eisl-2.70
@@ -4,11 +4,11 @@ DESCRIPTION=Interpreter and compiler compatible with the ISLisp standard
 EAPI=8
 HOMEPAGE=https://github.com/sasagawa888/eisl/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.70.tar.gz -> eisl-2.70.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d67a336a0f3a81c78a543c64d0ea59bb
+_md5_=f83f238245e8fc7b2f7002d44a858d3b
diff --git a/metadata/md5-cache/dev-lang/ispc-1.18.0 b/metadata/md5-cache/dev-lang/ispc-1.18.0
index 1841adfa2052..bd13bb92b9cf 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.18.0
+++ b/metadata/md5-cache/dev-lang/ispc-1.18.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=<sys-devel/clang-15:= !!sys-devel/llvm:0
 DESCRIPTION=Intel SPMD Program Compiler
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.18.0.tar.gz -> ispc-1.18.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=06e2185f7e89031d2c2103b9cb3eba15
+_md5_=bcdec94289b3583214cceda9d1e8901c
diff --git a/metadata/md5-cache/dev-lang/moarvm-2021.06-r1 b/metadata/md5-cache/dev-lang/moarvm-2021.06-r1
deleted file mode 100644
index 33ccb140702e..000000000000
--- a/metadata/md5-cache/dev-lang/moarvm-2021.06-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:= clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
-DESCRIPTION=A 6model-based VM for NQP and Raku
-EAPI=7
-HOMEPAGE=http://moarvm.org
-INHERIT=flag-o-matic
-IUSE=asan clang debug doc +jit optimize static-libs ubsan
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
-RESTRICT=test
-SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2021.06.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6e3e39a454182016648a36e04b8001e7
diff --git a/metadata/md5-cache/dev-lang/moarvm-2021.08 b/metadata/md5-cache/dev-lang/moarvm-2021.08
deleted file mode 100644
index a42f7ec7445b..000000000000
--- a/metadata/md5-cache/dev-lang/moarvm-2021.08
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:= clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
-DESCRIPTION=A 6model-based VM for NQP and Raku
-EAPI=7
-HOMEPAGE=http://moarvm.org
-INHERIT=flag-o-matic
-IUSE=asan clang debug doc +jit optimize static-libs ubsan
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
-RESTRICT=test
-SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2021.08.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6e3e39a454182016648a36e04b8001e7
diff --git a/metadata/md5-cache/dev-lang/moarvm-2021.10 b/metadata/md5-cache/dev-lang/moarvm-2021.10
deleted file mode 100644
index 944d3f4a76db..000000000000
--- a/metadata/md5-cache/dev-lang/moarvm-2021.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:= clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
-DESCRIPTION=A 6model-based VM for NQP and Raku
-EAPI=7
-HOMEPAGE=http://moarvm.org
-INHERIT=flag-o-matic
-IUSE=asan clang debug doc +jit optimize static-libs ubsan
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
-RESTRICT=test
-SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2021.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6e3e39a454182016648a36e04b8001e7
diff --git a/metadata/md5-cache/dev-lang/moarvm-2022.02 b/metadata/md5-cache/dev-lang/moarvm-2022.02
deleted file mode 100644
index 71794227f72b..000000000000
--- a/metadata/md5-cache/dev-lang/moarvm-2022.02
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:= clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
-DESCRIPTION=A 6model-based VM for NQP and Raku
-EAPI=7
-HOMEPAGE=http://moarvm.org
-INHERIT=flag-o-matic
-IUSE=asan clang debug doc +jit optimize static-libs ubsan
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
-RESTRICT=test
-SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2022.02.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=126ec2fa5bdb983c594d88e1b370f154
diff --git a/metadata/md5-cache/dev-lang/moarvm-2022.06 b/metadata/md5-cache/dev-lang/moarvm-2022.06
deleted file mode 100644
index dd65cbdc61f6..000000000000
--- a/metadata/md5-cache/dev-lang/moarvm-2022.06
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:= clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
-DESCRIPTION=A 6model-based VM for NQP and Raku
-EAPI=7
-HOMEPAGE=http://moarvm.org
-INHERIT=flag-o-matic
-IUSE=asan clang debug doc +jit optimize static-libs ubsan
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
-RESTRICT=test
-SLOT=0
-SRC_URI=http://moarvm.org/releases/MoarVM-2022.06.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=126ec2fa5bdb983c594d88e1b370f154
diff --git a/metadata/md5-cache/dev-lang/moarvm-2023.02 b/metadata/md5-cache/dev-lang/moarvm-2023.02
new file mode 100644
index 000000000000..671f6a9f19d9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/moarvm-2023.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:= clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
+DESCRIPTION=A 6model-based VM for NQP and Raku
+EAPI=8
+HOMEPAGE=http://moarvm.org
+IUSE=asan clang debug doc +jit optimize static-libs ubsan
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
+RESTRICT=test
+SLOT=0
+SRC_URI=http://moarvm.org/releases/MoarVM-2023.02.tar.gz
+_md5_=c4caa6a114ce28b11bc033bfde829f5e
diff --git a/metadata/md5-cache/dev-lang/moarvm-9999 b/metadata/md5-cache/dev-lang/moarvm-9999
index 48181af8118f..7e5a885655ab 100644
--- a/metadata/md5-cache/dev-lang/moarvm-9999
+++ b/metadata/md5-cache/dev-lang/moarvm-9999
@@ -2,14 +2,14 @@ BDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:= clang?
 DEFINED_PHASES=configure prepare unpack
 DEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
 DESCRIPTION=A 6model-based VM for NQP and Raku
-EAPI=7
+EAPI=8
 HOMEPAGE=http://moarvm.org
-INHERIT=flag-o-matic git-r3
+INHERIT=git-r3
 IUSE=asan clang debug doc static-libs optimize ubsan
 LICENSE=Artistic-2
 PROPERTIES=live
 RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26:= dev-libs/libffi:=
 RESTRICT=test
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b4337c99d12be43720837e3284a7ae10
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
+_md5_=3aec8bf7361798b5f2712e29341413a2
diff --git a/metadata/md5-cache/dev-lang/nim-1.6.10-r2 b/metadata/md5-cache/dev-lang/nim-1.6.10-r2
index 66fbd296a350..2f93d01351df 100644
--- a/metadata/md5-cache/dev-lang/nim-1.6.10-r2
+++ b/metadata/md5-cache/dev-lang/nim-1.6.10-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://nim-lang.org/
 INHERIT=bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
 IUSE=doc experimental test-js test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nim-lang.org/download/nim-1.6.10.tar.xz experimental? ( https://git.sr.ht/~cyber/nim-patches/archive/1.6.6_p1.tar.gz -> nim-patches-1.6.6_p1.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4965cf0628e7231e2b61057f023f9b9d
+_md5_=571f242503f7cd20f72f5d27831b7f9b
diff --git a/metadata/md5-cache/dev-lang/nqp-2021.06 b/metadata/md5-cache/dev-lang/nqp-2021.06
deleted file mode 100644
index 4c92db3c2061..000000000000
--- a/metadata/md5-cache/dev-lang/nqp-2021.06
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.06[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.06[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2 multibuild
-IUSE=doc clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.06[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/perl6/nqp/releases/download/2021.06/nqp-2021.06.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
-_md5_=dff520ec4c05e75c79bd72f46bc783c0
diff --git a/metadata/md5-cache/dev-lang/nqp-2021.08 b/metadata/md5-cache/dev-lang/nqp-2021.08
deleted file mode 100644
index 00da547bed79..000000000000
--- a/metadata/md5-cache/dev-lang/nqp-2021.08
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.08[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.08[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2 multibuild
-IUSE=doc clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.08[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/perl6/nqp/releases/download/2021.08/nqp-2021.08.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
-_md5_=dff520ec4c05e75c79bd72f46bc783c0
diff --git a/metadata/md5-cache/dev-lang/nqp-2021.10 b/metadata/md5-cache/dev-lang/nqp-2021.10
deleted file mode 100644
index 8ecc3c946400..000000000000
--- a/metadata/md5-cache/dev-lang/nqp-2021.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.10[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.10[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2 multibuild
-IUSE=doc clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2021.10[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/perl6/nqp/releases/download/2021.10/nqp-2021.10.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
-_md5_=dff520ec4c05e75c79bd72f46bc783c0
diff --git a/metadata/md5-cache/dev-lang/nqp-2022.02 b/metadata/md5-cache/dev-lang/nqp-2022.02
deleted file mode 100644
index 92cc7a0bff5b..000000000000
--- a/metadata/md5-cache/dev-lang/nqp-2022.02
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=java? ( dev-java/asm:4 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2022.02[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.9 ) dev-lang/perl
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=java? ( dev-java/asm:4 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2022.02[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2 multibuild
-IUSE=doc clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2022.02[clang=] ) java? ( >=virtual/jre-1.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/perl6/nqp/releases/download/2022.02/nqp-2022.02.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
-_md5_=0c15504d00870c60f392230e0da54299
diff --git a/metadata/md5-cache/dev-lang/nqp-2022.06 b/metadata/md5-cache/dev-lang/nqp-2022.06
deleted file mode 100644
index 5985334d9dac..000000000000
--- a/metadata/md5-cache/dev-lang/nqp-2022.06
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=java? ( dev-java/asm:4 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2022.06[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.9 ) dev-lang/perl
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=java? ( dev-java/asm:4 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2022.06[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2 multibuild
-IUSE=doc clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=java? ( dev-java/asm:4 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2022.06[clang=] ) java? ( >=virtual/jre-1.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/perl6/nqp/releases/download/2022.06/nqp-2022.06.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
-_md5_=0c15504d00870c60f392230e0da54299
diff --git a/metadata/md5-cache/dev-lang/nqp-2023.02 b/metadata/md5-cache/dev-lang/nqp-2023.02
new file mode 100644
index 000000000000..d559defae867
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2023.02
@@ -0,0 +1,17 @@
+BDEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2023.02[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-11 ) dev-lang/perl
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2023.02[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
+EAPI=8
+HOMEPAGE=https://rakudo.org
+INHERIT=java-pkg-opt-2 multibuild
+IUSE=doc clang java +moar test java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2023.02[clang=] ) java? ( >=virtual/jre-11 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/releases/download/2023.02/nqp-2023.02.tar.gz
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
+_md5_=2158aaeaf4b4dce27a0b29047c4d74af
diff --git a/metadata/md5-cache/dev-lang/nqp-9999 b/metadata/md5-cache/dev-lang/nqp-9999
index 8eb91e38198a..2744b0c0eb77 100644
--- a/metadata/md5-cache/dev-lang/nqp-9999
+++ b/metadata/md5-cache/dev-lang/nqp-9999
@@ -1,16 +1,16 @@
-BDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.8 ) dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-11 ) dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Not Quite Perl, a Raku bootstrapping compiler
-EAPI=7
+EAPI=8
 HOMEPAGE=https://rakudo.org
 INHERIT=java-pkg-opt-2 multibuild git-r3
 IUSE=doc clang java +moar test java
 LICENSE=Artistic-2
 PROPERTIES=live
-RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=virtual/jre-11 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
-_md5_=dff520ec4c05e75c79bd72f46bc783c0
+_md5_=2158aaeaf4b4dce27a0b29047c4d74af
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p16-r1 b/metadata/md5-cache/dev-lang/python-2.7.18_p16-r1
index 7d909bb87161..435ff3bcc14c 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p16-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p16-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 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_p16.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2f370406728b1eaa66b258362fdf54e2
+_md5_=a73fdfe7a76fd4f49f5c734da7521b65
diff --git a/metadata/md5-cache/dev-lang/python-3.10.10_p2 b/metadata/md5-cache/dev-lang/python-3.10.10_p2
new file mode 100644
index 000000000000..399743b7b4b5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.10_p2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= dev-python/gentoo-common sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) valgrind? ( dev-util/valgrind ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml verify-sig
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= dev-python/gentoo-common sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.10_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=e86276cde28ec199d09d7cdc485dbe21
diff --git a/metadata/md5-cache/dev-lang/python-3.11.2_p1 b/metadata/md5-cache/dev-lang/python-3.11.2_p1
index 522b44fe8953..2b8de58c33cf 100644
--- a/metadata/md5-cache/dev-lang/python-3.11.2_p1
+++ b/metadata/md5-cache/dev-lang/python-3.11.2_p1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
 RESTRICT=!test? ( test )
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.2_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d0370fedd4230f566ed952eca71e5817
+_md5_=fe037fd6bbfeaf8ef8a40c54275a14e9
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_alpha5 b/metadata/md5-cache/dev-lang/python-3.12.0_alpha5
index b62acb012552..f0ec166863cc 100644
--- a/metadata/md5-cache/dev-lang/python-3.12.0_alpha5
+++ b/metadata/md5-cache/dev-lang/python-3.12.0_alpha5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.12
 SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0a5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0a5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0a5.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=53cabcc6e829149426f1df160265fcd8
+_md5_=362d1107c9bf53509aec8e521a189eae
diff --git a/metadata/md5-cache/dev-lang/python-3.8.16_p3 b/metadata/md5-cache/dev-lang/python-3.8.16_p3
new file mode 100644
index 000000000000..6efd88f6fb93
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.16_p3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk valgrind wininst +xml verify-sig
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.16_p3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3148fce2335cae584ce2e209f937e529
diff --git a/metadata/md5-cache/dev-lang/python-3.9.16_p2 b/metadata/md5-cache/dev-lang/python-3.9.16_p2
new file mode 100644
index 000000000000..18ad27e98541
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.16_p2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= dev-python/gentoo-common sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml verify-sig
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= dev-python/gentoo-common sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.16_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tar.xz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=065b775346de7fb88831292ae226afa0
diff --git a/metadata/md5-cache/dev-lang/rakudo-2021.06 b/metadata/md5-cache/dev-lang/rakudo-2021.06
deleted file mode 100644
index a10a97d5b650..000000000000
--- a/metadata/md5-cache/dev-lang/rakudo-2021.06
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2021.06:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A compiler for the Raku programming language
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2
-IUSE=clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2021.06:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2021.06.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=8568f49ff0bf63762b46c4280fbdb3c1
diff --git a/metadata/md5-cache/dev-lang/rakudo-2021.08 b/metadata/md5-cache/dev-lang/rakudo-2021.08
deleted file mode 100644
index 78402f9a7e6d..000000000000
--- a/metadata/md5-cache/dev-lang/rakudo-2021.08
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2021.08:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A compiler for the Raku programming language
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2
-IUSE=clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2021.08:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2021.08.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=8568f49ff0bf63762b46c4280fbdb3c1
diff --git a/metadata/md5-cache/dev-lang/rakudo-2021.10 b/metadata/md5-cache/dev-lang/rakudo-2021.10
deleted file mode 100644
index 567841d86025..000000000000
--- a/metadata/md5-cache/dev-lang/rakudo-2021.10
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2021.10:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A compiler for the Raku programming language
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2
-IUSE=clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2021.10:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2021.10.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=8568f49ff0bf63762b46c4280fbdb3c1
diff --git a/metadata/md5-cache/dev-lang/rakudo-2022.02 b/metadata/md5-cache/dev-lang/rakudo-2022.02
deleted file mode 100644
index aacd042dc6c4..000000000000
--- a/metadata/md5-cache/dev-lang/rakudo-2022.02
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2022.02:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.9 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A compiler for the Raku programming language
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2
-IUSE=clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2022.02:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2022.02.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=8f0ff71558635fef81c8d517577f4907
diff --git a/metadata/md5-cache/dev-lang/rakudo-2022.06 b/metadata/md5-cache/dev-lang/rakudo-2022.06
deleted file mode 100644
index 17c7d6594d6b..000000000000
--- a/metadata/md5-cache/dev-lang/rakudo-2022.06
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=~dev-lang/nqp-2022.06:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.9 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A compiler for the Raku programming language
-EAPI=7
-HOMEPAGE=https://rakudo.org
-INHERIT=java-pkg-opt-2
-IUSE=clang java +moar test java
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
-RDEPEND=~dev-lang/nqp-2022.06:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( java moar )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2022.06.tar.gz
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=8f0ff71558635fef81c8d517577f4907
diff --git a/metadata/md5-cache/dev-lang/rakudo-2023.02 b/metadata/md5-cache/dev-lang/rakudo-2023.02
new file mode 100644
index 000000000000..213af2f62a57
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2023.02
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=~dev-lang/nqp-2023.02:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.9 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A compiler for the Raku programming language
+EAPI=8
+HOMEPAGE=https://rakudo.org
+INHERIT=java-pkg-opt-2
+IUSE=clang java +moar test java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=~dev-lang/nqp-2023.02:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.9 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2023.02.tar.gz
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=302ab3ab08fdb069306a326f7dfedc32
diff --git a/metadata/md5-cache/dev-lang/rust-1.66.1 b/metadata/md5-cache/dev-lang/rust-1.66.1
index 6a8b1a58f464..ff29ec8f529e 100644
--- a/metadata/md5-cache/dev-lang/rust-1.66.1
+++ b/metadata/md5-cache/dev-lang/rust-1.66.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
 IUSE=clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:15[llvm_targets_AArch64(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AMDGPU? ( sys-devel/llvm:15[llvm_targets_AMDGPU(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_ARM? ( sys-devel/llvm:15[llvm_targets_ARM(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AVR? ( sys-devel/llvm:15[llvm_targets_AVR(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_BPF? ( sys-devel/llvm:15[llvm_targets_BPF(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Hexagon? ( sys-devel/llvm:15[llvm_targets_Hexagon(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Lanai? ( sys-devel/llvm:15[llvm_targets_Lanai(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Mips? ( sys-devel/llvm:15[llvm_targets_Mips(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_MSP430? ( sys-devel/llvm:15[llvm_targets_MSP430(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_NVPTX? ( sys-devel/llvm:15[llvm_targets_NVPTX(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_PowerPC? ( sys-devel/llvm:15[llvm_targets_PowerPC(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_RISCV? ( sys-devel/llvm:15[llvm_targets_RISCV(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Sparc? ( sys-devel/llvm:15[llvm_targets_Sparc(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_SystemZ? ( sys-devel/llvm:15[llvm_targets_SystemZ(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_WebAssembly? ( sys-devel/llvm:15[llvm_targets_WebAssembly(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_X86? ( sys-devel/llvm:15[llvm_targets_X86(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_XCore? ( sys-devel/llvm:15[llvm_targets_XCore(-)] ) wasm? ( sys-devel/lld:15 ) ) ) <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) ) app-eselect/eselect-rust sys-apps/lsb-release
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.66
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=d8f19a094127d07b58068922eea626ad
+_md5_=67e62272095d7eb1a070043351292653
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.65.0 b/metadata/md5-cache/dev-lang/rust-bin-1.65.0
deleted file mode 100644
index 056869f2f09a..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.65.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=8
-HOMEPAGE=https://www.rust-lang.org/
-INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
-REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
-SLOT=stable
-SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-11-03/rust-src-1.65.0.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.65.0-sparc64-unknown-linux-gnu.tar.xz )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=f8c7d911eb4e18e19d6e37827ebba528
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.65.0-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.65.0-r1
new file mode 100644
index 000000000000..df41f2d9295e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.65.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=8
+HOMEPAGE=https://www.rust-lang.org/
+INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311 || ( dev-libs/openssl-compat:1.1.1 <dev-libs/openssl-3 ) sys-apps/lsb-release
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-11-03/rust-src-1.65.0.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.65.0-sparc64-unknown-linux-gnu.tar.xz )
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=5bd3911748a13335f023333d3b197b8d
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.66.1 b/metadata/md5-cache/dev-lang/rust-bin-1.66.1
deleted file mode 100644
index de977cf3b997..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.66.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=8
-HOMEPAGE=https://www.rust-lang.org/
-INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
-REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
-SLOT=stable
-SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-01-10/rust-src-1.66.1.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.66.1-sparc64-unknown-linux-gnu.tar.xz )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=9f4be009ade4953319d136d41ae92431
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.66.1-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.66.1-r1
new file mode 100644
index 000000000000..9691c9f4e381
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.66.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=8
+HOMEPAGE=https://www.rust-lang.org/
+INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311 || ( dev-libs/openssl-compat:1.1.1 <dev-libs/openssl-3 ) sys-apps/lsb-release
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-01-10/rust-src-1.66.1.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.66.1-sparc64-unknown-linux-gnu.tar.xz )
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=e15ea0ac8b0fac1830e2ab23213950ca
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.67.1 b/metadata/md5-cache/dev-lang/rust-bin-1.67.1
deleted file mode 100644
index 0c73adde61a1..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.67.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=8
-HOMEPAGE=https://www.rust-lang.org/
-INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
-IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
-REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
-SLOT=stable
-SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-02-09/rust-src-1.67.1.tar.xz )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=46f82a9fa334e025175dcf6367719d9f
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.67.1-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.67.1-r1
new file mode 100644
index 000000000000..c79391d9929e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.67.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=8
+HOMEPAGE=https://www.rust-lang.org/
+INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311 || ( dev-libs/openssl-compat:1.1.1 <dev-libs/openssl-3 ) sys-apps/lsb-release
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-02-09/rust-src-1.67.1.tar.xz )
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=ff4441f318a751b008926cd6e5ea46e0
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
index f76e2476faf9..6033ec42cbf2 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 )
 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	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3829aea57ce508160a3aff66dddfa0b1
diff --git a/metadata/md5-cache/dev-libs/Ice-3.7.8 b/metadata/md5-cache/dev-libs/Ice-3.7.8
index bf2c8c9fcac5..9f393b89979a 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.7.8
+++ b/metadata/md5-cache/dev-libs/Ice-3.7.8
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 p
 RESTRICT=test
 SLOT=0/37
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.7.8.tar.gz -> Ice-3.7.8.tar.gz doc? ( https://download.zeroc.com/Ice/3.7/Ice-3.7.1.pdf )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=199bb08f4ef7724d1ad07734ad76ae5b
diff --git a/metadata/md5-cache/dev-libs/Ice-3.7.8-r1 b/metadata/md5-cache/dev-libs/Ice-3.7.8-r1
index cb24cc99c05b..f11c6d27d53e 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.7.8-r1
+++ b/metadata/md5-cache/dev-libs/Ice-3.7.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 p
 RESTRICT=test
 SLOT=0/37
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.7.8.tar.gz -> Ice-3.7.8.tar.gz doc? ( https://download.zeroc.com/Ice/3.7/Ice-3.7.1.pdf )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eef2099c969a00ede4d7a227b445b0ff
diff --git a/metadata/md5-cache/dev-libs/Ice-3.7.8-r2 b/metadata/md5-cache/dev-libs/Ice-3.7.8-r2
index 74276d7a842f..b116ecb52c5d 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.7.8-r2
+++ b/metadata/md5-cache/dev-libs/Ice-3.7.8-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 p
 RESTRICT=test
 SLOT=0/37
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.7.8.tar.gz -> Ice-3.7.8.tar.gz doc? ( https://download.zeroc.com/Ice/3.7/Ice-3.7.1.pdf )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=52b7604281e33615da81afb7118b771e
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 22a6e4c1c653..cc65bbe63e2e 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/ayatana-ido-0.9.3 b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.3
new file mode 100644
index 000000000000..34c62abeca30
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection]
+DESCRIPTION=Ayatana Application Indicators (Shared Library)
+EAPI=8
+HOMEPAGE=https://github.com/AyatanaIndicators/ayatana-ido
+INHERIT=cmake vala virtualx
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1 LGPL-3 GPL-3
+RDEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection]
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/AyatanaIndicators/ayatana-ido/archive/0.9.3.tar.gz -> ayatana-ido-0.9.3.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3c11c18117c3515bcb68a41ae506638d
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20221025 b/metadata/md5-cache/dev-libs/cdk-5.0.20221025
index b54728694061..d1792ddc6cf2 100644
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20221025
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20221025
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots
 INHERIT=verify-sig
 IUSE=examples unicode verify-sig
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 SLOT=0/6
 SRC_URI=https://invisible-island.net/archives/cdk/cdk-5.0-20221025.tgz verify-sig? ( https://invisible-island.net/archives/cdk/cdk-5.0-20221025.tgz.asc )
 _eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=8b372d2557c15c02639685dc51da2ba2
+_md5_=d52fa5cee476e835e22e1964f608c328
diff --git a/metadata/md5-cache/dev-libs/clhpp-2.0.19 b/metadata/md5-cache/dev-libs/clhpp-2.0.19
index ce50446cbdc1..fbc1993fb6d0 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2.0.19
+++ b/metadata/md5-cache/dev-libs/clhpp-2.0.19
@@ -12,5 +12,5 @@ RDEPEND=virtual/opencl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v2022.09.30.tar.gz -> clhpp-2.0.19.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e9143d462689b3539bb320e2f4accb85
diff --git a/metadata/md5-cache/dev-libs/clhpp-2023.02.06 b/metadata/md5-cache/dev-libs/clhpp-2023.02.06
index 09f7de9684f7..62411083e468 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2023.02.06
+++ b/metadata/md5-cache/dev-libs/clhpp-2023.02.06
@@ -12,5 +12,5 @@ RDEPEND=virtual/opencl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v2023.02.06.tar.gz -> clhpp-2023.02.06.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8f9ed93f7fa3a675d8825b0991dbdeda
diff --git a/metadata/md5-cache/dev-libs/confuse-3.3-r1 b/metadata/md5-cache/dev-libs/confuse-3.3-r1
index f08704d7c268..f95195c59657 100644
--- a/metadata/md5-cache/dev-libs/confuse-3.3-r1
+++ b/metadata/md5-cache/dev-libs/confuse-3.3-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://github.com/martinh/libconfuse
 INHERIT=multilib-minimal flag-o-matic
 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
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=nls? ( 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(-)?] )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=011f1848eb84e1aac712ddfabf0b382c
+_md5_=6af4387e09e1f6f3d77ee3e4a0576763
diff --git a/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529 b/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
index b45f0091f95d..a907b8aa2a37 100644
--- a/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
+++ b/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/graeme-hill/crossguid
 INHERIT=edo cmake
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=sys-apps/util-linux
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graeme-hill/crossguid/archive/ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz -> crossguid-0.2.2_p20190529.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b6a8d757c73c4b8ccaa349b196c28562
+_md5_=0bceafa683f2a702f662a5f3d0717117
diff --git a/metadata/md5-cache/dev-libs/cutlass-2.10.0 b/metadata/md5-cache/dev-libs/cutlass-2.10.0
new file mode 100644
index 000000000000..64c3ead73fc9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cutlass-2.10.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/nvidia-cuda-toolkit >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CUDA Templates for Linear Algebra Subroutines
+EAPI=8
+HOMEPAGE=https://github.com/NVIDIA/cutlass
+INHERIT=cuda cmake
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/NVIDIA/cutlass/archive/refs/tags/v2.10.0.tar.gz -> cutlass-2.10.0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2fdfc425420b76ad91ee29fb426b9b53
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.4.0 b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
index 890e52ae58b4..ef6b762a2558 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.4.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.4.0
@@ -1,5 +1,5 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-util/ragel >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=dev-libs/boost:=
 DESCRIPTION=High-performance regular expression matching library
 EAPI=7
@@ -13,4 +13,4 @@ REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.4.0.tar.gz -> hyperscan-5.4.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4ad3ecf7f32e2cb9a92de9662c9462d0
+_md5_=28458df7ed473e9193e966fd35f585ef
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.4.1 b/metadata/md5-cache/dev-libs/hyperscan-5.4.1
index aee79c4d0590..a73a822285cc 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.4.1
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.4.1
@@ -1,5 +1,5 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-util/ragel >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=dev-libs/boost:=
 DESCRIPTION=High-performance regular expression matching library
 EAPI=8
@@ -13,4 +13,4 @@ REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.4.1.tar.gz -> hyperscan-5.4.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7e636b7c118b00cbfb26d643729de9d7
+_md5_=776da98c2750d4e50682c29700f654b1
diff --git a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92 b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92
index ace5436f19c8..e33488a39aad 100644
--- a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92
+++ b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AyatanaIndicators/libayatana-appindicator
 INHERIT=cmake vala virtualx
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3 LGPL-2 LGPL-3
 RDEPEND=>=dev-libs/glib-2.37:2 >=x11-libs/gtk+-3.24:3[introspection] dev-libs/libdbusmenu[gtk3] >=dev-libs/libayatana-indicator-0.8.4
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AyatanaIndicators/libayatana-appindicator/archive/0.5.92.tar.gz -> libayatana-appindicator-0.5.92.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b3aa4a55b5d85fe03adcb562a9a4d409
+_md5_=ae2894dd155c2aa057495868df89a296
diff --git a/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3 b/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
index 6c50df2fc94d..de97323a1438 100644
--- a/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
+++ b/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AyatanaIndicators/libayatana-indicator
 INHERIT=cmake vala virtualx
 IUSE=test test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection] >=dev-libs/ayatana-ido-0.8.2
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/AyatanaIndicators/libayatana-indicator/archive/0.9.3.tar.gz -> libayatana-indicator-0.9.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=378682d8caa835bc7d4a0929c4616e34
+_md5_=213fd8c96ec1b9288cd8f96f6df6aaf5
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2 b/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2
index 3acc0739273b..07df2dbf4f63 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2
+++ b/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
 INHERIT=autotools multilib multilib-minimal verify-sig
 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 verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 BSD-4 ISC
 RDEPEND=app-crypt/libmd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.11.7.tar.xz verify-sig? ( https://libbsd.freedesktop.org/releases/libbsd-0.11.7.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=1d21171924bc6a42bb5c1a14e4b77af1
+_md5_=34b0b9a9b99d142d821cdec8b91c2f3e
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc2 b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc2
deleted file mode 100644
index e9ff9d7073ab..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230211 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230211
deleted file mode 100644
index 9f53ee92c1e7..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230211
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230218 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230218
deleted file mode 100644
index bd83842bc96c..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230218
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.5.2 b/metadata/md5-cache/dev-libs/libgit2-1.5.2
new file mode 100644
index 000000000000..837a47dd405d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-1.5.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+DESCRIPTION=A linkable library for Git
+EAPI=8
+HOMEPAGE=https://libgit2.org/
+INHERIT=cmake python-any-r1
+IUSE=examples gssapi +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/1.5
+SRC_URI=https://github.com/libgit2/libgit2/archive/v1.5.2.tar.gz -> libgit2-1.5.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8e90a01e4bfc95123ab630ed1e24fc65
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.6.2 b/metadata/md5-cache/dev-libs/libgit2-1.6.2
new file mode 100644
index 000000000000..261304ff4e92
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-1.6.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+DESCRIPTION=A linkable library for Git
+EAPI=8
+HOMEPAGE=https://libgit2.org/
+INHERIT=cmake python-any-r1
+IUSE=examples gssapi +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/1.6
+SRC_URI=https://github.com/libgit2/libgit2/archive/v1.6.2.tar.gz -> libgit2-1.6.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=42fe2c93918fc318d391e75c9065e5a4
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.17 b/metadata/md5-cache/dev-libs/libiconv-1.17
index b2e64d81ad3c..cb83bba7d4f2 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.17
+++ b/metadata/md5-cache/dev-libs/libiconv-1.17
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libiconv/
 INHERIT=multilib-minimal
 IUSE=prefix 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 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1
 RDEPEND=!sys-libs/glibc !sys-libs/musl
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.17.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b7000c5118277654d56043f6f5d71f41
+_md5_=f38afb5e54182ec5b2ff5ef8e3c55b2b
diff --git a/metadata/md5-cache/dev-libs/libintl-0.21.1 b/metadata/md5-cache/dev-libs/libintl-0.21.1
index 8ef964905e1d..c9cde3471d72 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.21.1
+++ b/metadata/md5-cache/dev-libs/libintl-0.21.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gettext/
 INHERIT=multilib-minimal libtool usr-ldscript verify-sig
 IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=>=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-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=912aca8bdc37c77964af8c150316fb85
+_md5_=3a7f3efaf7ca810f021468fe7fb57a08
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.8.0-r1 b/metadata/md5-cache/dev-libs/libnfc-1.8.0-r1
index 39027576e82d..eea346648b4b 100644
--- a/metadata/md5-cache/dev-libs/libnfc-1.8.0-r1
+++ b/metadata/md5-cache/dev-libs/libnfc-1.8.0-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Near Field Communications (NFC) library
 EAPI=8
 HOMEPAGE=http://www.libnfc.org/
 IUSE=doc pcsc-lite readline usb
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-3
 RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 )
 SLOT=0
 SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.8.0/libnfc-1.8.0.tar.bz2
-_md5_=4b568ca80c99a40123d49cd4cfd0acc7
+_md5_=f7a6af4f4a8c62d50d9bf2b54c070d2b
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.17.2-r1 b/metadata/md5-cache/dev-libs/liborcus-0.17.2-r1
index 01b50f96546c..b3189912cf14 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.17.2-r1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.17.2-r1
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.17 ) dev-util/mdds:1/2.0
+DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.17 ) dev-util/mdds:1/2.0
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=8
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 INHERIT=autotools python-single-r1
-IUSE=python +spreadsheet-model test tools python_single_target_python3_9 python_single_target_python3_11
+IUSE=python +spreadsheet-model test tools python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.17 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_11 ) )
+RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.17 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.17
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.17.2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5ef9366b65d37482fa791066880f067d
+_md5_=49c58fe81654f05dca0ede07c8725204
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 6b0236dc6ef6..34f9ed4b5d3a 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.17 ) dev-util/mdds:1/2.1
+DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.18 ) dev-util/mdds:1/2.1
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=8
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
@@ -8,9 +8,9 @@ INHERIT=autotools python-single-r1 git-r3
 IUSE=python +spreadsheet-model test tools python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.17 )
+RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.18 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/0.18
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e240e9ce0424ca18b277b57aaa8bfa2c
+_md5_=7bc6966dd8440442e7931899840c8184
diff --git a/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1 b/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1
index bc4be6b21638..cf9e954635ef 100644
--- a/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1
+++ b/metadata/md5-cache/dev-libs/libserialport-0.1.1-r1
@@ -1,7 +1,7 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Cross platform serial port access library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Libserialport
 INHERIT=autotools
 IUSE=static-libs
@@ -10,4 +10,4 @@ LICENSE=LGPL-3
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/libserialport/libserialport-0.1.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ab6c4f28e0983bd696a4c8c4639a3e1b
+_md5_=d68952af095cca08c79f77c56d59968e
diff --git a/metadata/md5-cache/dev-libs/libserialport-9999 b/metadata/md5-cache/dev-libs/libserialport-9999
index d3aa7e8cc528..992b4fc0fe8a 100644
--- a/metadata/md5-cache/dev-libs/libserialport-9999
+++ b/metadata/md5-cache/dev-libs/libserialport-9999
@@ -1,7 +1,7 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
 DESCRIPTION=Cross platform serial port access library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Libserialport
 INHERIT=autotools git-r3
 IUSE=static-libs
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ab9ca5b5aabf78dd85a614dbc069b9c
+_md5_=60592257d08e4acf3d85d1d0417afabb
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.7.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.7.0
index 05af659e5952..ce6a70ce024b 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.7.0
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.7.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( =app-i18n/unicode-data-14.0* || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems )
+BDEPEND=test? ( =app-i18n/unicode-data-14.0* || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems )
 DEFINED_PHASES=compile install prepare test
 DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.7.0
 SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.7.0.tar.gz -> libutf8proc-2.7.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-14.0.0.xz )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=25934c92abd3fbed1ed5a0a8ea71a5fc
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.8.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.8.0
index e436d0dc6bf5..3e939fb299b2 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.8.0
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.8.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( =app-i18n/unicode-data-15.0* || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems )
+BDEPEND=test? ( =app-i18n/unicode-data-15.0* || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems )
 DEFINED_PHASES=compile install prepare test
 DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2.8.0
 SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.8.0.tar.gz -> libutf8proc-2.8.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-15.0.0.xz )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=39726db43c8dd4796db3ee5c72c61c65
diff --git a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5 b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5
new file mode 100644
index 000000000000..e945598d8e22
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
+DESCRIPTION=C library for creating Excel XLSX files
+EAPI=8
+HOMEPAGE=https://libxlsxwriter.github.io/ https://github.com/jmcnamara/libxlsxwriter
+INHERIT=cmake plocale
+IUSE=openssl
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.1.5.tar.gz -> libxlsxwriter-1.1.5.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ffde8b14cd751a9e4fd3f8a245736576
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
index 0f37d39f4522..8054ba449a6d 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1t.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1t.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=f0bb24a4d0a225d4e22ad4db23dda753
+_md5_=64e5aa5c1f23b08c746506b7074c59ac
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.8 b/metadata/md5-cache/dev-libs/openssl-3.0.8
index 006c3b4dcd7e..6f5374adf9bf 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.8
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.8
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.8.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.8.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c0a809010725fdf9a31c805d51f40d7b
+_md5_=f6e9bc32d67f3432c704c1639c7c2b1e
diff --git a/metadata/md5-cache/dev-libs/pocl-3.1 b/metadata/md5-cache/dev-libs/pocl-3.1
index 7cf81c553988..67656e3ff852 100644
--- a/metadata/md5-cache/dev-libs/pocl-3.1
+++ b/metadata/md5-cache/dev-libs/pocl-3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://portablecl.org https://github.com/pocl/pocl
 INHERIT=cmake llvm
 IUSE=accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test
-KEYWORDS=amd64 ~ppc64
+KEYWORDS=amd64 ppc64
 LICENSE=GPL-2
 RDEPEND=dev-libs/libltdl <sys-devel/llvm-16:* virtual/opencl !cuda? ( <sys-devel/clang-16:= ) cuda? ( <sys-devel/clang-16:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust:= ) hwloc? ( sys-apps/hwloc:=[cuda?] )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/pocl/pocl/archive/v3.1.tar.gz -> pocl-3.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fa27e4ee73398a894de40fb11e877a29
+_md5_=b9d49de2c7bec12eecb6338b100e9f13
diff --git a/metadata/md5-cache/dev-libs/qxlsx-1.4.4 b/metadata/md5-cache/dev-libs/qxlsx-1.4.4
deleted file mode 100644
index cd185fb99999..000000000000
--- a/metadata/md5-cache/dev-libs/qxlsx-1.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
-DESCRIPTION=Excel file(*.xlsx) reader/writer library using Qt
-EAPI=8
-HOMEPAGE=https://github.com/QtExcel/QXlsx
-INHERIT=multibuild cmake
-IUSE=qt5 qt6
-KEYWORDS=amd64 ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
-REQUIRED_USE=|| ( qt5 qt6 )
-SLOT=0/0.1.4.4
-SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.4.tar.gz -> qxlsx-1.4.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8522f3f3e6a85a62a2c7c983d237e234
diff --git a/metadata/md5-cache/dev-libs/qxlsx-1.4.5 b/metadata/md5-cache/dev-libs/qxlsx-1.4.5
index eebefc114c23..9b1cbcbd42a7 100644
--- a/metadata/md5-cache/dev-libs/qxlsx-1.4.5
+++ b/metadata/md5-cache/dev-libs/qxlsx-1.4.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/QtExcel/QXlsx
 INHERIT=multibuild cmake
 IUSE=qt5 qt6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/0.1.4.4
 SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.5.tar.gz -> qxlsx-1.4.5.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9e6e09b9810dbe55d1e09f90b99b14c8
+_md5_=f3f8d7f4461044020e51a70015b69bf9
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
index 34f746b9d249..f4698f02168d 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.19 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-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-4 php_targets_php8-0 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.19/xapian-bindings-1.4.19.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6edc4f7dc3e106d29f2d0c402c07c728
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
index 23d5167f556b..33ffa9f8fead 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.21 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-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-4 php_targets_php8-0 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-bindings-1.4.21.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b3ab1e83509c91db8c77eb6404e99bf1
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.8.1 b/metadata/md5-cache/dev-libs/xxhash-0.8.1
index a1784cae8c9a..6d9f49925387 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.8.1
+++ b/metadata/md5-cache/dev-libs/xxhash-0.8.1
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=http://www.xxhash.net
 INHERIT=toolchain-funcs
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.8.1.tar.gz -> xxhash-0.8.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ca6952a8a415ace77d013808632bd488
+_md5_=11072a8d9acc423b179dddc8cc43c679
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 07c962393240..ab2eff27f6e8 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/cppo-1.6.7 b/metadata/md5-cache/dev-ml/cppo-1.6.7
deleted file mode 100644
index 1df0454010d0..000000000000
--- a/metadata/md5-cache/dev-ml/cppo-1.6.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-community/cppo/
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/1.6.7
-SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.7.tar.gz -> cppo-1.6.7.tar.gz
-_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=746c51792a7007a1d8e812bb6476cd63
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.7-r1 b/metadata/md5-cache/dev-ml/cppo-1.6.7-r1
new file mode 100644
index 000000000000..a994fe477bf5
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ocamlbuild:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-community/cppo/
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
+LICENSE=BSD
+RDEPEND=dev-ml/ocamlbuild:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/1.6.7
+SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.7.tar.gz -> cppo-1.6.7.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=ae1038f7bbf16fe417c9361b76e2005d
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.8 b/metadata/md5-cache/dev-ml/cppo-1.6.8
deleted file mode 100644
index cdbd1722e5ba..000000000000
--- a/metadata/md5-cache/dev-ml/cppo-1.6.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-community/cppo/
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/1.6.8
-SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz -> cppo-1.6.8.tar.gz
-_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=60d1e24742aa70b1895f4384b230d037
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.8-r1 b/metadata/md5-cache/dev-ml/cppo-1.6.8-r1
new file mode 100644
index 000000000000..7438be44895a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ocamlbuild:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-community/cppo/
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/ocamlbuild:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/1.6.8
+SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz -> cppo-1.6.8.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=4547f47c79540fd3e9325fe06c5bf2be
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.9 b/metadata/md5-cache/dev-ml/cppo-1.6.9
deleted file mode 100644
index dab7b8215c1d..000000000000
--- a/metadata/md5-cache/dev-ml/cppo-1.6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-community/cppo/
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/1.6.9
-SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz -> cppo-1.6.9.tar.gz
-_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=60d1e24742aa70b1895f4384b230d037
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.9-r1 b/metadata/md5-cache/dev-ml/cppo-1.6.9-r1
new file mode 100644
index 000000000000..22f81ab77972
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.9-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ocamlbuild:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-community/cppo/
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/ocamlbuild:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/1.6.9
+SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz -> cppo-1.6.9.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=4547f47c79540fd3e9325fe06c5bf2be
diff --git a/metadata/md5-cache/dev-ml/dune-3.7.0 b/metadata/md5-cache/dev-ml/dune-3.7.0
new file mode 100644
index 000000000000..d3c8a0d99bcb
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-3.7.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-4.08:= emacs? ( >=app-editors/emacs-23.1:* )
+DESCRIPTION=A composable build system for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=multiprocessing elisp-common
+IUSE=emacs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.08:= emacs? ( >=app-editors/emacs-23.1:* )
+RESTRICT=strip test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=a722245d691d8793435c53dfb0200c6b
diff --git a/metadata/md5-cache/dev-ml/dune-build-info-3.7.0 b/metadata/md5-cache/dev-ml/dune-build-info-3.7.0
new file mode 100644
index 000000000000..caf7751575d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-build-info-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-ml/dune-3.5 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Embed locations informations inside executable and libraries
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/dune-3.5 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=429b8def6abfcbe7ce73c020f3c60799
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-3.7.0 b/metadata/md5-cache/dev-ml/dune-configurator-3.7.0
new file mode 100644
index 000000000000..384e4059d5da
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-configurator-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Helper library for gathering system configuration
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=fa5901cee25b3915bf8128fc8661546d
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.7.0 b/metadata/md5-cache/dev-ml/dune-private-libs-3.7.0
new file mode 100644
index 000000000000..a241c7075f18
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/stdune-3.7.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Private libraries of Dune
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/stdune-3.7.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=4c9498458190eaeeae95329707d2571d
diff --git a/metadata/md5-cache/dev-ml/dune-site-3.7.0 b/metadata/md5-cache/dev-ml/dune-site-3.7.0
new file mode 100644
index 000000000000..5d54cd4b0974
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-site-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=~dev-ml/dune-private-libs-3.7.0:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Embed locations informations inside executable and libraries
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-ml/dune-private-libs-3.7.0:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=0860583275b0c53b3dcefaa1881abdf2
diff --git a/metadata/md5-cache/dev-ml/dyn-3.7.0 b/metadata/md5-cache/dev-ml/dyn-3.7.0
new file mode 100644
index 000000000000..fd880375a099
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dyn-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=~dev-ml/ordering-3.7.0:= dev-ml/pp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Dynamic type
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-ml/ordering-3.7.0:= dev-ml/pp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=511ed694c22c345f58ca5282be17d2df
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc2
deleted file mode 100644
index 9028819c2f19..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Xtensa] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/16.0.0_rc2
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230211 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230211
deleted file mode 100644
index 4673c2e912d6..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230211:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230211:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Xtensa] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/17.0.0_pre20230211
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230218 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230218
deleted file mode 100644
index dfe6095e6062..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230218:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230218:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Xtensa] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/17.0.0_pre20230218
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/ocamlbuild-0.14.2 b/metadata/md5-cache/dev-ml/ocamlbuild-0.14.2
index a4a3280e90ec..db047ac971d2 100644
--- a/metadata/md5-cache/dev-ml/ocamlbuild-0.14.2
+++ b/metadata/md5-cache/dev-ml/ocamlbuild-0.14.2
@@ -4,10 +4,10 @@ DESCRIPTION=Generic build tool with built-in rules for building OCaml library an
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/ocamlbuild
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.14.2
 SRC_URI=https://github.com/ocaml/ocamlbuild/archive/0.14.2.tar.gz -> ocamlbuild-0.14.2.tar.gz
-_md5_=9682b600eade68f314aeb4041585d621
+_md5_=fab71e9f0d3011d0971eeaa9e7231626
diff --git a/metadata/md5-cache/dev-ml/ordering-3.7.0 b/metadata/md5-cache/dev-ml/ordering-3.7.0
new file mode 100644
index 000000000000..e5265c692722
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ordering-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Element ordering
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=7e0204472e648a15dcddf5197c060698
diff --git a/metadata/md5-cache/dev-ml/stdune-3.7.0 b/metadata/md5-cache/dev-ml/stdune-3.7.0
new file mode 100644
index 000000000000..7cc43b5fbdef
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/stdune-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/ordering-3.7.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Dune's unstable standard library
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/ordering-3.7.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.7.0
+SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
+_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=ac184dd2e82e179df579740fbda7a375
diff --git a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0 b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
index dfe0d87b0637..9c6dcd7570d7 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBIx-Simple
 INHERIT=perl-module
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0 EPL-1.0 ECL-2.0 EUPL-1.1 GPL-2 GPL-3 LGPL-2.1 LGPL-3 HPND IBM IPAfont ISC LPPL-1.3c 9base MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng )
 RDEPEND=>=dev-perl/DBI-1.210.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=0f940c25c4434a1de446def3cf798b6f
+_md5_=47ee1dc945e0dc7b1d94e789ce3eca77
diff --git a/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0 b/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
index 683d780592e1..9cd84939de11 100644
--- a/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
+++ b/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Abstract
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Simple-1.998 dev-perl/MRO-Compat >=dev-perl/Module-Pluggable-1.500.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.009.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=e935d83a086c72bdb816f77bef0cd070
+_md5_=43eccb7c94b4b3dbeb6c789d27758e8c
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1 b/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
index 9c40cc2680c9..17fb526fe61b 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Address
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=d41b9f17dbb6f4cb1a36b074c7b49899
+_md5_=b0a5d9781b28e602b71f39ae5c3c6712
diff --git a/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0 b/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
index 0ed6f6221942..d12b9b0b1f21 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Address-XS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 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+ ) MIT
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.05.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=2bfd6462e9c757718001ad7ce42c04ce
+_md5_=371e918f9b3f8c2c004299b5dd2f42c2
diff --git a/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1 b/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1
index 81dd527a59c3..9643a5825e05 100644
--- a/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Date-Format
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=23f6569437cea7e177c29dcead9f3bc5
+_md5_=e6ec97b1df26f5b4890b67bba93599f7
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-1.952.0 b/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
index 61005c0e0953..066d5fd5ee14 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-MIME
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Address-XS >=dev-perl/Email-MIME-ContentType-1.23.0 >=dev-perl/Email-MIME-Encodings-1.314.0 dev-perl/Email-MessageID >=dev-perl/Email-Simple-2.212.0 >=virtual/perl-Encode-1.980.100 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.130.0 dev-perl/Module-Runtime virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.952.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=b881c8107e584880d830ac29c160b2fe
+_md5_=ce03e85567c03bc9ce7549d1f1378aa0
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0 b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
index fd3352588590..be18df55714b 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-ContentType
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.870.0 >=virtual/perl-Exporter-5.570.0 dev-perl/Text-Unidecode dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.026.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=22f257ff71e101b423323349b199c13a
+_md5_=3be96dcd0d08cac17480470a854cfc53
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
index b121b1b18a56..8edb7f74d9ef 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-Encodings
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-MIME-Base64-3.50.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=afb226d8568720748b6cde848cbdd0d8
+_md5_=bd8ed88d538d03f48a7fb699a9dbeb52
diff --git a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1 b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
index 2dc641cb3e5b..3958a4e2c294 100644
--- a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-MessageID
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=1bae35c0fab9be043739fbcf674d8f53
+_md5_=d04e4a6c61420b385ff702f6280f02f6
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-2.500.0 b/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
index c279a68f8942..c04976cae777 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
+++ b/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Sender
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec >=virtual/perl-IO-1.110.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-libnet-3.70.0 dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-2.500.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=1825370710dbfc0a6ccda7c98bb9a573
+_md5_=5de418ea60c6359064c208d231d1db52
diff --git a/metadata/md5-cache/dev-perl/Email-Simple-2.216.0 b/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
index f819cd4a1e00..cba1e01fe0fb 100644
--- a/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
+++ b/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-Simple
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Date-Format dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=9b1434431d7492d2637255025a5bbd39
+_md5_=2357d0051b7632c9744259840eed7001
diff --git a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1 b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
index 42c8072393bf..ccd0575ea407 100644
--- a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-DMARC
 INHERIT=perl-module
 IUSE=minimal test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Mail-DKIM dev-perl/Net-IMAP-Simple dev-perl/Net-SMTPS ) virtual/perl-Carp dev-perl/Config-Tiny >=dev-perl/DBD-SQLite-1.310.0 >=dev-perl/DBIx-Simple-1.350.0 virtual/perl-Data-Dumper dev-perl/Email-MIME >=dev-perl/Email-Sender-1.300.32 dev-perl/Email-Simple virtual/perl-Encode dev-perl/File-ShareDir virtual/perl-Getopt-Long virtual/perl-HTTP-Tiny virtual/perl-IO virtual/perl-IO-Compress dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/Mail-DKIM dev-perl/Net-DNS dev-perl/Net-HTTP dev-perl/Net-IDN-Encode dev-perl/Net-IP dev-perl/Net-SMTPS dev-perl/Net-SSLeay >=dev-perl/Net-Server-2 virtual/perl-Socket >=dev-perl/Socket6-0.230.0 virtual/perl-Sys-Syslog dev-perl/Test-File-ShareDir dev-perl/URI dev-perl/XML-LibXML virtual/perl-parent >=dev-perl/Regexp-Common-2013031301 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DMARC-1.20210927.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=9520e0bc7b5fd5ff32de8a585b0743fe
+_md5_=729cfc9c6866079690f19a984986422a
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index b1becf848840..9a992e7f8aa4 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/Net-IMAP-Simple-1.221.200 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
index 3ea46314d391..fc31dc89bcb4 100644
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-IMAP-Simple
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-perl/Parse-RecDescent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JETTERO/Net-IMAP-Simple-1.2212.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=f65e55fdd6b4c9c5a905af66f4140a07
+_md5_=005593e871f0c76c361f3ada77297740
diff --git a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0 b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
index 269f3d2f01b3..029f9cc54a99 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SMTPS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Authen-SASL-2.0.0 >=dev-perl/IO-Socket-SSL-1.0.0 >=virtual/perl-libnet-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMO/src/Net-SMTPS-0.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=ef84f16fbccd8e4341c3bf9bd17e7199
+_md5_=a5bca8f6365100984de4063420f2af23
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
index a0062e99ac28..c3a983c6fe17 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sub-Override
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=0b53bd9b3189b1897a4a03d61c055b8e
+_md5_=24f463dce125311e4db87df0d53cb2a2
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220 b/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220
index 55b73802c044..c8c09aef3118 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.202.1.220
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-MockObject
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/UNIVERSAL-can-1.201.106.170 >=dev-perl/UNIVERSAL-isa-1.201.106.140 virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20200122.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=6b64d114b7eb8a3495e99d0f0ec287e8
+_md5_=2ac062d1bede71ace9ec1c561f035b06
diff --git a/metadata/md5-cache/dev-perl/Throwable-1.0.0 b/metadata/md5-cache/dev-perl/Throwable-1.0.0
index 13038dc4db9f..dee691c8c4aa 100644
--- a/metadata/md5-cache/dev-perl/Throwable-1.0.0
+++ b/metadata/md5-cache/dev-perl/Throwable-1.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Throwable
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Devel-StackTrace-1.320.0 >=dev-perl/Module-Runtime-0.2.0 >=dev-perl/Moo-1.0.1 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-1.000.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=8b6e1599bd7f1514e0dfdc6df72654bc
+_md5_=cbff70df9cb89488a39b5a69ed0f40f4
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1
index 4571d06ee012..a34c966c9467 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/UNIVERSAL-can
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=1373bf3dc6f137af8943a3c4be706590
+_md5_=e12c9605397770d1843caf2270ed4df4
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1
index 41d4a5c360d9..fe8591f8ff1d 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/UNIVERSAL-isa
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=e20e8e5de4d6e5fb48446a8c48c0a78e
+_md5_=5b00de1ce8c19e81fb0266d3c7e25075
diff --git a/metadata/md5-cache/dev-python/Babel-2.12.1 b/metadata/md5-cache/dev-python/Babel-2.12.1
new file mode 100644
index 000000000000..2bf00afefd31
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Babel-2.12.1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools for internationalizing Python applications
+EAPI=8
+HOMEPAGE=https://babel.pocoo.org/ https://pypi.org/project/Babel/ https://github.com/python-babel/babel/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/B/Babel/Babel-2.12.1.tar.gz https://unicode.org/Public/cldr/42/cldr-common-42.0.zip
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ee4c61ff84782a434009210c5b66bb28
diff --git a/metadata/md5-cache/dev-python/Faker-17.4.0 b/metadata/md5-cache/dev-python/Faker-17.4.0
new file mode 100644
index 000000000000..f1791bcc5cfe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-17.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/validators[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-17.4.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3d823a26c5da46c3034436f91a3e509b
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2c06e962343f..a7780478cad3 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/PyRSS2Gen-1.1-r2 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r2
index 4156daeb2d2c..0ce4ce90b0e9 100644
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r2
+++ b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=RSS feed generator written in Python
 EAPI=8
 HOMEPAGE=http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=http://www.dalkescientific.com/Python/PyRSS2Gen-1.1.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9f14940b9dceb0e004053e13f6280cd3
+_md5_=efbc9fbe63fcdf1c13fa3cdf5a0b756c
diff --git a/metadata/md5-cache/dev-python/ansible-pygments-0.1.1 b/metadata/md5-cache/dev-python/ansible-pygments-0.1.1
deleted file mode 100644
index 639a68d442aa..000000000000
--- a/metadata/md5-cache/dev-python/ansible-pygments-0.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pygments-2.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pygments lexer and style Ansible snippets
-EAPI=8
-HOMEPAGE=https://github.com/ansible-community/ansible-pygments
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=dev-python/pygments-2.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-pygments/ansible-pygments-0.1.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=910255be68296c15ebd00a9b8f3b8333
diff --git a/metadata/md5-cache/dev-python/ansible-pygments-0.1.1-r1 b/metadata/md5-cache/dev-python/ansible-pygments-0.1.1-r1
new file mode 100644
index 000000000000..b704fae9acaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansible-pygments-0.1.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pygments-2.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pygments lexer and style Ansible snippets
+EAPI=8
+HOMEPAGE=https://github.com/ansible-community/ansible-pygments
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 ~riscv
+LICENSE=MIT
+RDEPEND=>=dev-python/pygments-2.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-pygments/ansible-pygments-0.1.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8f2f7049ceb49ea07e1afa44df28ce03
diff --git a/metadata/md5-cache/dev-python/autopep8-2.0.1 b/metadata/md5-cache/dev-python/autopep8-2.0.1
index 2ac50b4a6a09..1e97a1517034 100644
--- a/metadata/md5-cache/dev-python/autopep8-2.0.1
+++ b/metadata/md5-cache/dev-python/autopep8-2.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hhatto/autopep8/ https://pypi.org/project/autopep8/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/pycodestyle-2.10[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-2.0.1.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aeb1e6ef12d86c4859256efafe249dc3
+_md5_=8be1b3b2dfbeeda7c3a4ac54290b9e09
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.60.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.60.0
new file mode 100644
index 000000000000..cf7d5f08d579
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.60.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.60.0.tar.gz -> serverless-application-model-1.60.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=93b9f6b31f5ee2225a52287cf112e661
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.60.1 b/metadata/md5-cache/dev-python/aws-sam-translator-1.60.1
new file mode 100644
index 000000000000..fab93527cab8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.60.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.60.1.tar.gz -> serverless-application-model-1.60.1.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=93b9f6b31f5ee2225a52287cf112e661
diff --git a/metadata/md5-cache/dev-python/bareos-21.1.5 b/metadata/md5-cache/dev-python/bareos-21.1.5
deleted file mode 100644
index 35235571ddde..000000000000
--- a/metadata/md5-cache/dev-python/bareos-21.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=python bindings for bareos network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.com/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=mirror test
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/21.1.5.tar.gz -> bareos-21.1.5.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=485aa52d5f4a59de7f551c168af02ce8
diff --git a/metadata/md5-cache/dev-python/bareos-21.1.6 b/metadata/md5-cache/dev-python/bareos-21.1.6
new file mode 100644
index 000000000000..57f577623667
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bareos-21.1.6
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=python bindings for bareos network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.com/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/21.1.6.tar.gz -> bareos-21.1.6.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=485aa52d5f4a59de7f551c168af02ce8
diff --git a/metadata/md5-cache/dev-python/blessed-1.20.0 b/metadata/md5-cache/dev-python/blessed-1.20.0
index eaa8caf1d860..9844a05628b7 100644
--- a/metadata/md5-cache/dev-python/blessed-1.20.0
+++ b/metadata/md5-cache/dev-python/blessed-1.20.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for making terminal apps using colors, keyboard input and positioning
 EAPI=8
 HOMEPAGE=https://github.com/jquast/blessed/ https://pypi.org/project/blessed/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/b/blessed/blessed-1.20.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=80cce9b5f2dfe21562bb2f1a282d0928
+SRC_URI=https://files.pythonhosted.org/packages/source/b/blessed/blessed-1.20.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c5593646a9575d8c94578cb1aa0d4e1b
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.80 b/metadata/md5-cache/dev-python/boto3-1.26.80
new file mode 100644
index 000000000000..07ec0741d386
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.80
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.80.tar.gz -> boto3-1.26.80.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.81 b/metadata/md5-cache/dev-python/boto3-1.26.81
new file mode 100644
index 000000000000..8e230f526549
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.81
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.81.tar.gz -> boto3-1.26.81.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.80 b/metadata/md5-cache/dev-python/botocore-1.29.80
new file mode 100644
index 000000000000..794a43872b11
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.80
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.80.tar.gz -> botocore-1.29.80.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.81 b/metadata/md5-cache/dev-python/botocore-1.29.81
new file mode 100644
index 000000000000..dae20b9a8627
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.81
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.81.tar.gz -> botocore-1.29.81.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/breathe-4.35.0 b/metadata/md5-cache/dev-python/breathe-4.35.0
new file mode 100644
index 000000000000..a1a1d0af51cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/breathe-4.35.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx Doxygen renderer
+EAPI=8
+HOMEPAGE=https://breathe.readthedocs.io/en/latest/ https://github.com/breathe-doc/breathe/ https://pypi.org/project/breathe/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/breathe-doc/breathe/archive/v4.35.0.tar.gz -> breathe-4.35.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=55752ee1194d1c1842a966298a2a9281
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.4.0 b/metadata/md5-cache/dev-python/cairocffi-1.4.0
index f37470f386aa..cdd4e8c8b60a 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.4.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.4.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pikepdf[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pikepdf[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=8
 HOMEPAGE=https://github.com/Kozea/cairocffi/ https://pypi.org/project/cairocffi/
-INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+INHERIT=distutils-r1 pypi virtualx
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.4.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=053fa1c0cc67513a57f68ba200c965cc
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.4.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=947b356bf0fff543f1658f0452b1e97b
diff --git a/metadata/md5-cache/dev-python/caldav-1.2.0 b/metadata/md5-cache/dev-python/caldav-1.2.0
new file mode 100644
index 000000000000..7b58d680a24a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/caldav-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/icalendar[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/recurring-ical-events[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tzlocal[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] www-apps/radicale[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CalDAV (RFC4791) client library for Python
+EAPI=8
+HOMEPAGE=https://github.com/python-caldav/caldav/ https://pypi.org/project/caldav/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3 Apache-2.0 )
+RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-caldav/caldav/archive/v1.2.0.tar.gz -> caldav-1.2.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8e1ee6dc5619090b10c9ce35a23faef3
diff --git a/metadata/md5-cache/dev-python/cangjie-1.3-r1 b/metadata/md5-cache/dev-python/cangjie-1.3-r1
index fc68d22b61da..8d73a58d05e1 100644
--- a/metadata/md5-cache/dev-python/cangjie-1.3-r1
+++ b/metadata/md5-cache/dev-python/cangjie-1.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/libcangjie
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/libcangjie
 DESCRIPTION=Python wrapper for libcangjie
 EAPI=7
 HOMEPAGE=http://cangjians.github.io/
 INHERIT=autotools python-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/libcangjie
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/libcangjie
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Cangjians/pycangjie/releases/download/v1.3/cangjie-1.3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=00c51a9c5e976d304e6d3ebfc97a37a9
+_md5_=49e625f216d707f7b79c6df115bfb307
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.74.0 b/metadata/md5-cache/dev-python/cfn-lint-0.74.0
new file mode 100644
index 000000000000..f3da04767031
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.74.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.59.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.59.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.74.0.tar.gz -> cfn-lint-0.74.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=980b799b466db223b903b9794dd861a7
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc2 b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc2
deleted file mode 100644
index 48271fef787b..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:16 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-16.0.0_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test verify-sig python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-16.0.0_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230211 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230211
deleted file mode 100644
index 8e107e8cb6f8..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:17 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-17.0.0_pre20230211:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-17.0.0_pre20230211:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230218 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230218
deleted file mode 100644
index bcb6341c4f1c..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:17 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-17.0.0_pre20230218:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-17.0.0_pre20230218:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.69 b/metadata/md5-cache/dev-python/cloudscraper-1.2.69
new file mode 100644
index 000000000000..b1956003aba1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cloudscraper-1.2.69
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/js2py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs ) test? ( dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A Python module to bypass Cloudflare's anti-bot page
+EAPI=8
+HOMEPAGE=https://github.com/VeNoMouS/cloudscraper/ https://pypi.org/project/cloudscraper/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=AGPL-3
+RDEPEND=dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/VeNoMouS/cloudscraper/archive/1.2.69.tar.gz -> cloudscraper-1.2.69.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=58d94a346bfce95d78762f16599b5816
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1 b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
index 8a1bf71fd83e..d16768489c53 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/colorclass/ https://github.com/matthewdeanmartin/colorclass/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matthewdeanmartin/colorclass/archive/v2.2.2.tar.gz -> colorclass-2.2.2.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bc0608a8f183cabeb6198dd2c4ae49c2
+_md5_=5b06bd294cbf79f4a9c8a2cbfff2789b
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.29-r1 b/metadata/md5-cache/dev-python/configshell-fb-1.1.29-r1
new file mode 100644
index 000000000000..37c49ed798fb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.29-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python library for building configuration shells
+EAPI=8
+HOMEPAGE=https://github.com/open-iscsi/configshell-fb/ https://pypi.org/project/configshell-fb/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urwid[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/open-iscsi/configshell-fb/archive/refs/tags/v1.1.29.tar.gz -> configshell-fb-1.1.29.gh.tar.gz https://github.com/open-iscsi/configshell-fb/commit/f3ac914861bd605e3d634aeeb5e706abdbd39259.patch -> configshell-fb-1.1.29-replace-getargspec-1.patch https://github.com/open-iscsi/configshell-fb/commit/50d5ffe9f213a53588cec88c9919c816b3fa7736.patch -> configshell-fb-1.1.29-replace-getargspec-2.patch
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c57cf9452e57ae2fc517c661f5ed8488
diff --git a/metadata/md5-cache/dev-python/coverage-7.1.0 b/metadata/md5-cache/dev-python/coverage-7.1.0
index cd4270c8891a..1f2b953a361e 100644
--- a/metadata/md5-cache/dev-python/coverage-7.1.0
+++ b/metadata/md5-cache/dev-python/coverage-7.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-7.1.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3350aa703eea877cc59b947a8b760307
+_md5_=5a047316a49fbf3b1f17f3ae17c5b0ec
diff --git a/metadata/md5-cache/dev-python/coverage-7.2.1 b/metadata/md5-cache/dev-python/coverage-7.2.1
new file mode 100644
index 000000000000..5b885436adcd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-7.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code coverage measurement for Python
+EAPI=8
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/coverage/coverage-7.2.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1d6ace912253858246fed04b242259a2
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.14.2 b/metadata/md5-cache/dev-python/cx_Freeze-6.14.2
deleted file mode 100644
index 3ceec3cfd98a..000000000000
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.14.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Create standalone executables from Python scripts
-EAPI=8
-HOMEPAGE=https://cx-freeze.readthedocs.io/ https://github.com/marcelotduarte/cx_Freeze/ https://pypi.org/project/cx-Freeze/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=PYTHON
-RDEPEND=dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.14.2.tar.gz -> cx_Freeze-6.14.2.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=615c95ae42da3a4348753d5b4b5a6880
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.14.5 b/metadata/md5-cache/dev-python/cx_Freeze-6.14.5
new file mode 100644
index 000000000000..eb323d8fc337
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cx_Freeze-6.14.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Create standalone executables from Python scripts
+EAPI=8
+HOMEPAGE=https://cx-freeze.readthedocs.io/ https://github.com/marcelotduarte/cx_Freeze/ https://pypi.org/project/cx-Freeze/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=PYTHON
+RDEPEND=dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.14.5.tar.gz -> cx_Freeze-6.14.5.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=02f7715df0bde9a34faa4f8e8e7021b3
diff --git a/metadata/md5-cache/dev-python/cython-3.0.0_beta1 b/metadata/md5-cache/dev-python/cython-3.0.0_beta1
new file mode 100644
index 000000000000..645ac2898e24
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-3.0.0_beta1
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( python_targets_python3_9? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx-tabs[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/jinja[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=A Python to C compiler
+EAPI=8
+HOMEPAGE=https://cython.org/ https://github.com/cython/cython/ https://pypi.org/project/Cython/
+INHERIT=distutils-r1 toolchain-funcs elisp-common
+IUSE=emacs test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cython/cython/archive/3.0.0b1.tar.gz -> cython-3.0.0b1.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d5b677969993b52eea2cbbbf9153b108
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-4.1.0 b/metadata/md5-cache/dev-python/django-auth-ldap-4.1.0
index 8ec1dd9284a6..9ec5417d274c 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-4.1.0
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-4.1.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) net-nds/openldap[-minimal] ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) net-nds/openldap[-minimal] ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Django LDAP authentication backend
 EAPI=8
 HOMEPAGE=https://github.com/django-auth-ldap/django-auth-ldap/ https://pypi.org/project/django-auth-ldap/
 INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_9 python_targets_python3_10
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-ldap-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-ldap-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-auth-ldap/django-auth-ldap/archive/4.1.0.tar.gz -> django-auth-ldap-4.1.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cd6ed75a1b306b4dbd9262156d655d97
+_md5_=c1cd2b85a8296d8fbe5111a4a7b17f66
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.14.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.14.0
new file mode 100644
index 000000000000..f1b02f6bb379
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.14.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/django-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses
+EAPI=8
+HOMEPAGE=https://github.com/adamchainz/django-cors-headers/ https://pypi.org/project/django-cors-headers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/django-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/adamchainz/django-cors-headers/archive/3.14.0.tar.gz -> django-cors-headers-3.14.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=93dfd388bd007ed1a388aa6cd9fcd374
diff --git a/metadata/md5-cache/dev-python/django-crispy-forms-1.14.0 b/metadata/md5-cache/dev-python/django-crispy-forms-1.14.0
index c3d36fb431a0..4b9fbc744a62 100644
--- a/metadata/md5-cache/dev-python/django-crispy-forms-1.14.0
+++ b/metadata/md5-cache/dev-python/django-crispy-forms-1.14.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=DRY Django forms
 EAPI=8
 HOMEPAGE=https://github.com/django-crispy-forms/django-crispy-forms
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-crispy-forms/django-crispy-forms/archive/1.14.0.tar.gz -> django-crispy-forms-1.14.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=16e99b56fa8983c22acdbccf93ca5e09
+_md5_=a20869a5de89bf1b1f82547f5b1abfc1
diff --git a/metadata/md5-cache/dev-python/django-crispy-forms-2.0 b/metadata/md5-cache/dev-python/django-crispy-forms-2.0
new file mode 100644
index 000000000000..95100405f7e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-crispy-forms-2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=DRY Django forms
+EAPI=8
+HOMEPAGE=https://github.com/django-crispy-forms/django-crispy-forms
+INHERIT=distutils-r1
+IUSE=test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/django-crispy-forms/django-crispy-forms/archive/2.0.tar.gz -> django-crispy-forms-2.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8df5b4bbc3dfaae6b9dd0b8733e90ebf
diff --git a/metadata/md5-cache/dev-python/django-sortedm2m-3.1.1 b/metadata/md5-cache/dev-python/django-sortedm2m-3.1.1
index 35b772c5aef4..daa11eb77e7c 100644
--- a/metadata/md5-cache/dev-python/django-sortedm2m-3.1.1
+++ b/metadata/md5-cache/dev-python/django-sortedm2m-3.1.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Drop-in replacement for django's many to many field with sorted relations
 EAPI=8
 HOMEPAGE=https://pypi.org/project/django-sortedm2m/ https://github.com/jazzband/django-sortedm2m
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jazzband/django-sortedm2m/archive/3.1.1.tar.gz -> django-sortedm2m-3.1.1.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ff3acd3ff1d6c3eddff3199adad7121
+_md5_=2f375dd93997bddb25dd5db13165001b
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.1.0 b/metadata/md5-cache/dev-python/dkimpy-1.1.0
new file mode 100644
index 000000000000..6214eaf93d1b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dkimpy-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/authres[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=DKIM and ARC email signing and verification library
+EAPI=8
+HOMEPAGE=https://launchpad.net/dkimpy/ https://pypi.org/project/dkimpy/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dkimpy/dkimpy-1.1.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6b89f978ca6a356632b87d86983cfab0
diff --git a/metadata/md5-cache/dev-python/docstring-to-markdown-0.11 b/metadata/md5-cache/dev-python/docstring-to-markdown-0.11
index f91a84db4e74..d429b81d8b60 100644
--- a/metadata/md5-cache/dev-python/docstring-to-markdown-0.11
+++ b/metadata/md5-cache/dev-python/docstring-to-markdown-0.11
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-lsp/docstring-to-markdown
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-lsp/docstring-to-markdown/archive/refs/tags/v0.11.tar.gz -> docstring-to-markdown-0.11.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9370c00eb2743a1e94d155a0cbcf6afb
+_md5_=1b64eee23586811b211ffc380a94b5b7
diff --git a/metadata/md5-cache/dev-python/doit-0.36.0-r1 b/metadata/md5-cache/dev-python/doit-0.36.0-r1
new file mode 100644
index 000000000000..2a77d79eb4b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doit-0.36.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) dev-python/pyflakes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyinotify[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automation tool
+EAPI=8
+HOMEPAGE=https://pydoit.org/ https://github.com/pydoit/doit/ https://pypi.org/project/doit/
+INHERIT=bash-completion-r1 distutils-r1 pypi
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/doit-py-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=dev-python/cloudpickle[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyinotify[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/doit/doit-0.36.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9acb4adff763fda3670724c3b9f3ab69
diff --git a/metadata/md5-cache/dev-python/doit-py-0.5.0-r1 b/metadata/md5-cache/dev-python/doit-py-0.5.0-r1
new file mode 100644
index 000000000000..f350f2861ea0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doit-py-0.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/hunspell[l10n_en] dev-python/pyflakes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( dev-python/configclass[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=doit tasks for python stuff
+EAPI=8
+HOMEPAGE=https://pythonhosted.org/doit-py/ https://github.com/pydoit/doit-py/ https://pypi.org/project/doit-py/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/configclass[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pydoit/doit-py/archive/0.5.0.tar.gz -> doit-py-0.5.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=11af806475efeb421ec461bbc8d912f1
diff --git a/metadata/md5-cache/dev-python/ewmh-0.1.6 b/metadata/md5-cache/dev-python/ewmh-0.1.6
index 5849aa594b4a..fade603f04b9 100644
--- a/metadata/md5-cache/dev-python/ewmh-0.1.6
+++ b/metadata/md5-cache/dev-python/ewmh-0.1.6
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An implementation of Extended Window Manager Hints, based on Xlib
 EAPI=7
 HOMEPAGE=https://github.com/parkouss/pyewmh https://pypi.python.org/pypi/ewmh
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
-RDEPEND=dev-python/python-xlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/python-xlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ewmh/ewmh-0.1.6.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f98f2deed24e466a2507eab2b699b2d7
+_md5_=4891e595eed5ef3124b8a5bcd01a577c
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.16.3 b/metadata/md5-cache/dev-python/fastjsonschema-2.16.3
new file mode 100644
index 000000000000..d69fd8c9dcb6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.16.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast JSON schema validator for Python
+EAPI=8
+HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/ https://pypi.org/project/fastjsonschema/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/horejsek/python-fastjsonschema/archive/v2.16.3.tar.gz -> python-fastjsonschema-2.16.3.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6220e29f6f8bcaa44377ec06d1eecfeb
diff --git a/metadata/md5-cache/dev-python/fido2-0.9.3-r1 b/metadata/md5-cache/dev-python/fido2-0.9.3-r1
new file mode 100644
index 000000000000..dc653f25d860
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fido2-0.9.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyfakefs-3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyscard[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] examples? ( dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python based FIDO 2.0 library
+EAPI=8
+HOMEPAGE=https://github.com/Yubico/python-fido2
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 BSD-2 MIT MPL-2.0
+RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyscard[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] examples? ( dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/0.9
+SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.9.3/fido2-0.9.3.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0e519fd52b71d28e7f90f41d387ce476
diff --git a/metadata/md5-cache/dev-python/fonttools-4.38.0-r1 b/metadata/md5-cache/dev-python/fonttools-4.38.0-r1
new file mode 100644
index 000000000000..e4328ad0f82d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fonttools-4.38.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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=8
+HOMEPAGE=https://github.com/fonttools/fonttools/ https://pypi.org/project/fonttools/
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/fs-2.4.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fonttools/fonttools/archive/4.38.0.tar.gz -> fonttools-4.38.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=5666af16d6c8f9057b24a61fb22aa889
diff --git a/metadata/md5-cache/dev-python/funcy-1.17 b/metadata/md5-cache/dev-python/funcy-1.17
deleted file mode 100644
index d96762894043..000000000000
--- a/metadata/md5-cache/dev-python/funcy-1.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/whatever[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A collection of fancy functional tools focused on practicality
-EAPI=8
-HOMEPAGE=https://github.com/Suor/funcy
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/funcy/funcy-1.17.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6cc0efef56271f5a4841b520fc709276
diff --git a/metadata/md5-cache/dev-python/funcy-1.18 b/metadata/md5-cache/dev-python/funcy-1.18
index b9da6612c172..7353200788d6 100644
--- a/metadata/md5-cache/dev-python/funcy-1.18
+++ b/metadata/md5-cache/dev-python/funcy-1.18
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A collection of fancy functional tools focused on practicality
 EAPI=8
 HOMEPAGE=https://github.com/Suor/funcy/ https://pypi.org/project/funcy/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/f/funcy/funcy-1.18.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=99572f40827f81b61b213dcd991d320a
+SRC_URI=https://files.pythonhosted.org/packages/source/f/funcy/funcy-1.18.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cd6ba2c8a23521aae6113ff219a6cccc
diff --git a/metadata/md5-cache/dev-python/httpx-socks-0.7.5 b/metadata/md5-cache/dev-python/httpx-socks-0.7.5
index 108d13797c53..326df12000b4 100644
--- a/metadata/md5-cache/dev-python/httpx-socks-0.7.5
+++ b/metadata/md5-cache/dev-python/httpx-socks-0.7.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/romis2012/httpx-socks/ https://pypi.org/project/httpx-socks/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/httpx-0.24.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.17.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.14.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-socks-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romis2012/httpx-socks/archive/v0.7.5.tar.gz -> httpx-socks-0.7.5.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3aac9ccc276a9bd9108c7a8cb94678bb
+_md5_=ceff376048bbe57034892b889b83c991
diff --git a/metadata/md5-cache/dev-python/hypercorn-0.14.3-r1 b/metadata/md5-cache/dev-python/hypercorn-0.14.3-r1
index 54338c81cd41..83ae9ba65db1 100644
--- a/metadata/md5-cache/dev-python/hypercorn-0.14.3-r1
+++ b/metadata/md5-cache/dev-python/hypercorn-0.14.3-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pgjones/hypercorn/ https://pypi.org/project/hypercorn/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/h11[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h2-3.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/priority[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wsproto-0.14.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pgjones/hypercorn/archive/0.14.3.tar.gz -> hypercorn-0.14.3.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6aac040adb9be0f5d428fbc1306a7b7d
+_md5_=4dc50032eae6cddde9e7730c859feee0
diff --git a/metadata/md5-cache/dev-python/imageio-2.26.0 b/metadata/md5-cache/dev-python/imageio-2.26.0
new file mode 100644
index 000000000000..dbb6fa18f033
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imageio-2.26.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/fsspec[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imageio-ffmpeg[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library for reading and writing image data
+EAPI=8
+HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/imageio/imageio/archive/v2.26.0.tar.gz -> imageio-2.26.0.gh.tar.gz test? ( https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/chelsea.png -> imageio-chelsea.png https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/cockatoo.mp4 -> imageio-cockatoo.mp4 )
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7eb39bfb3c57aa58cef2245de2a393f4
diff --git a/metadata/md5-cache/dev-python/ipython-8.11.0 b/metadata/md5-cache/dev-python/ipython-8.11.0
new file mode 100644
index 000000000000..b3b415ef8bde
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-8.11.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.38[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[readline,sqlite,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/ https://pypi.org/project/ipython/
+INHERIT=distutils-r1 optfeature pypi virtualx
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/widgetsnbextension[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+RDEPEND=dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.38[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[readline,sqlite,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/i/ipython/ipython-8.11.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=8aa27c512bf721d2d5b81501c2d8d2f9
diff --git a/metadata/md5-cache/dev-python/ipython-8.8.0 b/metadata/md5-cache/dev-python/ipython-8.8.0
deleted file mode 100644
index f51cb73a3ef1..000000000000
--- a/metadata/md5-cache/dev-python/ipython-8.8.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[readline,sqlite,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=8
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/ https://pypi.org/project/ipython/
-INHERIT=distutils-r1 optfeature virtualx
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/widgetsnbextension[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-RDEPEND=dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[readline,sqlite,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-8.8.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=3a15bd953423d8a13659ad48992adcb2
diff --git a/metadata/md5-cache/dev-python/ipython-8.9.0 b/metadata/md5-cache/dev-python/ipython-8.9.0
index 47ed676c8f54..2fe680496b10 100644
--- a/metadata/md5-cache/dev-python/ipython-8.9.0
+++ b/metadata/md5-cache/dev-python/ipython-8.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/ https://pypi.org/project/ipython/
 INHERIT=distutils-r1 optfeature virtualx
 IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/widgetsnbextension[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 RDEPEND=dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[readline,sqlite,threads(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-8.9.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0c222f307a400aad9a4d70ee3cde9807
+_md5_=d3ac4891c013a6c8f247cad5f561e371
diff --git a/metadata/md5-cache/dev-python/jc-1.23.0 b/metadata/md5-cache/dev-python/jc-1.23.0
new file mode 100644
index 000000000000..f2480ea90f82
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jc-1.23.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
+EAPI=8
+HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.23.0.tar.gz -> jc-1.23.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4d38debd191577e669bc84cb217f07da
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.4.4 b/metadata/md5-cache/dev-python/jupyter_console-6.4.4
deleted file mode 100644
index 371be243e2f5..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_console-6.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A terminal-based console frontend for Jupyter kernels
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-6.4.4.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3ed63fa3de2f2ee08506d157d1e037a7
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.5.0 b/metadata/md5-cache/dev-python/jupyter_console-6.5.0
deleted file mode 100644
index 7660ce8dbde6..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_console-6.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A terminal-based console frontend for Jupyter kernels
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-6.5.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=399768b7a291ea8c416a015290478187
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.5.1 b/metadata/md5-cache/dev-python/jupyter_console-6.5.1
index f2b33d9e8017..7afdc1e268a5 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.5.1
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.5.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-6.5.1.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=399768b7a291ea8c416a015290478187
+_md5_=464b4cf3d661151e863e8c6fc3ec9469
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.6.0 b/metadata/md5-cache/dev-python/jupyter_console-6.6.0
deleted file mode 100644
index 72d464964f4a..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_console-6.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A terminal-based console frontend for Jupyter kernels
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-6.6.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=243cb68f3ae4ebfe606950eef345b42e
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.6.2 b/metadata/md5-cache/dev-python/jupyter_console-6.6.2
new file mode 100644
index 000000000000..e303f3dc88f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.6.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A terminal-based console frontend for Jupyter kernels
+EAPI=8
+HOMEPAGE=https://jupyter.org
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_console/jupyter_console-6.6.2.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=243cb68f3ae4ebfe606950eef345b42e
diff --git a/metadata/md5-cache/dev-python/leechcorepyc-2.14.0 b/metadata/md5-cache/dev-python/leechcorepyc-2.14.0
new file mode 100644
index 000000000000..0cfee34d6b72
--- /dev/null
+++ b/metadata/md5-cache/dev-python/leechcorepyc-2.14.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:=
+DESCRIPTION=Python binding for LeechCore Physical Memory Acquisition Library
+EAPI=8
+HOMEPAGE=https://github.com/ufrisk/LeechCore
+INHERIT=distutils-r1 toolchain-funcs
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=virtual/libusb:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/l/leechcorepyc/leechcorepyc-2.14.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8fec998379c0a3286272897c2502dc36
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.9.0 b/metadata/md5-cache/dev-python/libvirt-python-8.9.0
index 2bcbca5315a6..ff5cd5aaa57b 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-8.9.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-8.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.libvirt.org
 INHERIT=distutils-r1 verify-sig
 IUSE=examples test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/8.9.0 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.9.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.9.0.tar.gz.asc )
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=e6bfc6c43261701e1faec869fbcd6d9f
+_md5_=8207bce4f2fec7781adca8907d6163a1
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_rc2 b/metadata/md5-cache/dev-python/lit-16.0.0_rc2
deleted file mode 100644
index 150ebdc0a195..000000000000
--- a/metadata/md5-cache/dev-python/lit-16.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=76aafe2b1c14b670a7497cda70885ee2
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230211 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230211
deleted file mode 100644
index e4f1e8b76205..000000000000
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230211
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230218 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230218
deleted file mode 100644
index 40173a9e6e60..000000000000
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230218
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/markups-4.0.0 b/metadata/md5-cache/dev-python/markups-4.0.0
index 657bf078b17b..f30d27d669ca 100644
--- a/metadata/md5-cache/dev-python/markups-4.0.0
+++ b/metadata/md5-cache/dev-python/markups-4.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-text/pytextile[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pymdown-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( app-text/pytextile[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pymdown-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A wrapper around various text markups
 EAPI=8
 HOMEPAGE=https://pymarkups.readthedocs.io/en/latest/ https://github.com/retext-project/pymarkups https://pypi.org/project/Markups/
 INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_python3_9 python_targets_python3_10
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-markdown-math[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/M/Markups/Markups-4.0.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1c06b33f9eb34501fe5584c29b227a13
+_md5_=03082256082952a8b38a0d0494292832
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.0.15 b/metadata/md5-cache/dev-python/mkdocs-material-9.0.15
new file mode 100644
index 000000000000..7e30d244eef8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.0.15
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
+INHERIT=distutils-r1 docs
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/mkdocs-material-extensions-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.0.15.tar.gz -> mkdocs-material-9.0.15.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	docs	314e509c51630fb75f120d62a77d008c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=15cf58e9868e9720b6733da8a0dbc6f2
diff --git a/metadata/md5-cache/dev-python/more-itertools-9.1.0 b/metadata/md5-cache/dev-python/more-itertools-9.1.0
new file mode 100644
index 000000000000..0c4b31f33ad3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/more-itertools-9.1.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=More routines for operating on iterables, beyond itertools
+EAPI=8
+HOMEPAGE=https://github.com/more-itertools/more-itertools/ https://pypi.org/project/more-itertools/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/m/more-itertools/more-itertools-9.1.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=90e1025b8bdf57702176cb59b64dfc20
diff --git a/metadata/md5-cache/dev-python/mypy-1.0.1 b/metadata/md5-cache/dev-python/mypy-1.0.1
index 08fa5e7cfd75..915b5efb22ba 100644
--- a/metadata/md5-cache/dev-python/mypy-1.0.1
+++ b/metadata/md5-cache/dev-python/mypy-1.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v1.0.1.tar.gz -> mypy-1.0.1.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7e94adbc7fe61cc053c657457fe6b5a9
+_md5_=773ec94b77ce9a4824146d80f43a918b
diff --git a/metadata/md5-cache/dev-python/natsort-8.3.0 b/metadata/md5-cache/dev-python/natsort-8.3.0
new file mode 100644
index 000000000000..d76e17d34c48
--- /dev/null
+++ b/metadata/md5-cache/dev-python/natsort-8.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Natural sorting for Python
+EAPI=8
+HOMEPAGE=https://github.com/SethMMorton/natsort/ https://pypi.org/project/natsort/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/natsort/natsort-8.3.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=be7f5e1b8ee82338e525ad6da02cf8d0
diff --git a/metadata/md5-cache/dev-python/pdoc3-0.10.0 b/metadata/md5-cache/dev-python/pdoc3-0.10.0
index 701b3d8d9948..0dec79421527 100644
--- a/metadata/md5-cache/dev-python/pdoc3-0.10.0
+++ b/metadata/md5-cache/dev-python/pdoc3-0.10.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-python/mako[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/mako[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/mako[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=dev-python/mako[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Auto-generate API documentation for Python projects
 EAPI=7
 HOMEPAGE=https://pdoc3.github.io/pdoc/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
-RDEPEND=dev-python/mako[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/mako[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdoc3/pdoc3-0.10.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=23a66b435333232b8668168cfce10e24
+_md5_=7e21b34b8348ac5cfb5ff7f7b4b34d0a
diff --git a/metadata/md5-cache/dev-python/peewee-3.15.4 b/metadata/md5-cache/dev-python/peewee-3.15.4
deleted file mode 100644
index 5994da754620..000000000000
--- a/metadata/md5-cache/dev-python/peewee-3.15.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small Python ORM
-EAPI=8
-HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
-INHERIT=distutils-r1
-IUSE=examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/coleifer/peewee/archive/3.15.4.tar.gz -> peewee-3.15.4.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ad70104dcd0461bc2ba625edfd04bba6
diff --git a/metadata/md5-cache/dev-python/peewee-3.15.4-r1 b/metadata/md5-cache/dev-python/peewee-3.15.4-r1
new file mode 100644
index 000000000000..0a457d183757
--- /dev/null
+++ b/metadata/md5-cache/dev-python/peewee-3.15.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/sqlite
+DESCRIPTION=Small Python ORM
+EAPI=8
+HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
+INHERIT=distutils-r1
+IUSE=examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 ~riscv x86
+LICENSE=BSD
+RDEPEND=dev-db/sqlite python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/coleifer/peewee/archive/3.15.4.tar.gz -> peewee-3.15.4.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c22f0535cf16f26277a11929a331f750
diff --git a/metadata/md5-cache/dev-python/peewee-3.16.0-r1 b/metadata/md5-cache/dev-python/peewee-3.16.0-r1
new file mode 100644
index 000000000000..45760f4e1e51
--- /dev/null
+++ b/metadata/md5-cache/dev-python/peewee-3.16.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/sqlite
+DESCRIPTION=Small Python ORM
+EAPI=8
+HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
+INHERIT=distutils-r1
+IUSE=examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-db/sqlite python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/coleifer/peewee/archive/3.16.0.tar.gz -> peewee-3.16.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0bd1351e3efbd8634b03f4d9c43ea6d7
diff --git a/metadata/md5-cache/dev-python/pelican-minify-0.9-r2 b/metadata/md5-cache/dev-python/pelican-minify-0.9-r2
index 955a3a69bb69..20882f357749 100644
--- a/metadata/md5-cache/dev-python/pelican-minify-0.9-r2
+++ b/metadata/md5-cache/dev-python/pelican-minify-0.9-r2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An HTML minification plugin for Pelican, the static site generator
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pelican-minify/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=Unlicense
-RDEPEND=>=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pelican-minify/pelican-minify-0.9.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0e82f0efefe263a80df0626f9b1f15b7
+_md5_=d2a2f4c2c78414f1c2797aecb9aeb124
diff --git a/metadata/md5-cache/dev-python/pikepdf-7.1.1 b/metadata/md5-cache/dev-python/pikepdf-7.1.1
index 76189794005e..2554ad6de5b4 100644
--- a/metadata/md5-cache/dev-python/pikepdf-7.1.1
+++ b/metadata/md5-cache/dev-python/pikepdf-7.1.1
@@ -1,17 +1,17 @@
-BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-6.36[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-text/qpdf-11.1.1:0=
 DESCRIPTION=Python library to work with pdf files based on qpdf
 EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MPL-2.0
-RDEPEND=>=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/pikepdf/pikepdf/archive/v7.1.1.tar.gz -> pikepdf-7.1.1.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c98d0c30870277146a69ee245fcc93a9
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-7.1.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8cd11c8dcafbe9de44e9d15513c4ce7b
diff --git a/metadata/md5-cache/dev-python/pkgcraft-0.0.5 b/metadata/md5-cache/dev-python/pkgcraft-0.0.5
index c31e666b24b6..0f5723026827 100644
--- a/metadata/md5-cache/dev-python/pkgcraft-0.0.5
+++ b/metadata/md5-cache/dev-python/pkgcraft-0.0.5
@@ -1,6 +1,6 @@
-BDEPEND=dev-python/cython dev-python/setuptools_scm virtual/pkgconfig test? ( >=sys-libs/pkgcraft-0.0.6:= >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/cython dev-python/setuptools_scm virtual/pkgconfig test? ( <sys-libs/pkgcraft-9999 >=sys-libs/pkgcraft-0.0.6:= >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/pkgcraft-0.0.6:=
+DEPEND=<sys-libs/pkgcraft-9999 >=sys-libs/pkgcraft-0.0.6:=
 DESCRIPTION=Python bindings for pkgcraft
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pkgcraft/ https://github.com/pkgcraft/pkgcraft-python
@@ -8,10 +8,10 @@ INHERIT=distutils-r1
 IUSE=+examples test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=sys-libs/pkgcraft-0.0.6:= python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=<sys-libs/pkgcraft-9999 >=sys-libs/pkgcraft-0.0.6:= python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pkgcraft/pkgcraft-python/releases/download/v0.0.5/pkgcraft-0.0.5.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e168579674d37e1245dd4d562b182209
+_md5_=19cebe0df331c6b097a36bab67d8300c
diff --git a/metadata/md5-cache/dev-python/pkgcraft-9999 b/metadata/md5-cache/dev-python/pkgcraft-9999
index 0229e1adc11b..a36f1077b8f2 100644
--- a/metadata/md5-cache/dev-python/pkgcraft-9999
+++ b/metadata/md5-cache/dev-python/pkgcraft-9999
@@ -1,6 +1,6 @@
-BDEPEND=dev-python/cython dev-python/setuptools_scm virtual/pkgconfig test? ( >=sys-libs/pkgcraft-9999:= >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-python/cython-3.0.0_beta1 dev-python/setuptools_scm virtual/pkgconfig test? ( <sys-libs/pkgcraft-9999 >=sys-libs/pkgcraft-9999:= >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sys-libs/pkgcraft-9999:=
+DEPEND=<sys-libs/pkgcraft-9999 >=sys-libs/pkgcraft-9999:=
 DESCRIPTION=Python bindings for pkgcraft
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pkgcraft/ https://github.com/pkgcraft/pkgcraft-python
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 git-r3
 IUSE=+examples test python_targets_python3_10 python_targets_python3_11
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=sys-libs/pkgcraft-9999:= python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=<sys-libs/pkgcraft-9999 >=sys-libs/pkgcraft-9999:= python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e168579674d37e1245dd4d562b182209
+_md5_=216a18e110502b14d987a95c9c9a32d1
diff --git a/metadata/md5-cache/dev-python/pluginbase-1.0.1 b/metadata/md5-cache/dev-python/pluginbase-1.0.1
index 4aef9a5da1aa..a0159426a659 100644
--- a/metadata/md5-cache/dev-python/pluginbase-1.0.1
+++ b/metadata/md5-cache/dev-python/pluginbase-1.0.1
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Support library for building plugins sytems in Python
 EAPI=7
 HOMEPAGE=https://github.com/mitsuhiko/pluginbase
 INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9 python_targets_python3_10
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluginbase/pluginbase-1.0.1.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=430ab5339a74fcbb0c9308d4a0fab16c
+_md5_=d8914f1037aec78a8501d1051c176741
diff --git a/metadata/md5-cache/dev-python/pluginbase-1.0.1-r1 b/metadata/md5-cache/dev-python/pluginbase-1.0.1-r1
new file mode 100644
index 000000000000..9eb8750de798
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pluginbase-1.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Support library for building plugins sytems in Python
+EAPI=8
+HOMEPAGE=https://github.com/mitsuhiko/pluginbase
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pluginbase/pluginbase-1.0.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4056b83ee160321b9d3abccc7f5a0e4d
diff --git a/metadata/md5-cache/dev-python/pooch-1.7.0 b/metadata/md5-cache/dev-python/pooch-1.7.0
new file mode 100644
index 000000000000..33c9b3c56760
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pooch-1.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/paramiko[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localftpserver[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage your Python library's sample data files
+EAPI=8
+HOMEPAGE=https://github.com/fatiando/pooch/ https://pypi.org/project/pooch/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pooch/pooch-1.7.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ac92622662c3276c5b65a30a34b2a5a8
diff --git a/metadata/md5-cache/dev-python/prompt-toolkit-3.0.38 b/metadata/md5-cache/dev-python/prompt-toolkit-3.0.38
new file mode 100644
index 000000000000..95bf7b081af4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prompt-toolkit-3.0.38
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Building powerful interactive command lines in Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/prompt-toolkit/prompt_toolkit-3.0.38.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e64250e72291d1cdb8af31eda113ad8b
diff --git a/metadata/md5-cache/dev-python/pulsectl-22.3.2 b/metadata/md5-cache/dev-python/pulsectl-22.3.2
index a8cf1a0d99ce..86c1e7fad5f4 100644
--- a/metadata/md5-cache/dev-python/pulsectl-22.3.2
+++ b/metadata/md5-cache/dev-python/pulsectl-22.3.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( media-sound/pulseaudio dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( media-sound/pulseaudio dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)
 EAPI=8
 HOMEPAGE=https://github.com/mk-fg/python-pulse-control/ https://pypi.org/project/pulsectl/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pulsectl/pulsectl-22.3.2.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7492899d357bd3587de8f147ef3d1d45
+_md5_=612b0c69290d4cd31b13b9a35856849c
diff --git a/metadata/md5-cache/dev-python/pycparser-2.21-r1 b/metadata/md5-cache/dev-python/pycparser-2.21-r1
index 0878ec194ce1..c5a282ac693c 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.21-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.21-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.21.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2280e44c8bb149400a4dae66638b5435
+_md5_=2434d243a795bed5cceb476ee6a42f8c
diff --git a/metadata/md5-cache/dev-python/pycparser-2.21-r2 b/metadata/md5-cache/dev-python/pycparser-2.21-r2
index 18c0779d30c9..ebaf1da09f9d 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.21-r2
+++ b/metadata/md5-cache/dev-python/pycparser-2.21-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pycparser/pycparser-2.21.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=427b6b758a8a3b07b278ba9410133e10
+_md5_=6ffd4b1e6005fbcf8ed6237292f420db
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.16.0 b/metadata/md5-cache/dev-python/pycryptodome-3.16.0
deleted file mode 100644
index 69882f2629b6..000000000000
--- a/metadata/md5-cache/dev-python/pycryptodome-3.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:=
-DESCRIPTION=A self-contained cryptographic library for Python
-EAPI=8
-HOMEPAGE=https://www.pycryptodome.org/ https://github.com/Legrandin/pycryptodome/ https://pypi.org/project/pycryptodome/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 Unlicense
-RDEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.16.0.tar.gz -> pycryptodome-3.16.0.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8bca47f6c4298005bb260250d7cfc17c
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.17.0 b/metadata/md5-cache/dev-python/pycryptodome-3.17.0
index 9aa85b6e0871..95aac16a5b8e 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.17.0
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.17.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.pycryptodome.org/ https://github.com/Legrandin/pycryptodome/ https://pypi.org/project/pycryptodome/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 Unlicense
 RDEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.17.0.tar.gz -> pycryptodome-3.17.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c2e376db2a75c934f9d6c34e971af3e3
+_md5_=8bca47f6c4298005bb260250d7cfc17c
diff --git a/metadata/md5-cache/dev-python/pycurl-7.45.1 b/metadata/md5-cache/dev-python/pycurl-7.45.1
deleted file mode 100644
index 876a44ba7670..000000000000
--- a/metadata/md5-cache/dev-python/pycurl-7.45.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/bottle-0.12.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2] ) test? ( >=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) )
-DESCRIPTION=Python bindings for curl/libcurl
-EAPI=8
-HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycurl/pycurl-7.45.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b75c7db4244f2da9e7a3bb55cc39234b
diff --git a/metadata/md5-cache/dev-python/pycurl-7.45.2 b/metadata/md5-cache/dev-python/pycurl-7.45.2
index 32173e91c5e3..84436554efa0 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.45.2
+++ b/metadata/md5-cache/dev-python/pycurl-7.45.2
@@ -4,14 +4,14 @@ DEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)
 DESCRIPTION=Python bindings for curl/libcurl
 EAPI=8
 HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
-INHERIT=distutils-r1 toolchain-funcs
+INHERIT=distutils-r1 pypi toolchain-funcs
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pycurl/pycurl-7.45.2.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0448f351eb55cdf668805e6b808c8dc6
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-7.45.2.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b3f454cc99d1c1feef77f0749437479b
diff --git a/metadata/md5-cache/dev-python/pygame-2.2.0 b/metadata/md5-cache/dev-python/pygame-2.2.0
new file mode 100644
index 000000000000..6b9accbadb6a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame-2.2.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( media-libs/fontconfig sys-apps/util-linux ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads,video,X] ) !X? ( media-libs/libsdl2[threads] ) test? ( media-libs/sdl2-image[gif,jpeg,png,tiff,webp] media-libs/sdl2-mixer[mp3,vorbis,wav] )
+DESCRIPTION=Python bindings for SDL multimedia library
+EAPI=8
+HOMEPAGE=https://www.pygame.org/ https://github.com/pygame/pygame/ https://pypi.org/project/pygame/
+INHERIT=distutils-r1
+IUSE=examples opengl test X python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads,video,X] ) !X? ( media-libs/libsdl2[threads] ) media-libs/fontconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pygame/pygame/archive/2.2.0.tar.gz -> pygame-2.2.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=eb3be7e8654b1f468f82aa4263cedba2
diff --git a/metadata/md5-cache/dev-python/pyglet-2.0.5 b/metadata/md5-cache/dev-python/pyglet-2.0.5
new file mode 100644
index 000000000000..395aa23b153a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyglet-2.0.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/fontconfig ) test? ( virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cross-platform windowing and multimedia library for Python
+EAPI=8
+HOMEPAGE=https://pyglet.org/ https://github.com/pyglet/pyglet/ https://pypi.org/project/pyglet/
+INHERIT=distutils-r1 virtualx xdg-utils
+IUSE=examples image +sound test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyglet/pyglet/archive/v2.0.5.tar.gz -> pyglet-2.0.5.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=296a428b5c6f252eee21bba566aa78ba
diff --git a/metadata/md5-cache/dev-python/pygobject-3.42.2 b/metadata/md5-cache/dev-python/pygobject-3.42.2
index 4f2c5a356e69..9e350c0b79a1 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.42.2
+++ b/metadata/md5-cache/dev-python/pygobject-3.42.2
@@ -1,18 +1,18 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
+DEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] ) test? ( >=app-accessibility/at-spi2-core-2.46.0[introspection] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
 DESCRIPTION=Python bindings for GObject Introspection
 EAPI=8
 HOMEPAGE=https://pygobject.readthedocs.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org meson virtualx xdg distutils-r1
-IUSE=+cairo examples test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=+cairo examples test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.42/pygobject-3.42.2.tar.xz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6fd2beae019b1fb1ffee8a6da9cc3b93
+_md5_=605a0d49c61acc4bca61ced2ba9ed270
diff --git a/metadata/md5-cache/dev-python/pymediainfo-6.0.1 b/metadata/md5-cache/dev-python/pymediainfo-6.0.1
index 47b9410acc59..611f54f76f15 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-6.0.1
+++ b/metadata/md5-cache/dev-python/pymediainfo-6.0.1
@@ -2,8 +2,8 @@ BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A wrapper around the mediainfo library
 EAPI=8
-HOMEPAGE=https://github.com/sbraz/pymediainfo
-INHERIT=distutils-r1
+HOMEPAGE=https://github.com/sbraz/pymediainfo/ https://pypi.org/project/pymediainfo/
+INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=media-libs/libmediainfo python_targets_pypy3? ( >=dev-python/pypy3-7.3.1
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-6.0.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=327c35479372cbd845006e3168bbcd00
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pymediainfo/pymediainfo-6.0.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b9c4e390407ed0c4e98bcf40dbb60e6b
diff --git a/metadata/md5-cache/dev-python/pyocr-0.8.3 b/metadata/md5-cache/dev-python/pyocr-0.8.3
index 921d8c3a0895..d0e3de75236a 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.8.3
+++ b/metadata/md5-cache/dev-python/pyocr-0.8.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An optical character recognition (OCR) tool wrapper
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork/pyocr
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=cuneiform +tesseract test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10
 REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyocr/pyocr-0.8.3.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b926037d9e23332dee1e01b8561f2448
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyocr/pyocr-0.8.3.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=986aadbb72f7c93ee8867a36e86d9e35
diff --git a/metadata/md5-cache/dev-python/pypdf-3.5.0 b/metadata/md5-cache/dev-python/pypdf-3.5.0
new file mode 100644
index 000000000000..307ec8a94850
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypdf-3.5.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+PROPERTIES=test_network
+RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/pypdf/archive/3.5.0.tar.gz -> pypdf-3.5.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/0fe84b30ed33ff3daa9293e44349b8618f135699.tar.gz -> pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz )
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ae2f20813d5dc53248bf201c6dbd5cfc
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.11-r1 b/metadata/md5-cache/dev-python/pypy3-7.3.11-r1
deleted file mode 100644
index a888f08a8e9c..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-7.3.11-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( >=dev-python/pypy3-exe-7.3.11:3.9-7.3.11[bzip2(+),ncurses?] >=dev-python/pypy3-exe-bin-7.3.11:3.9-7.3.11 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
-INHERIT=pax-utils python-utils-r1 toolchain-funcs
-IUSE=+ensurepip gdbm +jit ncurses sqlite tk
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.11:3.9-7.3.11[bzip2(+),ncurses?] >=dev-python/pypy3-exe-bin-7.3.11:3.9-7.3.11 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
-RESTRICT=test
-SLOT=0/pypy39-pp73-336
-SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.11-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.11.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4612cd7485fb79f1c044057a4daaeeb9
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.11_p1 b/metadata/md5-cache/dev-python/pypy3-7.3.11_p1
new file mode 100644
index 000000000000..32e9af444fdf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.11_p1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=|| ( >=dev-python/pypy3-exe-7.3.11:3.9-7.3.11[bzip2(+),ncurses?] >=dev-python/pypy3-exe-bin-7.3.11:3.9-7.3.11 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
+INHERIT=pax-utils python-utils-r1 toolchain-funcs
+IUSE=+ensurepip gdbm +jit ncurses sqlite tk
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.11:3.9-7.3.11[bzip2(+),ncurses?] >=dev-python/pypy3-exe-bin-7.3.11:3.9-7.3.11 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
+RESTRICT=test
+SLOT=0/pypy39-pp73-336
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.11-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.11_p1.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4612cd7485fb79f1c044057a4daaeeb9
diff --git a/metadata/md5-cache/dev-python/pyrate-limiter-2.10.0 b/metadata/md5-cache/dev-python/pyrate-limiter-2.10.0
new file mode 100644
index 000000000000..d7d1ccb52cd3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyrate-limiter-2.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django-redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python Rate-Limiter using Leaky-Bucket Algorimth Family
+EAPI=8
+HOMEPAGE=https://github.com/vutran1710/PyrateLimiter/ https://pypi.org/project/pyrate-limiter/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v2.10.0.tar.gz -> pyrate-limiter-2.10.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=353ea2627a4ad223d6dadbc660e5823b
diff --git a/metadata/md5-cache/dev-python/pyrate-limiter-2.9.1 b/metadata/md5-cache/dev-python/pyrate-limiter-2.9.1
new file mode 100644
index 000000000000..6a8c109a21cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyrate-limiter-2.9.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django-redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python Rate-Limiter using Leaky-Bucket Algorimth Family
+EAPI=8
+HOMEPAGE=https://github.com/vutran1710/PyrateLimiter/ https://pypi.org/project/pyrate-limiter/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v2.9.1.tar.gz -> pyrate-limiter-2.9.1.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=353ea2627a4ad223d6dadbc660e5823b
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.19.2 b/metadata/md5-cache/dev-python/pyrsistent-0.19.2
deleted file mode 100644
index edd09b088096..000000000000
--- a/metadata/md5-cache/dev-python/pyrsistent-0.19.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent/Functional/Immutable data structures
-EAPI=8
-HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.19.2.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bdae9e8ce20214ff6007f3bae5cadd4a
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.19.3 b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
index a26b3d770908..2eb31186cc6e 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.19.3
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Persistent/Functional/Immutable data structures
 EAPI=8
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.19.3.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=93386fdaa4f91f121f8396eb805f7809
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyrsistent/pyrsistent-0.19.3.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=89bedb589e054a6174e0cca5dec89c22
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.14.2 b/metadata/md5-cache/dev-python/pysol_cards-0.14.2
deleted file mode 100644
index 23afd63ef6b8..000000000000
--- a/metadata/md5-cache/dev-python/pysol_cards-0.14.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/random2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Deal PySol FreeCell cards
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pysol-cards/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=Apache-2.0 MIT
-RDEPEND=dev-python/random2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pysol_cards/pysol_cards-0.14.2.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6f47f8fdcc8e13e46f94a14f3f7095c4
diff --git a/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0 b/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0
index dfefe7ea453e..9d7f9e88f65a 100644
--- a/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0
+++ b/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-testinfra/pytest-testinfra-7.0.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=54934a5161b6b39894b8553c5b5ed0db
+_md5_=7695a2b76df5d7f5f07dbe354fd2dbc3
diff --git a/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0 b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
index bf4080232700..d4c2f343b0d7 100644
--- a/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools-git[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/setuptools-git[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=More descriptive parametrized-test IDs for py.test
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-verbose-parametrize/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=059ac2951b601bc235d901eeb63ed23a
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=db8f41fa43a9ecefce3b5aa831c81149
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.3.2 b/metadata/md5-cache/dev-python/python-daemon-2.3.2
index 352731f43916..42dd956ae553 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.3.2
+++ b/metadata/md5-cache/dev-python/python-daemon-2.3.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pagure.io/python-daemon/ https://pypi.org/project/python-daemon/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.3.2.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=67f7805c73d7b7ce14a7b8bd67a68a72
+_md5_=cc4311d3b013a8b7a42ca8f52f1cbdfb
diff --git a/metadata/md5-cache/dev-python/python-gammu-3.2.4-r1 b/metadata/md5-cache/dev-python/python-gammu-3.2.4-r1
new file mode 100644
index 000000000000..2a81aad7d61c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-gammu-3.2.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) app-mobilephone/gammu[dbi] ) test? ( >=app-mobilephone/gammu-1.34.0 dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-mobilephone/gammu-1.34.0
+DESCRIPTION=Python bindings for Gammu
+EAPI=8
+HOMEPAGE=https://wammu.eu/python-gammu/ https://github.com/gammu/python-gammu/ https://pypi.org/project/python-gammu/
+INHERIT=distutils-r1
+IUSE=examples test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gammu/python-gammu/archive/3.2.4.tar.gz -> python-gammu-3.2.4.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d0b13d4f2f24231c26e1fddd43196996
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 f27c0af18e54..f90765684854 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
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/python-lsp/python-lsp-jsonrpc
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/ujson-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2f90489f0470be8bf56298a05c2268d9
+_md5_=3ca25588ee5225b51efece97bce72394
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.7.1 b/metadata/md5-cache/dev-python/python-lsp-server-1.7.1
index cc36835b3f4f..b44878058d9d 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.7.1
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-lsp/python-lsp-server
 INHERIT=distutils-r1 optfeature
 IUSE=all-plugins test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/docstring-to-markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.17.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pluggy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] all-plugins? ( >=dev-python/autopep8-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flake8-5.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mccabe-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycodestyle-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydocstyle-6.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydocstyle-6.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyflakes-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rope-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/yapf[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.7.1.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=03b9a33ca003cc4e483fb83c707bd7f3
+_md5_=99d946b0b7a6d8504157f86beb43a430
diff --git a/metadata/md5-cache/dev-python/python-mpv-1.0.2 b/metadata/md5-cache/dev-python/python-mpv-1.0.2
new file mode 100644
index 000000000000..2dd063e96a72
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-mpv-1.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/xvfbwrapper[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( media-video/mpv[libmpv] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python interface to the mpv media player
+EAPI=8
+HOMEPAGE=https://github.com/jaseg/python-mpv
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64
+LICENSE=AGPL-3
+RDEPEND=media-video/mpv[libmpv] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaseg/python-mpv/archive/v1.0.2.tar.gz -> python-mpv-1.0.2.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=411e7782ebfc1fea14263dd3df096a24
diff --git a/metadata/md5-cache/dev-python/python-multipart-0.0.5 b/metadata/md5-cache/dev-python/python-multipart-0.0.5
index 41eb069e39a9..f88bc01bb35d 100644
--- a/metadata/md5-cache/dev-python/python-multipart-0.0.5
+++ b/metadata/md5-cache/dev-python/python-multipart-0.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/andrew-d/python-multipart/ https://pypi.org/project/python-multipart/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/andrew-d/python-multipart/archive/0.0.5.tar.gz -> python-multipart-0.0.5.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8d725f7ffdc83c5704bdbf7a77db264e
+_md5_=2ecdd008acfad45212182c6057510c20
diff --git a/metadata/md5-cache/dev-python/python-multipart-0.0.6 b/metadata/md5-cache/dev-python/python-multipart-0.0.6
new file mode 100644
index 000000000000..56bec6e6cb1d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-multipart-0.0.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A streaming multipart parser for Python
+EAPI=8
+HOMEPAGE=https://github.com/andrew-d/python-multipart/ https://pypi.org/project/python-multipart/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/andrew-d/python-multipart/archive/0.0.6.tar.gz -> python-multipart-0.0.6.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6ea852412f7c24d435fc5ab7a8cd0820
diff --git a/metadata/md5-cache/dev-python/python-slugify-7.0.0 b/metadata/md5-cache/dev-python/python-slugify-7.0.0
deleted file mode 100644
index 81fddd70316c..000000000000
--- a/metadata/md5-cache/dev-python/python-slugify-7.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/text-unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python Slugify application that handles Unicode
-EAPI=8
-HOMEPAGE=https://github.com/un33k/python-slugify/ https://pypi.org/project/python-slugify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/text-unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/un33k/python-slugify/archive/v7.0.0.tar.gz -> python-slugify-7.0.0.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b6939748fcf945b1f6648e5e8af1c064
diff --git a/metadata/md5-cache/dev-python/python-slugify-8.0.0 b/metadata/md5-cache/dev-python/python-slugify-8.0.0
index ef35ebf08873..6fd92a4def5b 100644
--- a/metadata/md5-cache/dev-python/python-slugify-8.0.0
+++ b/metadata/md5-cache/dev-python/python-slugify-8.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/un33k/python-slugify/ https://pypi.org/project/python-slugify/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/text-unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/un33k/python-slugify/archive/v8.0.0.tar.gz -> python-slugify-8.0.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8071e4fc4dc6580bc871d684e5e61b01
+_md5_=b6939748fcf945b1f6648e5e8af1c064
diff --git a/metadata/md5-cache/dev-python/python-socks-2.1.1 b/metadata/md5-cache/dev-python/python-socks-2.1.1
index 628193eb29d7..c6f5823b823e 100644
--- a/metadata/md5-cache/dev-python/python-socks-2.1.1
+++ b/metadata/md5-cache/dev-python/python-socks-2.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/romis2012/python-socks/ https://pypi.org/project/python-socks/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/async-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romis2012/python-socks/archive/v2.1.1.tar.gz -> python-socks-2.1.1.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aff87151cd2856b19b5b8510cc9b7e76
+_md5_=1eccc67ecfbf8480138a489e033c4a13
diff --git a/metadata/md5-cache/dev-python/python-systemd-235 b/metadata/md5-cache/dev-python/python-systemd-235
index 7d096cb725a2..5ebf08c964ef 100644
--- a/metadata/md5-cache/dev-python/python-systemd-235
+++ b/metadata/md5-cache/dev-python/python-systemd-235
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/systemd/python-systemd
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/systemd:= !sys-apps/systemd[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v235.tar.gz -> python-systemd-235.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b10194751f81b136a883a46f3ef1f9db
+_md5_=032696a726a853d09c156e69d68042d4
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
index 901a6b611cab..96ffd34a28b1 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
@@ -1,17 +1,17 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( media-libs/exempi )
 DESCRIPTION=Library for working with XMP metadata
 EAPI=8
 HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
 INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=BSD
-RDEPEND=dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 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
+SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b5160ac48a704789aa34500359fe31bd
+_md5_=9839d68ca1e7e758523cd868bdda6d7f
diff --git a/metadata/md5-cache/dev-python/pytoolconfig-1.2.5 b/metadata/md5-cache/dev-python/pytoolconfig-1.2.5
index 707ceef16e0f..1ead1f9d8f5d 100644
--- a/metadata/md5-cache/dev-python/pytoolconfig-1.2.5
+++ b/metadata/md5-cache/dev-python/pytoolconfig-1.2.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytoolconfig/ https://github.com/bagel897/pytoolconfig/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-1.4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytoolconfig/pytoolconfig-1.2.5.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b8b6e4bf26625574321037b526a25109
+_md5_=812ea5c0b80a9d0f7136fc094125c631
diff --git a/metadata/md5-cache/dev-python/qiskit-aer-0.11.2-r1 b/metadata/md5-cache/dev-python/qiskit-aer-0.11.2-r1
index 9ee8be9ed848..5bf2e87f03c4 100644
--- a/metadata/md5-cache/dev-python/qiskit-aer-0.11.2-r1
+++ b/metadata/md5-cache/dev-python/qiskit-aer-0.11.2-r1
@@ -1,17 +1,17 @@
-BDEPEND=>=dev-util/cmake-3.17 >=dev-python/scikit-build-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ddt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fixtures[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.16.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-cpp/nlohmann_json-3.1.1 >=dev-libs/spdlog-1.5.0:= >=dev-cpp/muParserX-4.0.8 virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso] >=dev-python/qiskit-terra-0.21.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-util/cmake-3.17 >=dev-python/scikit-build-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybind11-2.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/ddt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fixtures[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.16.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-cpp/nlohmann_json-3.1.1 >=dev-libs/spdlog-1.5.0:= >=dev-cpp/muParserX-4.0.8 virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso] >=dev-python/qiskit-terra-0.21.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/numpy-1.16.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-cpp/nlohmann_json-3.1.1 >=dev-libs/spdlog-1.5.0:= >=dev-cpp/muParserX-4.0.8 virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso]
+DEPEND=>=dev-python/numpy-1.16.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-cpp/nlohmann_json-3.1.1 >=dev-libs/spdlog-1.5.0:= >=dev-cpp/muParserX-4.0.8 virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso]
 DESCRIPTION=High performance simulator for quantum circuits that includes noise models
 EAPI=8
 HOMEPAGE=https://github.com/Qiskit/qiskit-aer/ https://pypi.org/project/qiskit-aer/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/numpy-1.16.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-cpp/nlohmann_json-3.1.1 >=dev-libs/spdlog-1.5.0:= >=dev-cpp/muParserX-4.0.8 virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso] >=dev-python/qiskit-terra-0.21.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/numpy-1.16.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-cpp/nlohmann_json-3.1.1 >=dev-libs/spdlog-1.5.0:= >=dev-cpp/muParserX-4.0.8 virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso] >=dev-python/qiskit-terra-0.21.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Qiskit/qiskit-aer/archive/0.11.2.tar.gz -> qiskit-aer-0.11.2.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d3dc91355fcf11b1578b369d25cd40a5
+_md5_=d78c19772898e48892e4753803f425c4
diff --git a/metadata/md5-cache/dev-python/qiskit-terra-0.23.2 b/metadata/md5-cache/dev-python/qiskit-terra-0.23.2
deleted file mode 100644
index ad85c325a386..000000000000
--- a/metadata/md5-cache/dev-python/qiskit-terra-0.23.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.27.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-text/poppler[png] >=dev-python/ddt-1.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-4.24.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qiskit-aer[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/scikit-learn-0.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tweedledum-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=virtual/rust-1.53 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Terra is the foundation on which Qiskit is built
-EAPI=8
-HOMEPAGE=https://github.com/Qiskit/qiskit-terra/ https://pypi.org/project/qiskit-terra/
-INHERIT=cargo distutils-r1 multiprocessing
-IUSE=+visualization test debug python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-DFS-2016 || ( LGPL-3 MPL-2.0 )
-RDEPEND=>=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tweedledum-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Qiskit/qiskit-terra/archive/0.23.2.tar.gz -> qiskit-terra-0.23.2.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/ahash/0.8.0/download -> ahash-0.8.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.11/download -> crossbeam-epoch-0.9.11.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download -> crossbeam-utils-0.8.12.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libm/0.2.5/download -> libm-0.2.5.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.2/download -> matrixmultiply-0.3.2.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/ndarray/0.15.6/download -> ndarray-0.15.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/numpy/0.18.0/download -> numpy-0.18.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/priority-queue/1.2.0/download -> priority-queue-1.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rand_pcg/0.3.1/download -> rand_pcg-0.3.1.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.6.0/download -> rayon-1.6.0.crate https://crates.io/api/v1/crates/rayon-core/1.10.1/download -> rayon-core-1.10.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustworkx-core/0.12.1/download -> rustworkx-core-0.12.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate
-_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6e5a33e7d4ee965f5eac849f26091fda
diff --git a/metadata/md5-cache/dev-python/qiskit-terra-0.23.2-r1 b/metadata/md5-cache/dev-python/qiskit-terra-0.23.2-r1
new file mode 100644
index 000000000000..688c21d1b040
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qiskit-terra-0.23.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/cython-0.27.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-text/poppler[png] >=dev-python/ddt-1.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-4.24.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qiskit-aer[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/scikit-learn-0.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=Terra is the foundation on which Qiskit is built
+EAPI=8
+HOMEPAGE=https://github.com/Qiskit/qiskit-terra/ https://pypi.org/project/qiskit-terra/
+INHERIT=cargo distutils-r1 multiprocessing optfeature
+IUSE=+visualization test debug python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-DFS-2016 || ( LGPL-3 MPL-2.0 )
+RDEPEND=>=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Qiskit/qiskit-terra/archive/0.23.2.tar.gz -> qiskit-terra-0.23.2.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/ahash/0.8.0/download -> ahash-0.8.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.11/download -> crossbeam-epoch-0.9.11.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download -> crossbeam-utils-0.8.12.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libm/0.2.5/download -> libm-0.2.5.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.2/download -> matrixmultiply-0.3.2.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/ndarray/0.15.6/download -> ndarray-0.15.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/numpy/0.18.0/download -> numpy-0.18.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/priority-queue/1.2.0/download -> priority-queue-1.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rand_pcg/0.3.1/download -> rand_pcg-0.3.1.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.6.0/download -> rayon-1.6.0.crate https://crates.io/api/v1/crates/rayon-core/1.10.1/download -> rayon-core-1.10.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustworkx-core/0.12.1/download -> rustworkx-core-0.12.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate
+_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f7f763c4ade7282a5085519f939a0774
diff --git a/metadata/md5-cache/dev-python/rich-13.2.0 b/metadata/md5-cache/dev-python/rich-13.2.0
deleted file mode 100644
index 384c5755a46e..000000000000
--- a/metadata/md5-cache/dev-python/rich-13.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v13.2.0.tar.gz -> rich-13.2.0.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=348aca590410de1ac7e5571fb0a79575
diff --git a/metadata/md5-cache/dev-python/rich-13.3.0 b/metadata/md5-cache/dev-python/rich-13.3.0
deleted file mode 100644
index 200608637c73..000000000000
--- a/metadata/md5-cache/dev-python/rich-13.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v13.3.0.tar.gz -> rich-13.3.0.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3e31b8fe762824800cbdcbc3a12e57cc
diff --git a/metadata/md5-cache/dev-python/rich-13.3.1 b/metadata/md5-cache/dev-python/rich-13.3.1
index b47b931a7355..605c2e56bfd6 100644
--- a/metadata/md5-cache/dev-python/rich-13.3.1
+++ b/metadata/md5-cache/dev-python/rich-13.3.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Textualize/rich/archive/v13.3.1.tar.gz -> rich-13.3.1.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3e31b8fe762824800cbdcbc3a12e57cc
+_md5_=7aaaed653f2cc029ee63f57465e088d6
diff --git a/metadata/md5-cache/dev-python/roman-4.0 b/metadata/md5-cache/dev-python/roman-4.0
new file mode 100644
index 000000000000..16372dffe724
--- /dev/null
+++ b/metadata/md5-cache/dev-python/roman-4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An Integer to Roman numerals converter
+EAPI=8
+HOMEPAGE=https://pypi.org/project/roman/ https://github.com/zopefoundation/roman
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/roman/roman-4.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ffacff9810b08a3cb9afe52ba461fb99
diff --git a/metadata/md5-cache/dev-python/rope-1.7.0 b/metadata/md5-cache/dev-python/rope-1.7.0
index 93706e28a798..58e9cbb10ecd 100644
--- a/metadata/md5-cache/dev-python/rope-1.7.0
+++ b/metadata/md5-cache/dev-python/rope-1.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/rope/ https://github.com/python-rope/rope/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/pytoolconfig-1.2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-1.7.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=afdac0702a381ceb4309101facacec8f
+_md5_=9ed6c9a6f488861195bb8e58089e5345
diff --git a/metadata/md5-cache/dev-python/seaborn-0.12.2 b/metadata/md5-cache/dev-python/seaborn-0.12.2
new file mode 100644
index 000000000000..6e082e111b5e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/seaborn-0.12.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/statsmodels[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Statistical data visualization
+EAPI=8
+HOMEPAGE=https://seaborn.pydata.org https://github.com/mwaskom/seaborn
+INHERIT=distutils-r1 multiprocessing pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/statsmodels[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/seaborn/seaborn-0.12.2.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7c6bfcfcef12a560076e973b06c976c6
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.16.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.16.0
new file mode 100644
index 000000000000..2ed8f0b87a3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/executing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-login[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-event[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getsentry/sentry-python/archive/1.16.0.tar.gz -> sentry-python-1.16.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a11a22aada5d3fcc8b31985850308871
diff --git a/metadata/md5-cache/dev-python/sphinx-autoapi-2.0.0 b/metadata/md5-cache/dev-python/sphinx-autoapi-2.0.0
index 4c7d75e04933..23c6fa89b314 100644
--- a/metadata/md5-cache/dev-python/sphinx-autoapi-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinx-autoapi-2.0.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/astroid[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/astroid[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A new approach to API documentation in Sphinx
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/readthedocs/sphinx-autoapi/archive/v2.0.0.tar.gz -> sphinx-autoapi-2.0.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5bdabafc14ae166da624b4a4b2593516
+_md5_=89fa729b54443dde5b9976845fe30267
diff --git a/metadata/md5-cache/dev-python/sphinx-autoapi-2.0.1 b/metadata/md5-cache/dev-python/sphinx-autoapi-2.0.1
new file mode 100644
index 000000000000..bbdde99ffd0b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autoapi-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/astroid[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A new approach to API documentation in Sphinx
+EAPI=8
+HOMEPAGE=https://sphinx-autoapi.readthedocs.io/ https://github.com/readthedocs/sphinx-autoapi/ https://pypi.org/project/sphinx-autoapi/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/astroid[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/readthedocs/sphinx-autoapi/archive/v2.0.1.tar.gz -> sphinx-autoapi-2.0.1.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6803ce12e1701b07b4b498aa1736d2bb
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.1 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.1
index a70cfa3dbd32..a054ed574acf 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.1
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx theme integrates the Bootstrap CSS / JavaScript framework
 EAPI=8
 HOMEPAGE=https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html
 INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/v0.8.1.tar.gz -> sphinx-bootstrap-theme-0.8.1.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bd580ac90bf68ac9a303d74190c192dc
+_md5_=5187aaa991e70c9494852b0f54f8a62e
diff --git a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.0 b/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.0
index fedc595f5767..6014b7d07331 100644
--- a/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.0
+++ b/metadata/md5-cache/dev-python/sphinx-rtd-theme-1.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme/ https://pypi.org/project/sphinx-rtd-theme/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-jquery-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-rtd-theme/sphinx_rtd_theme-1.2.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0742fbd8bd8610a480054f23cc36ad60
+_md5_=1e6bc2cf86f1ce33863b239acfe78193
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r2 b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r2
index 32b9653bca20..6d94a9b3bd2b 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Testing utility classes and functions for Sphinx extensions
 EAPI=8
 HOMEPAGE=https://github.com/sphinx-doc/sphinx-testing
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-1.0.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=816ec51b3ad14975467376af1641fbb4
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-testing/sphinx-testing-1.0.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e952f5960960759a0ed2bbcd4930f4cd
diff --git a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.9.1 b/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.9.1
index 2550bd3b648b..a103cb441403 100644
--- a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.9.1
+++ b/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.9.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( dev-python/ansible-pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-notfound-page[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-notfound-page[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( dev-python/ansible-pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-notfound-page[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-notfound-page[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-notfound-page[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A reusable Ansible Sphinx theme
 EAPI=8
 HOMEPAGE=https://github.com/ansible-community/sphinx_ansible_theme
 INHERIT=distutils-r1
-IUSE=doc python_targets_python3_9 python_targets_python3_10
+IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT
-RDEPEND=dev-python/sphinx-rtd-theme[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/sphinx-rtd-theme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-ansible-theme/sphinx-ansible-theme-0.9.1.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2178555fa7aab8f7ab776046b2581f9c
+_md5_=671d206f67c1bad24d91aa66e235b1c5
diff --git a/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3 b/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
deleted file mode 100644
index 72d9aaf7e050..000000000000
--- a/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx selective rendition extensions
-EAPI=8
-HOMEPAGE=https://github.com/pfalcon/sphinx_selective_exclude
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-PDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0ea7d122330e8f415815d53ca5851330
diff --git a/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3-r1 b/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3-r1
new file mode 100644
index 000000000000..fd52d63d3747
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx selective rendition extensions
+EAPI=8
+HOMEPAGE=https://github.com/pfalcon/sphinx_selective_exclude
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+PDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e1d268df7f92baa4c1c9c6feea078cfd
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jquery-3.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-jquery-3.0.0
index c1cce8635b43..4a274f235c26 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jquery-3.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jquery-3.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sphinx-contrib/jquery/ https://pypi.org/project/sphinxcontrib.jquery/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=0BSD MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-contrib/jquery/archive/refs/tags/v3.0.0.tar.gz -> jquery-3.0.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=833b5230356ecaa41af873260f6bf7a1
+_md5_=e0371faaa4065691e35715db6deb694d
diff --git a/metadata/md5-cache/dev-python/starlette-0.25.0 b/metadata/md5-cache/dev-python/starlette-0.25.0
index 1c98d8326eaf..ce5385f20da0 100644
--- a/metadata/md5-cache/dev-python/starlette-0.25.0
+++ b/metadata/md5-cache/dev-python/starlette-0.25.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/starlette/archive/0.25.0.tar.gz -> starlette-0.25.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=03f2e2848da8c2bec3ced31d2e99b0e5
+_md5_=f53bdbacdfbb303ca1dbe0d4f07f9133
diff --git a/metadata/md5-cache/dev-python/stomp-py-8.1.0 b/metadata/md5-cache/dev-python/stomp-py-8.1.0
new file mode 100644
index 000000000000..4a51ab8d1616
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stomp-py-8.1.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client library for the STOMP messaging protocol
+EAPI=8
+HOMEPAGE=https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/docopt-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/s/stomp.py/stomp.py-8.1.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=733a890102906d44d7c235d86d9cc75f
diff --git a/metadata/md5-cache/dev-python/tabulate-0.9.0 b/metadata/md5-cache/dev-python/tabulate-0.9.0
index e9481e2e75d2..4b21c0f519b1 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.9.0
+++ b/metadata/md5-cache/dev-python/tabulate-0.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/astanin/python-tabulate/ https://pypi.org/project/tabulate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/astanin/python-tabulate/archive/v0.9.0.tar.gz -> python-tabulate-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f9506088c01e6a0edc1b4fab7363681f
+_md5_=b9737bc65e3c3c3d2ed7b94502a124f7
diff --git a/metadata/md5-cache/dev-python/tasklib-2.5.1 b/metadata/md5-cache/dev-python/tasklib-2.5.1
new file mode 100644
index 000000000000..d863b60482f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tasklib-2.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-misc/task-2.4.0 dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python library for interacting with taskwarrior databases
+EAPI=8
+HOMEPAGE=https://github.com/GothenburgBitFactory/tasklib https://pypi.org/project/tasklib/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=app-misc/task-2.4.0 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tasklib/tasklib-2.5.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=dea7245071f7d79f31cdf4b4a5ff66da
diff --git a/metadata/md5-cache/dev-python/tempest-34.0.0-r1 b/metadata/md5-cache/dev-python/tempest-34.0.0-r1
new file mode 100644
index 000000000000..83773a03d21d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tempest-34.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stestr[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.16.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenStack Integration Testing
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/ https://launchpad.net/tempest/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/defusedxml-0.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.16.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tempest/tempest-34.0.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2cbf437a70ffcbbe75ae000a96507255
diff --git a/metadata/md5-cache/dev-python/tenacity-8.2.2 b/metadata/md5-cache/dev-python/tenacity-8.2.2
new file mode 100644
index 000000000000..cdc2ed60b7b2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tenacity-8.2.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=General-purpose retrying library
+EAPI=8
+HOMEPAGE=https://github.com/jd/tenacity/ https://pypi.org/project/tenacity/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tenacity/tenacity-8.2.2.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4305ec8a03ff9c0e09e4b0d8ec908ce7
diff --git a/metadata/md5-cache/dev-python/tifffile-2023.1.23.1 b/metadata/md5-cache/dev-python/tifffile-2023.1.23.1
deleted file mode 100644
index c2f8a4f7a6df..000000000000
--- a/metadata/md5-cache/dev-python/tifffile-2023.1.23.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/dask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read and write TIFF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/tifffile/ https://github.com/cgohlke/tifffile/ https://www.cgohlke.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cgohlke/tifffile/archive/v2023.1.23.1.tar.gz -> tifffile-2023.1.23.1.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=370c3656c1a5d5faf2640e054a650f9d
diff --git a/metadata/md5-cache/dev-python/tifffile-2023.2.2 b/metadata/md5-cache/dev-python/tifffile-2023.2.2
deleted file mode 100644
index be91a86059fe..000000000000
--- a/metadata/md5-cache/dev-python/tifffile-2023.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/dask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read and write TIFF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/tifffile/ https://github.com/cgohlke/tifffile/ https://www.cgohlke.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cgohlke/tifffile/archive/v2023.2.2.tar.gz -> tifffile-2023.2.2.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=370c3656c1a5d5faf2640e054a650f9d
diff --git a/metadata/md5-cache/dev-python/tifffile-2023.2.27 b/metadata/md5-cache/dev-python/tifffile-2023.2.27
new file mode 100644
index 000000000000..e1eb731559ea
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tifffile-2023.2.27
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/dask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read and write TIFF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tifffile/ https://github.com/cgohlke/tifffile/ https://www.cgohlke.com/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cgohlke/tifffile/archive/v2023.2.27.tar.gz -> tifffile-2023.2.27.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=370c3656c1a5d5faf2640e054a650f9d
diff --git a/metadata/md5-cache/dev-python/tiny-proxy-0.1.1 b/metadata/md5-cache/dev-python/tiny-proxy-0.1.1
index 99a2e49302ab..160ba9231144 100644
--- a/metadata/md5-cache/dev-python/tiny-proxy-0.1.1
+++ b/metadata/md5-cache/dev-python/tiny-proxy-0.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/romis2012/tiny-proxy/ https://pypi.org/project/tiny-proxy/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/anyio-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romis2012/tiny-proxy/archive/v0.1.1.tar.gz -> tiny-proxy-0.1.1.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f9de9b658dc1d4318c218a3ea8ecce49
+_md5_=54485fb0f3d2218346109d657a8d577b
diff --git a/metadata/md5-cache/dev-python/tld-0.13 b/metadata/md5-cache/dev-python/tld-0.13
new file mode 100644
index 000000000000..ac6a695d9cef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tld-0.13
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/Faker[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extract the top level domain (TLD) from the URL given
+EAPI=8
+HOMEPAGE=https://github.com/barseghyanartur/tld/ https://pypi.org/project/tld/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/barseghyanartur/tld/archive/0.13.tar.gz -> tld-0.13.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=072b7112fe7b72e0afe456dabb787dc5
diff --git a/metadata/md5-cache/dev-python/toposort-1.10 b/metadata/md5-cache/dev-python/toposort-1.10
new file mode 100644
index 000000000000..c09ff1322d4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/toposort-1.10
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Implements a topological sort algorithm
+EAPI=8
+HOMEPAGE=https://gitlab.com/ericvsmith/toposort/ https://pypi.org/project/toposort/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/toposort/toposort-1.10.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=73e3a82ee30ec80873f020199c1c1828
diff --git a/metadata/md5-cache/dev-python/ubelt-1.2.4 b/metadata/md5-cache/dev-python/ubelt-1.2.4
new file mode 100644
index 000000000000..5558f8176c89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ubelt-1.2.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/numpy-1.19.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.25.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xdoctest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xxhash-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
+EAPI=8
+HOMEPAGE=https://github.com/Erotemic/ubelt/ https://pypi.org/project/ubelt/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Erotemic/ubelt/archive/v1.2.4.tar.gz -> ubelt-1.2.4.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7aca27b5bdf697c42041e7ea4b485580
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.19.1 b/metadata/md5-cache/dev-python/vdirsyncer-0.19.1
new file mode 100644
index 000000000000..988fbb2165e1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-httpserver[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aioresponses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/click-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/click-log-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiohttp-4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiohttp-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiostream-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiostream-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Synchronize calendars and contacts
+EAPI=8
+HOMEPAGE=https://github.com/pimutils/vdirsyncer/ https://pypi.org/project/vdirsyncer/
+INHERIT=distutils-r1 pypi systemd
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=<dev-python/click-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/click-log-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/atomicwrites-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiohttp-4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiohttp-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiostream-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiostream-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/v/vdirsyncer/vdirsyncer-0.19.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cdba8e8d7d52defd291a7bdd5fec0fa7
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.20.0 b/metadata/md5-cache/dev-python/virtualenv-20.20.0
new file mode 100644
index 000000000000..c9ef67f0aba8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.20.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.20.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=09d5e8307a7083b4fff6a92757ab8a40
diff --git a/metadata/md5-cache/dev-python/watchdog-2.3.1 b/metadata/md5-cache/dev-python/watchdog-2.3.1
new file mode 100644
index 000000000000..f6141efbf18d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchdog-2.3.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-timeout-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python API and shell utilities to monitor file system events
+EAPI=8
+HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/w/watchdog/watchdog-2.3.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=eb55837d9dc4dc569d27af69876ab813
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.4.2 b/metadata/md5-cache/dev-python/websocket-client-1.4.2
deleted file mode 100644
index 2fe4e831befa..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-1.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=8
-HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
-INHERIT=distutils-r1
-IUSE=examples test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.4.2.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5f70226ec490e7ff04122c4e78242bf4
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.5.0 b/metadata/md5-cache/dev-python/websocket-client-1.5.0
index 52b30bf3596e..22ffcae1cd27 100644
--- a/metadata/md5-cache/dev-python/websocket-client-1.5.0
+++ b/metadata/md5-cache/dev-python/websocket-client-1.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.5.0.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e9ca3213c37ed61702b40880e6642aa4
+_md5_=5f70226ec490e7ff04122c4e78242bf4
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.5.1 b/metadata/md5-cache/dev-python/websocket-client-1.5.1
index 98c491488e57..03e3e078538c 100644
--- a/metadata/md5-cache/dev-python/websocket-client-1.5.1
+++ b/metadata/md5-cache/dev-python/websocket-client-1.5.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=8
 HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=examples test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.5.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e9ca3213c37ed61702b40880e6642aa4
+SRC_URI=https://files.pythonhosted.org/packages/source/w/websocket-client/websocket-client-1.5.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=33e508711307160fad296bcb7e7d4c5e
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.2.2 b/metadata/md5-cache/dev-python/werkzeug-2.2.2
deleted file mode 100644
index f5a281f74d41..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=8
-HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
-INHERIT=distutils-r1
-IUSE=test-rust test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/2.2.2.tar.gz -> werkzeug-2.2.2.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6d04524e4f1286831d66ed27d0732a20
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.2.3 b/metadata/md5-cache/dev-python/werkzeug-2.2.3
index 734c1da3fe44..fabbef3fa917 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.2.3
+++ b/metadata/md5-cache/dev-python/werkzeug-2.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
 INHERIT=distutils-r1
 IUSE=test-rust test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.2.3.tar.gz -> werkzeug-2.2.3.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4c1322b6873c0c25efe50cf599e93a1b
+_md5_=6d04524e4f1286831d66ed27d0732a20
diff --git a/metadata/md5-cache/dev-python/whatever-0.6-r1 b/metadata/md5-cache/dev-python/whatever-0.6-r1
deleted file mode 100644
index 2fc4824f7e9f..000000000000
--- a/metadata/md5-cache/dev-python/whatever-0.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Easy anonymous functions by partial application of operators
-EAPI=8
-HOMEPAGE=https://github.com/Suor/whatever
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Suor/whatever/archive/0.6.tar.gz -> whatever-0.6.gh.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=628a250f3afa123f13f955fe4c4a538b
diff --git a/metadata/md5-cache/dev-python/whatever-0.7 b/metadata/md5-cache/dev-python/whatever-0.7
index b5dd508dc60a..d2b40bff0e98 100644
--- a/metadata/md5-cache/dev-python/whatever-0.7
+++ b/metadata/md5-cache/dev-python/whatever-0.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Suor/whatever/ https://pypi.org/project/whatever/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Suor/whatever/archive/0.7.tar.gz -> whatever-0.7.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9b68ced8d310040dbb1b51adc1b6b9ad
+_md5_=36c362bf6197c77c3a2ee6673f6f0204
diff --git a/metadata/md5-cache/dev-python/whatthepatch-1.0.3 b/metadata/md5-cache/dev-python/whatthepatch-1.0.3
deleted file mode 100644
index 3d31dc6ae9d8..000000000000
--- a/metadata/md5-cache/dev-python/whatthepatch-1.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A patch parsing and application library.
-EAPI=8
-HOMEPAGE=https://github.com/cscorley/whatthepatch/ https://pypi.org/project/whatthepatch/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/whatthepatch/whatthepatch-1.0.3.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8ae679fe7021cb9a0e39f5a646270376
diff --git a/metadata/md5-cache/dev-python/whatthepatch-1.0.4 b/metadata/md5-cache/dev-python/whatthepatch-1.0.4
index 563389e51789..8542e334a45a 100644
--- a/metadata/md5-cache/dev-python/whatthepatch-1.0.4
+++ b/metadata/md5-cache/dev-python/whatthepatch-1.0.4
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A patch parsing and application library.
 EAPI=8
 HOMEPAGE=https://github.com/cscorley/whatthepatch/ https://pypi.org/project/whatthepatch/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/w/whatthepatch/whatthepatch-1.0.4.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=096a0ea534e57058d9fdd6d04feae568
+SRC_URI=https://files.pythonhosted.org/packages/source/w/whatthepatch/whatthepatch-1.0.4.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=037936de264da12191d7ee9984b0d06f
diff --git a/metadata/md5-cache/dev-python/wrapt-1.15.0 b/metadata/md5-cache/dev-python/wrapt-1.15.0
new file mode 100644
index 000000000000..ebc98d946222
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wrapt-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Module for decorators, wrappers and monkey patching
+EAPI=8
+HOMEPAGE=https://github.com/GrahamDumpleton/wrapt/ https://pypi.org/project/wrapt/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.15.0.tar.gz -> wrapt-1.15.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e7cb81c9b6f7625dd36af79a72e2a8be
diff --git a/metadata/md5-cache/dev-python/yapf-0.32.0-r1 b/metadata/md5-cache/dev-python/yapf-0.32.0-r1
index 85bfa591e981..1fb4d8454404 100644
--- a/metadata/md5-cache/dev-python/yapf-0.32.0-r1
+++ b/metadata/md5-cache/dev-python/yapf-0.32.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/google/yapf/ https://pypi.org/project/yapf/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.32.0.tar.gz -> yapf-0.32.0.gh.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d038a9b9c87fdb8e6507e38b37e4b8d8
+_md5_=8101fadbeb527be9da4caa7c4fa1064a
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-3.0_p1 b/metadata/md5-cache/dev-python/zc-lockfile-3.0_p1
new file mode 100644
index 000000000000..84ddc75c4c24
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zc-lockfile-3.0_p1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Basic inter-process locks
+EAPI=8
+HOMEPAGE=https://github.com/zopefoundation/zc.lockfile/ https://pypi.org/project/zc.lockfile/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ZPL
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zc.lockfile/zc.lockfile-3.0.post1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a6325d1aff7260dc0d2621f29f719869
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index a82fb8e1588d..9683f73e2389 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.8 b/metadata/md5-cache/dev-qt/qtsql-5.15.8
deleted file mode 100644
index b1da85ebdefd..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.8*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( =dev-qt/qttest-5.15.8* )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.8*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.15.8
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=db60a2578343b23f551598b6709ba469
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtsql-5.15.8-r1
index 5d71aad71cd4..7b5f9a135538 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.8-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.8-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.8*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15.8
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=d25b01c1c816b5f66b02d2116c610493
+_md5_=4027f8c862554a7d75c7debc1a536378
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
index b6114a227deb..c7b1518ed80d 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/georuby-2.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2d3fb882add2b10ae6c0a3c9b210eaea
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 8c05a42593c1..7717ef40a6fc 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/abstract-1.0.0-r4 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
index 87bbed105521..cac33df46aec 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1c1b8146bc9ba3702c3369fb2bf1bb4c
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
index 0f0a73deef37..b88e2773e08c 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b4470c9d6a61ba739202cc88e5851f66
diff --git a/metadata/md5-cache/dev-ruby/acme-client-2.0.9 b/metadata/md5-cache/dev-ruby/acme-client-2.0.9
index 4eab26f6b2e7..0f3e2a96b364 100644
--- a/metadata/md5-cache/dev-ruby/acme-client-2.0.9
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.9.tar.gz -> acme-client-2.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b7d4ee795741e17a3f3174611ccf11df
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.2.8.1 b/metadata/md5-cache/dev-ruby/actioncable-5.2.8.1
index 12e42fda025c..06c2e9187b13 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f313fe179de702dfe6a43c8690e4b96e
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.5.1 b/metadata/md5-cache/dev-ruby/actioncable-6.0.5.1
index 2781809c8c6b..742485427273 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=60f31a8b585c04e3f4becf95fa6ffe0a
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1 b/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1
index 9c3c791f5513..87a9ebfbaf77 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e1a703defa9d2188dfe643566bfb76c1
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.6.1 b/metadata/md5-cache/dev-ruby/actioncable-6.1.6.1
index 728d85d1f0c6..ed900f067239 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e2df09a774273360f5fa7bb24bdaf440
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.7 b/metadata/md5-cache/dev-ruby/actioncable-6.1.7
index 58a2d8407f0d..96e3513889e3 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.7
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2f557a5da4ec6808c98207bc2eb64820
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.7.2 b/metadata/md5-cache/dev-ruby/actioncable-6.1.7.2
index b95fdd493e44..a0a77a10a501 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8034e65e304446464019fd4bc3c7931f
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.4 b/metadata/md5-cache/dev-ruby/actioncable-7.0.4
index 9fe94446b3fc..274c120356f3 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.4
+++ b/metadata/md5-cache/dev-ruby/actioncable-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bcb01adabf6c3601ce178e39e4ebbd5b
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.4.2 b/metadata/md5-cache/dev-ruby/actioncable-7.0.4.2
index 8b08dd0278d8..f32185a7b7f0 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/actioncable-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bcb01adabf6c3601ce178e39e4ebbd5b
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5.1
index d306a313daf5..a7e5eace3433 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=82512b9ce21f9ae314c14cb69641473b
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1
index b60001a07760..eff7c1416258 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=561db1a4a773764d766f7ec2c09979e0
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6.1
index 98cf4856032c..e50d2c0686d4 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=199caa3c310bdba631da14049d6461b9
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7
index 84db7300984f..83138732ea87 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5ab307d6d097e42443c4b65f2d6af490
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.2 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.2
index a6c06bfd23c8..9f559735a6ec 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9353ef71c4c67c4879ac15987455d528
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4
index 157ae594bc71..af321ed6803b 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e9d9610d04dba744f8168dd8b78d9aac
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.2 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.2
index 479ef29f7e09..96c058498841 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a2f0c9d4242faf7278da65cfb0dc6af8
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.2.8.1 b/metadata/md5-cache/dev-ruby/actionmailer-5.2.8.1
index db4e47044d2f..497cda6d5a63 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d7f86e70d95c3792ced768e696c75e49
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.5.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.5.1
index 3f4d8aead008..314929fd0b78 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e32553fbb787dd1ad007e95392d01d89
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1
index b7b03ff1078a..eb15bc0cb577 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e71ebdabca890dca10c6706de4abaa97
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.6.1
index deaa925b6e59..d0268c4af736 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0683d1d03e7661a60982112e2c97e77f
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.7 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.7
index 810deb08d397..ed2bbcf49a76 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.7
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=669793aa2007d6da7eed8935103c25ea
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.2 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.2
index 7fcbb81f9269..c0133a0bd76e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b2a07c38a7a1704953d865deaa299c90
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.4 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.4
index 3b3ef8547b14..bb12ab163a31 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.4
+++ b/metadata/md5-cache/dev-ruby/actionmailer-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dfda8986f13ae38bf0dcd2e015243d88
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.2 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.2
index 69b0d0a0729e..e15c3aef1eca 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dfda8986f13ae38bf0dcd2e015243d88
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.2.8.1 b/metadata/md5-cache/dev-ruby/actionpack-5.2.8.1
index 5e48e161e16b..94a4305a731d 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=64e20a3deb41062be90c3eba400eba01
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.5.1 b/metadata/md5-cache/dev-ruby/actionpack-6.0.5.1
index ec28b6f06758..593223e93179 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cb558d842d83dc876d5a4e6d584929a2
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1
index 8a4b177460a9..f6c28f523c6b 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f16a78c751bf983bf06c20812c53df05
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionpack-6.1.6.1
index 23cecb917611..6ef146b87568 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8234461ba5d92790f3c8b0cc65d80703
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.7 b/metadata/md5-cache/dev-ruby/actionpack-6.1.7
index 6c58164ba918..bf53fa8103ff 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.7
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6e2aa97e31d06269f68750552a8361c1
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.7.2 b/metadata/md5-cache/dev-ruby/actionpack-6.1.7.2
index 5f5e624ac7df..680ed9f05c27 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2f32a20843387e5f72d71c4903e6bc5f
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.4 b/metadata/md5-cache/dev-ruby/actionpack-7.0.4
index 1d5fa1867a70..1126f8c96da1 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.4
+++ b/metadata/md5-cache/dev-ruby/actionpack-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ca275747f3641e297d93517f487eb6ee
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.4.2 b/metadata/md5-cache/dev-ruby/actionpack-7.0.4.2
index d048d268bbc0..eb8dc16a1d85 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ca87de65caf7e78d66d0ecf98aec1ce9
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
index afbab9a4f674..cc5d58ba05ea 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/actionpack-action_caching-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=00b0c2d49e60c4ec76581c7e720c3bbc
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
index 624ac569873e..047f12103224 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6fffcc41ebebe3f0a34a2e7fb68d6d90
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.5.1 b/metadata/md5-cache/dev-ruby/actiontext-6.0.5.1
index 922aa62964c4..f06eb9361d87 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c5d25ba2824f64e02cf1ebdc8e8a6c0b
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1 b/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1
index 794e9cb7e373..51b0f6694e89 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=92cf1c38ecba64d4e370364c677b5595
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.6.1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.6.1
index cbb2a9b8ce0a..582d2f51f9ac 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=918a40b7a7ef5d11b3cf7d067b99f33c
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.7 b/metadata/md5-cache/dev-ruby/actiontext-6.1.7
index f40addc405b7..75872e60fb14 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.7
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6554684adf407009bd52749ef195be7e
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.7.2 b/metadata/md5-cache/dev-ruby/actiontext-6.1.7.2
index 3dd0b952acae..df9ecd6f0f25 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eadc21707e3765ecc25f4bab1d5bffcc
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.4 b/metadata/md5-cache/dev-ruby/actiontext-7.0.4
index cfb761e7aa72..c95d64057abc 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.4
+++ b/metadata/md5-cache/dev-ruby/actiontext-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59b585e44638403ece41df9f0c495c0a
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.4.2 b/metadata/md5-cache/dev-ruby/actiontext-7.0.4.2
index 35282e521129..f2cc93dcfbd9 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/actiontext-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59b585e44638403ece41df9f0c495c0a
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.2.8.1 b/metadata/md5-cache/dev-ruby/actionview-5.2.8.1
index 2f5cba9597ad..55dec8ca3852 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/actionview-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9d162b576a921d8057bc914072ecb5bb
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.5.1 b/metadata/md5-cache/dev-ruby/actionview-6.0.5.1
index 6eabe0070eab..247f553be8e2 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c6d8b095cf95e79a5b714c27703d45e5
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionview-6.0.6.1
index f6df5543f71c..0642c5191870 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ac329389e3dac5c8a837a91551d92fed
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionview-6.1.6.1
index 98ac87b2bd4b..ee76dc85812b 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b9004bfd1301e26556ac7de9d731c3ea
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.7 b/metadata/md5-cache/dev-ruby/actionview-6.1.7
index 387d3e8f35de..6523c8e0fed7 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.7
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a3dc7dccceaaa13405e65be48886b16c
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.7.2 b/metadata/md5-cache/dev-ruby/actionview-6.1.7.2
index fe3a7aeafe62..3f6e83dbbe5c 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6d231c1f68f94e34c8856cf3fcde6305
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.4 b/metadata/md5-cache/dev-ruby/actionview-7.0.4
index cf8f6e7679be..b72d8a8243c6 100644
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.4
+++ b/metadata/md5-cache/dev-ruby/actionview-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1977a0d4f102641263713faede47059c
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.4.2 b/metadata/md5-cache/dev-ruby/actionview-7.0.4.2
index 665dce7074db..34565d72b4c0 100644
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/actionview-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1977a0d4f102641263713faede47059c
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.2.8.1 b/metadata/md5-cache/dev-ruby/activejob-5.2.8.1
index 8b6258eb3ed3..60d3ab9cd871 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/activejob-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1e001cd4900ce5c301e23717174334d7
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.5.1 b/metadata/md5-cache/dev-ruby/activejob-6.0.5.1
index 0246146f7ab6..87372b6e608b 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4d0962b5abaa614b609bc2414ca5c898
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.6.1 b/metadata/md5-cache/dev-ruby/activejob-6.0.6.1
index 638b0b0d83d9..2a3ba6a60477 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ae0b697603404ae3fe213a46480577b
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.6.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.6.1
index 26c25258320e..c1203259473c 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b60a2603b307b7dbb2c91c899f8c9344
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.7 b/metadata/md5-cache/dev-ruby/activejob-6.1.7
index 098e46481810..8cb37e677d75 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.7
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0c1f2d043b901b0c2e0fdd85e019e367
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.7.2 b/metadata/md5-cache/dev-ruby/activejob-6.1.7.2
index e792ee4c3181..b52eb37e767c 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e0befe78db5b1c45eb9c7f12a74e5ec6
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.4 b/metadata/md5-cache/dev-ruby/activejob-7.0.4
index 466a287d3f7b..c31eb22aa4dc 100644
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.4
+++ b/metadata/md5-cache/dev-ruby/activejob-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fe07a7228e4b47afcb6ef867dc096555
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.4.2 b/metadata/md5-cache/dev-ruby/activejob-7.0.4.2
index 59305f96dda5..8b7b3bf9f84a 100644
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/activejob-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fe07a7228e4b47afcb6ef867dc096555
diff --git a/metadata/md5-cache/dev-ruby/activeldap-6.1.0 b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
index f8155c4b7665..6a151704c1e7 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-6.1.0
+++ b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/activeldap-6.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=45e8353714416f925589b90736e3e5d2
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.2.8.1 b/metadata/md5-cache/dev-ruby/activemodel-5.2.8.1
index b9a9c0fa0cb7..b41676e8eed1 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=94ff76ed8ff5f91cd4ffe6a35a0f1d13
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.5.1 b/metadata/md5-cache/dev-ruby/activemodel-6.0.5.1
index 7939ac9ab62e..8266d7297b2d 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c5fe70423b61e569bad6d1258aed40d6
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1 b/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1
index 65d770a06155..5bde58b9b408 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c61724c38b280141e190e4b294b9ae69
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.6.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.6.1
index dfa2a108f116..ff40cc5a2620 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a4d0b8c630c7c278f2c9fd974c264feb
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.7 b/metadata/md5-cache/dev-ruby/activemodel-6.1.7
index ae3c90d9cf82..cb4e0ec4dc0f 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.7
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7de9a8fd4eb0396dda2a18ac33832763
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.7.2 b/metadata/md5-cache/dev-ruby/activemodel-6.1.7.2
index 3e30a488eb11..74e3795f5e19 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2cf1d97cf448918050746c437baf862e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.4 b/metadata/md5-cache/dev-ruby/activemodel-7.0.4
index 4bf6d3e2c860..38059e322a41 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.4
+++ b/metadata/md5-cache/dev-ruby/activemodel-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=df1f505996c0109c040db591fc344a6c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.4.2 b/metadata/md5-cache/dev-ruby/activemodel-7.0.4.2
index be4b5e660917..6e0ba708870e 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=df1f505996c0109c040db591fc344a6c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
index adc7d7664e9a..603afc16fef8 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.2.tar.gz -> activemodel-serializers-xml-1.0.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5646034c2c3878dd09633022722c9a99
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.2.8.1 b/metadata/md5-cache/dev-ruby/activerecord-5.2.8.1
index d49c0b6ba52b..11bbe2b696c8 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=66039c24cb3c23f8daa187a76009c02b
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.5.1 b/metadata/md5-cache/dev-ruby/activerecord-6.0.5.1
index 7818f3113f93..d0b79acfa81b 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fd0db73a59b9ef3d70d9014516991533
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1 b/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1
index 5a3c916a1557..e96b8bff2f3d 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b3b4586eab45039fb3dd9a060a5e4b6f
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.6.1 b/metadata/md5-cache/dev-ruby/activerecord-6.1.6.1
index 6e7ad294d962..7df43868a289 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=030024544b440453690577b229203aa0
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.7 b/metadata/md5-cache/dev-ruby/activerecord-6.1.7
index 34e872580afc..9638c496398b 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.7
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c25099b0630d3d00a4d912b7094b7445
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.7.2 b/metadata/md5-cache/dev-ruby/activerecord-6.1.7.2
index 20a9cdd1605d..b914f6d7f283 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e974c74b827af4c618410d3e386cd227
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.4 b/metadata/md5-cache/dev-ruby/activerecord-7.0.4
index ab4933c0297b..4c0e8f08aed2 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0f549806ec659e735516e8b5e172a467
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.4.2 b/metadata/md5-cache/dev-ruby/activerecord-7.0.4.2
index 41cb5c2b81d6..5edd18c48dd8 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/activerecord-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8cc1e59815c5855ded4553c6a6411cab
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.8.1 b/metadata/md5-cache/dev-ruby/activestorage-5.2.8.1
index 080207f32fca..3bb9b657bf80 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=34b392401a819fa7bac52c58792e9a14
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.5.1 b/metadata/md5-cache/dev-ruby/activestorage-6.0.5.1
index ce4fd86e0ff6..2b14c05e5231 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2aafb07faa41d75012819c8455862f6f
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1 b/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1
index 206c44c39c55..d9c81e89e566 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=10c620d31b899ff60f6249b6d69824e2
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.6.1 b/metadata/md5-cache/dev-ruby/activestorage-6.1.6.1
index b51462774274..b622e17c80ce 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ea36ad43777457cd414aa323bf7b6bf
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.7 b/metadata/md5-cache/dev-ruby/activestorage-6.1.7
index 0b783effef7f..cf7884f413cf 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.7
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5f8dc5459f6cae0a01426b9634e341c4
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.7.2 b/metadata/md5-cache/dev-ruby/activestorage-6.1.7.2
index a9948244ade0..f6333c477caa 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=460e972124802ee4d1456dc97974b601
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.4 b/metadata/md5-cache/dev-ruby/activestorage-7.0.4
index bb0c48f1492f..d0b3ed920f4d 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.4
+++ b/metadata/md5-cache/dev-ruby/activestorage-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=de578a1e7019389cd8c2557079c0823e
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.4.2 b/metadata/md5-cache/dev-ruby/activestorage-7.0.4.2
index 39386694aa04..146f87678c2d 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/activestorage-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=57e1f09066a36f323ad9a543fd3e222b
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.8.1 b/metadata/md5-cache/dev-ruby/activesupport-5.2.8.1
index 81357975824d..7425624aa89a 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fddfa805ada98e2e306842342ae62f9f
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.5.1 b/metadata/md5-cache/dev-ruby/activesupport-6.0.5.1
index b93911a9e36c..4a94e18a8f86 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9eca5e54371f7aa50392e13c9f1806e9
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1 b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1
index 86472dbc778b..9620de335be0 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=28fa4c364da4ba21f6188c2b317532b5
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.6.1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.6.1
index 5ea7ad675396..053c10bbad91 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=00410a951c8e6d4ee719fd5012f1cfee
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.7 b/metadata/md5-cache/dev-ruby/activesupport-6.1.7
index e26c3c8222b6..f417c32784df 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.7
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=42261b58379ae2aa041c761e848fe5c0
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2 b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2
index 7e66f39f398f..b6e2783ac43b 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=55f5211fe3ec8ec175b0491747503948
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.4 b/metadata/md5-cache/dev-ruby/activesupport-7.0.4
index 01897505dde3..75d0e839c8b9 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6145f59a04103333e654556236ba4799
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.4.2 b/metadata/md5-cache/dev-ruby/activesupport-7.0.4.2
index 95c0151d6c4b..622f2eb26382 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/activesupport-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=27d51ef3689fa2e5a532db67175e6c70
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
index c6e8bf515391..f8376a47b44a 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2463b8b1672791ca9350fd0dfb6c539d
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.1.0 b/metadata/md5-cache/dev-ruby/acts_as_list-1.1.0
index 4a535e70fd21..fc45cd8a7266 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.1.0
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c31b1e46d387faa30960987f1dd9f2ad
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.0 b/metadata/md5-cache/dev-ruby/addressable-2.8.0
index 78fd314f9a8f..ca49131b9b25 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.8.0
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/addressable-2.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d3d8efafb91b07093d2455d2ab586227
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.1 b/metadata/md5-cache/dev-ruby/addressable-2.8.1
index 77fc92e8c6ea..451cfa84bd4b 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.8.1
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/addressable-2.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7079780f006b0392a319f9f231364c4
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2-r1 b/metadata/md5-cache/dev-ruby/ae-1.8.2-r1
index 8f3194354d9f..5f43c7896c25 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ae-1.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=969f883c6b3fe1ef514b0e12e8ffbb2c
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1 b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
index 4fa4e74ec81a..19a886497078 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/afm-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=741f73b1c77e8c0d1c5a98613a8f7018
diff --git a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
index 9d7d39f83c70..0fb3ddb2e3f3 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.0.tar.gz -> airbrussh-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c72856f8dbc6d7ab21892bc39d66dc74
diff --git a/metadata/md5-cache/dev-ruby/airbrussh-1.4.1 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.1
index 2b7be237004c..076f19c24edc 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.4.1
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.1.tar.gz -> airbrussh-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4459d53b1de2801eb862df49edaa8ed4
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r4 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
index 6d5870a24856..f55791aece44 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/allison-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4d29cb92a1422671ce5a1f327b31fcda
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1 b/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
index d6460f0319e4..1ed49f67a51c 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/amatch-0.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amatch-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a9b97ac8e2b8b3a909e746f7f0847307
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.4.1 b/metadata/md5-cache/dev-ruby/amatch-0.4.1
index 9ff817e1e3fd..3906ef8c1cde 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.4.1
+++ b/metadata/md5-cache/dev-ruby/amatch-0.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amatch-0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a9b97ac8e2b8b3a909e746f7f0847307
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.5 b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
index 038666568fd4..bf3401b78ccf 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.5
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ammeter-1.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=79b787caf42b081b44893b8d640f4003
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
index 82f53d6bd3c0..594ac8fddb74 100644
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amq-client-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4348c652deecd37eb10492e431cf477f
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2 b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
index ab0f10dcbe0a..92faed2c7172 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/amq-protocol-2.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=93db0c8794fba22986e0429856d721cb
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1 b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
index 7e29acb93d3c..96d2f39081d0 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.4
 SRC_URI=https://rubygems.org/gems/amqp-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0cb42deb80002f70f8f7a1df68f4176d
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
index 071c7bf90b96..0f11d1cfb722 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/annoy-0.5.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8601b798f00c8b47c15187a7f040ad4c
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1 b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
index cb220fcc69b1..0fd1600184d8 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ansi-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=44039b01ba3592b91c05482431154a89
diff --git a/metadata/md5-cache/dev-ruby/appraisal-2.4.1 b/metadata/md5-cache/dev-ruby/appraisal-2.4.1
index 2e1d679b9817..21c1346c60d4 100644
--- a/metadata/md5-cache/dev-ruby/appraisal-2.4.1
+++ b/metadata/md5-cache/dev-ruby/appraisal-2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/appraisal-2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6c33e45f07d16470aa0f9c864405fab9
diff --git a/metadata/md5-cache/dev-ruby/arel-9.0.0-r1 b/metadata/md5-cache/dev-ruby/arel-9.0.0-r1
index 4b4f4d6e18c2..16a07d69baab 100644
--- a/metadata/md5-cache/dev-ruby/arel-9.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/arel-9.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9.0
 SRC_URI=https://github.com/rails/arel/archive/v9.0.0.tar.gz -> arel-9.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc2e4146380f279f118c9bebf24e4df6
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
index 1d3189582183..ea67d1bb6c50 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/arel-helpers-2.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6c6503f749a420d717eda6ba11010dad
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.1.0 b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
index a1e8d8ca2f6b..376aab3c266c 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/Ascii85-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=15f49a2e4704a27f26318cb8df26928c
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
index d0cbf288c3d7..31b77d361aad 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.15.tar.gz -> asciidoctor-2.0.15.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6a0c9ab36202bd8912218ad7e5b44867
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
index e7564ab263cd..c378b61c5b35 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.16.tar.gz -> asciidoctor-2.0.16.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f90fcc5ad7f2dea6b0d7fcea84b2082c
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18
index b00bb1791197..fcedde9a7972 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.18.tar.gz -> asciidoctor-2.0.18.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=83d2f8214eaa5c850331f60d729f869f
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
index b9b210f0e2e6..b7c0611ba727 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v2.0.5.tar.gz -> asciidoctor-diagram-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=28077fbbf947d77b0767962249e24c9c
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index d9b740be4b31..df2089f891c1 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.9
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a884306ffb840e961666ae36b97a6b9b
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.3 b/metadata/md5-cache/dev-ruby/asciimath-2.0.3
index c3d8469e2cec..f118a06adee4 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.3
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=00e96d60bcd53aec0ae865dbeee6119c
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.4 b/metadata/md5-cache/dev-ruby/asciimath-2.0.4
index b10e6bca9a92..ee79e954394b 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.4
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc02003af0a254b6d41a49e179edf918
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.2 b/metadata/md5-cache/dev-ruby/ast-2.4.2
index 6c8c21f6ef34..0b794b97f7c6 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.2
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/ast/archive/v2.4.2.tar.gz -> ast-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=056df2682a16999cdab6904693119ca2
diff --git a/metadata/md5-cache/dev-ruby/async-1.30.3 b/metadata/md5-cache/dev-ruby/async-1.30.3
index c35d0bcf00f8..1671973a6f5a 100644
--- a/metadata/md5-cache/dev-ruby/async-1.30.3
+++ b/metadata/md5-cache/dev-ruby/async-1.30.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/async/archive/v1.30.3.tar.gz -> async-1.30.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5095251c8c337f89718e96ce9c1ed380
diff --git a/metadata/md5-cache/dev-ruby/async-2.2.1 b/metadata/md5-cache/dev-ruby/async-2.2.1
index d6fbdef62eed..3b14a24525df 100644
--- a/metadata/md5-cache/dev-ruby/async-2.2.1
+++ b/metadata/md5-cache/dev-ruby/async-2.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/async/archive/v2.2.1.tar.gz -> async-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f4339ad7ce65cca9e8ceacd90e99bca4
diff --git a/metadata/md5-cache/dev-ruby/async-container-0.16.12 b/metadata/md5-cache/dev-ruby/async-container-0.16.12
index 0437809d8788..0ba0ec4aef41 100644
--- a/metadata/md5-cache/dev-ruby/async-container-0.16.12
+++ b/metadata/md5-cache/dev-ruby/async-container-0.16.12
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/async-container/archive/v0.16.12.tar.gz -> async-container-0.16.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3c57fd6e2ddfabf063e8c0985b039c8e
diff --git a/metadata/md5-cache/dev-ruby/async-io-1.34.0 b/metadata/md5-cache/dev-ruby/async-io-1.34.0
index 1ccfb5fe39cb..d00d6db180de 100644
--- a/metadata/md5-cache/dev-ruby/async-io-1.34.0
+++ b/metadata/md5-cache/dev-ruby/async-io-1.34.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1/1.34
 SRC_URI=https://github.com/socketry/async-io/archive/v1.34.0.tar.gz -> async-io-1.34.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=39cf64a6bb51835c7af38e13bf17a6b7
diff --git a/metadata/md5-cache/dev-ruby/async-io-1.34.1 b/metadata/md5-cache/dev-ruby/async-io-1.34.1
index 601511b12da0..210e228892b9 100644
--- a/metadata/md5-cache/dev-ruby/async-io-1.34.1
+++ b/metadata/md5-cache/dev-ruby/async-io-1.34.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/async-io/archive/v1.34.1.tar.gz -> async-io-1.34.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fbcbb94afd189ca168221d92e2c23c48
diff --git a/metadata/md5-cache/dev-ruby/async-io-1.34.3 b/metadata/md5-cache/dev-ruby/async-io-1.34.3
index 7a0a0aee9369..82899ed0cbff 100644
--- a/metadata/md5-cache/dev-ruby/async-io-1.34.3
+++ b/metadata/md5-cache/dev-ruby/async-io-1.34.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/async-io/archive/v1.34.3.tar.gz -> async-io-1.34.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=95512204d6e11bd566cdd6cd8596b79b
diff --git a/metadata/md5-cache/dev-ruby/async-rspec-1.16.1 b/metadata/md5-cache/dev-ruby/async-rspec-1.16.1
index 542abf76a20c..4552570afc2b 100644
--- a/metadata/md5-cache/dev-ruby/async-rspec-1.16.1
+++ b/metadata/md5-cache/dev-ruby/async-rspec-1.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/async-rspec/archive/v1.16.1.tar.gz -> async-rspec-1.16.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a9e83dec78d5201f3ad28332083361dd
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1 b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
index c8657855e98a..1c4f049546f3 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/atomic-1.1.101.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dbcbf813b40f264c87673a8f273f3ddc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
index 3782b7c37d79..528a68a5c1d5 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.4.7.0.tar.gz -> autoprefixer-rails-10.4.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=63a0e5fdeafac14870a9189ed4e31b3d
diff --git a/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
index 9064eed50e3f..7210bc1722be 100644
--- a/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-eventstream-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6f6294ca2959d0576a48134971d30bc5
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
index 5d515e360a69..4cf90b1434ac 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.370.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7660c05d6059d1df9adeeda2a0ee489c
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
index 391af0481e48..34f29616679c 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6418bbff212124431dcf3f780f439b90
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
index e620f0887487..2287b9e84575 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96446b0dcd68c3b497c1ee67cea6dd6b
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
index 6147d5195a03..5dd484a42ae0 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96446b0dcd68c3b497c1ee67cea6dd6b
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.1 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.1
index dfa6edfcb9a1..0472d0fe207c 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.1
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a6cdde8638434450669b5e0ee2561aae
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.2 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.2
index c00f7414aeb2..a82f90311105 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.2
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9d6c7f09d862cf4414aad5d5ce8eaa00
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
index 5da917ee86c5..b5d23fc74a6b 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/axiom-types-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=476e23746ee0b2c366b6496bc9d4c89f
diff --git a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1 b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
index 26d386751856..14f6c2d2d00c 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
+++ b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.20.2.tar.gz -> backports-3.20.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=981c27aaf2462af8e78d842a672ee410
diff --git a/metadata/md5-cache/dev-ruby/backports-3.21.0 b/metadata/md5-cache/dev-ruby/backports-3.21.0
index 678eb131e410..79ea3857e344 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.21.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.21.0.tar.gz -> backports-3.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a6c34d6e9c8d7f30f51e4a322ae28bb8
diff --git a/metadata/md5-cache/dev-ruby/backports-3.23.0 b/metadata/md5-cache/dev-ruby/backports-3.23.0
index ad208408a34f..4de02119c94a 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.23.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.23.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.23.0.tar.gz -> backports-3.23.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=78d5a74e29e7c3de1f1b2fdb04d0b6c2
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
index 7a5549cbc696..496085f6b372 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=161f67045477fc0156db2397d4332210
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
index 50afa2e2287b..f033035417cc 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a106c850c825dfbd11c54956f867eef6
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.8 b/metadata/md5-cache/dev-ruby/barby-0.6.8
index e8085c676a09..3d3211126273 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.8
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.8.tar.gz -> barby-0.6.8.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0ca5aa1890a31535de486d464744cb6e
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.4-r1 b/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
index 67179847ed15..05a039e3dd75 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/base32-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=338f7a9d7e7ac46a8e453f777d5bb879
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
index edbc751fff05..ca95794f5dd1 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6a0fc14ac8cfd6d480aaf05fd3cdc342
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
index a92a0cc0ee1c..973f9f7fdf37 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.18.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=601360ad39e17b43da2b365c6ec7ad24
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
index da7f74e36ff5..e520f3199453 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/bcrypt_pbkdf-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=456a69ff2571ecc615679754833ed776
diff --git a/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0 b/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
index 20e4b8e0877b..b0db43bb01fd 100644
--- a/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
+++ b/metadata/md5-cache/dev-ruby/benchmark-ips-2.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/evanphx/benchmark-ips/archive/v2.10.0.tar.gz -> benchmark-ips-2.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=438e360d00db6303e1c8f9f55bec48ca
diff --git a/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2 b/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
index a3a8bf7aa049..98558ee4f7f3 100644
--- a/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
+++ b/metadata/md5-cache/dev-ruby/benchmark-ips-2.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/benchmark-ips-2.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ca1a5a6afd6dd5d56fa60f823f1679bf
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.10 b/metadata/md5-cache/dev-ruby/bindata-2.4.10
index 802f7f74738f..8a625b066611 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.10
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bindata-2.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=21f7c40d87a0bed9d38c5d7a4237c1a4
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.14 b/metadata/md5-cache/dev-ruby/bindata-2.4.14
index b1c631ca7867..d4b68a115a7b 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.14
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bindata-2.4.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4605c16de7ee48f35f0e758aea71938f
diff --git a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1 b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
index 398f6841a2a6..ef267ca3464d 100644
--- a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bindex-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=433c12a37971feabf5802e1f298131d8
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1 b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
index f02051ac8a42..b862e376dc17 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/binding_of_caller/archive/v1.0.0.tar.gz -> binding_of_caller-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c5ec3430591edd54be894543d426b8c6
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.17 b/metadata/md5-cache/dev-ruby/bit-struct-0.17
index f6b272aa5ce8..4ab1962110a9 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.17
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bit-struct-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a17ca17abc713fbdf65e37418783f3b8
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
index 901d8c2b3522..8639e4d90b9e 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c00bd4512a02c2971c4371309e7fe373
diff --git a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1 b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
index ff1b7df96f64..7aefaa2b0f28 100644
--- a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
+++ b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arvydas/blinkstick-ruby/archive/89e3f621132c2571d5f7c636b3962ff1b0a64564.tar.gz -> blinkstick-1.0.1_p20150901.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4ebb1af493cf22c080f205401b80c672
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1 b/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
index 8fdb529a1ad2..62f703ac9793 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bogus-0.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1ad8d3ace75eb098fba3655c150f274e
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1-r1 b/metadata/md5-cache/dev-ruby/brass-1.2.1-r1
index baef6e6d3369..8f297ee243e2 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/brass-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7d35672104850d874b71ca16b7251967
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2 b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
index 08e77e8763b6..7e48b2e80870 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.4.0.tar.gz -> brotli-0.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e5e873f3f9b08007db70cadca7db1496
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
index af1eeeb47e53..8445a73479dd 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bsearch-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2083dcfa1b87e0db541af99a8afab8ec
diff --git a/metadata/md5-cache/dev-ruby/bson-4.12.0 b/metadata/md5-cache/dev-ruby/bson-4.12.0
index 2ca9f14329e8..fa78c75dc8f0 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.12.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.12.0.tar.gz -> bson-4.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=abdd61a9a2a1333860f2db5fedea37a5
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
index 08a0c6758932..8d704b08bbb7 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/buftok-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ccacf53af664c6e678bbe4ce30e53bc
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.3.0 b/metadata/md5-cache/dev-ruby/buftok-0.3.0
index ad0fb8c76020..2d0872c1a0b2 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.3.0
+++ b/metadata/md5-cache/dev-ruby/buftok-0.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/buftok/archive/v0.3.0.tar.gz -> buftok-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8f5a7645281af6cfde166682f081d5ac
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4-r1 b/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
index b4300061abe8..0afc2033d33d 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=15ca2f02ecb4fe8e00d732c962af3330
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.1.4 b/metadata/md5-cache/dev-ruby/bundler-2.1.4
index 1af7029d3044..3f6b4fe37542 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.1.4
+++ b/metadata/md5-cache/dev-ruby/bundler-2.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ed0691f5beb053e0ceec368550b02e99
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.18 b/metadata/md5-cache/dev-ruby/bundler-2.2.18
index 2219a40a5780..0d760be022b9 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.18
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.18.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b744f9146e12cf32f88ad918ee35af9b
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.24 b/metadata/md5-cache/dev-ruby/bundler-2.2.24
index 664b6ec2bbc5..8cf40e193f39 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.24
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.24
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.24.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.25 b/metadata/md5-cache/dev-ruby/bundler-2.2.25
index 9f94b1b98e9b..7140ea094225 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.25
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.25
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.25.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.29 b/metadata/md5-cache/dev-ruby/bundler-2.2.29
index a7c93d853a88..0dd935177fb2 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.29
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.29
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.29.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.31 b/metadata/md5-cache/dev-ruby/bundler-2.2.31
index 7d180d486e69..db80ac63b76f 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.31
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.31
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.31.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.33 b/metadata/md5-cache/dev-ruby/bundler-2.2.33
index 25342da9ef9f..095fc31f44e0 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.33
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.33
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.33.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=11e43a50e3c16f5f43da4c3a5529babd
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.33-r1 b/metadata/md5-cache/dev-ruby/bundler-2.2.33-r1
index e3907d617b3f..190d96f8088d 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.33-r1
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.33-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.33.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9337ee14e0282b6c1942717973d59501
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.3.26 b/metadata/md5-cache/dev-ruby/bundler-2.3.26
index b84e791c3f1a..a610ec83ba9a 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.3.26
+++ b/metadata/md5-cache/dev-ruby/bundler-2.3.26
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.3.26.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c9633e9f452f3eba1e95b3370cb043ef
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.3.8 b/metadata/md5-cache/dev-ruby/bundler-2.3.8
index 0e34e2a988f8..dcf3cc28c964 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.3.8
+++ b/metadata/md5-cache/dev-ruby/bundler-2.3.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.3.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2739d51e4bcd81c58f9e32538f2839fd
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.3.8-r1 b/metadata/md5-cache/dev-ruby/bundler-2.3.8-r1
index a057db65f1e0..4dd35a52aff1 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.3.8-r1
+++ b/metadata/md5-cache/dev-ruby/bundler-2.3.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.3.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=edf947c71f57d65bca39f8c888cc50ea
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.4.1 b/metadata/md5-cache/dev-ruby/bundler-2.4.1
index 047d13f5c9b5..18cbdc973c96 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.4.1
+++ b/metadata/md5-cache/dev-ruby/bundler-2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c9633e9f452f3eba1e95b3370cb043ef
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.4.3 b/metadata/md5-cache/dev-ruby/bundler-2.4.3
index 33a2c911b9b3..67f495ef8b8e 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.4.3
+++ b/metadata/md5-cache/dev-ruby/bundler-2.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6a534ad2e5fe7d601eee863871c6eb98
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
index f2fec0591c4f..4abd9eb83560 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.9.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bbe7252eddae4622000fb12155130a80
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
index fe009f6db827..3b6457c03467 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ba3b09f0ec787c8fa6d47f0a1e63ae91
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.19.0 b/metadata/md5-cache/dev-ruby/bunny-2.19.0
index a4d954f768c6..a5451664a8c0 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.19.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.19.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-amqp/bunny/archive/2.19.0.tar.gz -> bunny-2.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b15c420e09fc180f75ce3c56b3445b56
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.20.1 b/metadata/md5-cache/dev-ruby/bunny-2.20.1
index 8a6279b48fd1..fb623b07b1d7 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.20.1
+++ b/metadata/md5-cache/dev-ruby/bunny-2.20.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-amqp/bunny/archive/2.20.1.tar.gz -> bunny-2.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=49a4c866161c3e2a23695e012ef4d8a9
diff --git a/metadata/md5-cache/dev-ruby/c21e-2.0.0 b/metadata/md5-cache/dev-ruby/c21e-2.0.0
index f78054341a11..19d470a4b2bf 100644
--- a/metadata/md5-cache/dev-ruby/c21e-2.0.0
+++ b/metadata/md5-cache/dev-ruby/c21e-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/c21e-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2f266f4d5c04c0726715fee0264883d5
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
index 59d39dd6b633..1850d808965c 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/capistrano-2.15.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59df0412cb58e2f89f668ac7e4ad659e
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.16.0 b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
index 6eb616198945..2f464e1aaf86 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.16.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7514fdb6dc49300e69eb520d68e09a97
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.17.0 b/metadata/md5-cache/dev-ruby/capistrano-3.17.0
index 6672e9870c9f..c132a0a6bc22 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.17.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.17.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5936d553d5281f9af5a07d202dbb1fdd
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.17.1 b/metadata/md5-cache/dev-ruby/capistrano-3.17.1
index 87f852405d4d..89ffd05dbd44 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.17.1
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.17.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.17.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d3ed3f255eb27930e82f28adf7c412d6
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.17.2 b/metadata/md5-cache/dev-ruby/capistrano-3.17.2
index 3a2fdd47f552..2d98a28376ca 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.17.2
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.17.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.17.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=132d0e5bce1f15355f3ad54232dfd4c6
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.36.0 b/metadata/md5-cache/dev-ruby/capybara-3.36.0
index beb8a38ce720..f8328b2fcce5 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.36.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.36.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.36.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
 _md5_=9de852c3e390cf44c2991ea85f0aeb88
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.38.0 b/metadata/md5-cache/dev-ruby/capybara-3.38.0
index 26266ab75940..e93c2b34a000 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.38.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.38.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.38.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
 _md5_=51b1871f74056223486e2dbc411a0808
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0 b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
index 50089bce55fe..4601b554f7eb 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cchandler/certificate_authority/archive/v1.0.0.tar.gz -> certificate_authority-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=be0ea14226b463da3de9fd4b1a1f2114
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0 b/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
index d22ea9e6ab0f..8d0cd0d021e6 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cchandler/certificate_authority/archive/v1.1.0.tar.gz -> certificate_authority-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a3d2585ca0a69fe2e224974fecbc24c8
diff --git a/metadata/md5-cache/dev-ruby/certified-1.0.0 b/metadata/md5-cache/dev-ruby/certified-1.0.0
index 5cf167fb7686..b1bf636fd299 100644
--- a/metadata/md5-cache/dev-ruby/certified-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certified-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/certified-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6c213d63aa1baf6e717523e6769135a1
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
index 805834598ab5..89785fe9973a 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brianmario/charlock_holmes/archive/v0.7.7.tar.gz -> charlock_holmes-0.7.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2199c18318954dcc7ca521a25a82056e
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
index d3ccef0c3548..6d45a166ec27 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5ce0b5a46052538655761bb642d1bda9
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.1.0 b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
index 5d9335747c69..4819c874efeb 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.1.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=46b727d0ac857fc0c310fe9735e37421
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1 b/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
index 96da5efe5e28..5e3f30742232 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chronic-0.10.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c3e989dca5b8981f06de95d74c4d413d
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0 b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
index 6de928f36535..116e1f70e4c5 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fb8e407a1027438a200f5fa79bbfef1d
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.3.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.3.0
index 0bc4a669cad2..ce6a1ebde057 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.3.0
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.3.0.tar.gz -> classifier-reborn-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=be61ad7be2e726deecb0e634e21461fb
diff --git a/metadata/md5-cache/dev-ruby/climate_control-1.0.1 b/metadata/md5-cache/dev-ruby/climate_control-1.0.1
index b580fba1b0b0..ef34198711f3 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-1.0.1
+++ b/metadata/md5-cache/dev-ruby/climate_control-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/climate_control-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eeea2ddb73cc9e7262dc8f3344ad7776
diff --git a/metadata/md5-cache/dev-ruby/climate_control-1.2.0 b/metadata/md5-cache/dev-ruby/climate_control-1.2.0
index 706d3e8fbcc1..75ecce703174 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-1.2.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/climate_control-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2b37261ce5b97771cb41d95434f854e2
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 5fbe673e5698..49b52068c337 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 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	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e748102e7c31f4fe9faed768bfa8dad6
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
index ddf2780d4523..828b20c85562 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cmdparse-3.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c447a1f32e61b83f302700a8f0a4bc45
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
index af8207457350..8a24c4847692 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.3.tar.gz -> coderay-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5283fa14956e216f014f1e13995def11
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.1 b/metadata/md5-cache/dev-ruby/coercible-1.0.1
index ea15d2a24de5..f0c196eb775e 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.1
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/solnic/coercible/archive/c076869838531abb5783280da108aa3cbddbd61a.tar.gz -> coercible-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eab2cae415ae8076b6d1aafb5431e940
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1 b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
index 62a7e840b294..bc456142f453 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/coffee-rails/archive/v5.0.0.tar.gz -> coffee-rails-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a2262fc95178fd5dcfb74c6e0eebed93
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index 0d2345530163..a5043230a849 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8cfaa006a1c99a6ed16c66b10eedaed6
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
index 9c0de83b3b21..879048bb75be 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-source-1.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=90246645fba1f4db4bb2817085405f6d
diff --git a/metadata/md5-cache/dev-ruby/color-1.8-r1 b/metadata/md5-cache/dev-ruby/color-1.8-r1
index 1e6294a96a35..dbff7312649c 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8-r1
+++ b/metadata/md5-cache/dev-ruby/color-1.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4b9f603efb5b215b2df6a6b267113f32
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1 b/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
index 5a9c9500dbd1..5097896e5178 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octopress/colorator/archive/v1.1.0.tar.gz -> colorator-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2e604ad6014bb6d9dd52799bd47a4dec
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2-r1 b/metadata/md5-cache/dev-ruby/colored-1.2-r1
index f219321a258c..98b51cffe69c 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2-r1
+++ b/metadata/md5-cache/dev-ruby/colored-1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored-1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=234a738831134ea53ec338cafd783b76
diff --git a/metadata/md5-cache/dev-ruby/colored2-3.1.2 b/metadata/md5-cache/dev-ruby/colored2-3.1.2
index 91ee728e13f7..7a45bdc928c3 100644
--- a/metadata/md5-cache/dev-ruby/colored2-3.1.2
+++ b/metadata/md5-cache/dev-ruby/colored2-3.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored2-3.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4175a3eb75b79143c54cbb0e0a207989
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1 b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
index 70102df46b4d..3cd974379235 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colorize-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e2e4f8dc68b6731ce93ed24c0832b82d
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1 b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
index 3184978d0b20..815ec7cbfe97 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/columnize-0.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=25c2f0057aec64bda7bba842d479e29f
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.6 b/metadata/md5-cache/dev-ruby/combustion-1.3.6
index c0263340db48..587ea1988d8a 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.6
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=78ce9605e02e172c6b1c81909f438702
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.7 b/metadata/md5-cache/dev-ruby/combustion-1.3.7
index b6a9b5851cdd..1dd7633609c5 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.7
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=78ce9605e02e172c6b1c81909f438702
diff --git a/metadata/md5-cache/dev-ruby/commander-4.6.0 b/metadata/md5-cache/dev-ruby/commander-4.6.0
index 55838c372f8f..3f4b2b5c1f79 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.6.0
+++ b/metadata/md5-cache/dev-ruby/commander-4.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/commander-4.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1bf8a557374f0c2eb858b33599e2311c
diff --git a/metadata/md5-cache/dev-ruby/commonmarker-0.23.5 b/metadata/md5-cache/dev-ruby/commonmarker-0.23.5
index f999f5136bce..6cca6ba6b3a6 100644
--- a/metadata/md5-cache/dev-ruby/commonmarker-0.23.5
+++ b/metadata/md5-cache/dev-ruby/commonmarker-0.23.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gjtorikian/commonmarker/archive/v0.23.5.tar.gz -> commonmarker-0.23.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5cbc1c6cb74b1743c1e5c9d94000eeff
diff --git a/metadata/md5-cache/dev-ruby/commonmarker-0.23.6 b/metadata/md5-cache/dev-ruby/commonmarker-0.23.6
index 1a67c8458990..432177d5b9d0 100644
--- a/metadata/md5-cache/dev-ruby/commonmarker-0.23.6
+++ b/metadata/md5-cache/dev-ruby/commonmarker-0.23.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gjtorikian/commonmarker/archive/v0.23.6.tar.gz -> commonmarker-0.23.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5cbc1c6cb74b1743c1e5c9d94000eeff
diff --git a/metadata/md5-cache/dev-ruby/commonmarker-0.23.7 b/metadata/md5-cache/dev-ruby/commonmarker-0.23.7
index 4a1dbf72fcfa..37e4b374af62 100644
--- a/metadata/md5-cache/dev-ruby/commonmarker-0.23.7
+++ b/metadata/md5-cache/dev-ruby/commonmarker-0.23.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gjtorikian/commonmarker/archive/v0.23.7.tar.gz -> commonmarker-0.23.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=524ec92297e9d531a385a9038c2889c1
diff --git a/metadata/md5-cache/dev-ruby/commonmarker-0.23.8 b/metadata/md5-cache/dev-ruby/commonmarker-0.23.8
index 77e595249eb8..990185d113b2 100644
--- a/metadata/md5-cache/dev-ruby/commonmarker-0.23.8
+++ b/metadata/md5-cache/dev-ruby/commonmarker-0.23.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gjtorikian/commonmarker/archive/v0.23.8.tar.gz -> commonmarker-0.23.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=524ec92297e9d531a385a9038c2889c1
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
index 3777f1b21209..84b78e1937c2 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.10.tar.gz -> concurrent-ruby-1.1.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1685e84ac91d7947cf7b992b398fe408
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
index d388cccd2e43..7a9dd774673a 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.9.tar.gz -> concurrent-ruby-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d15a525f2f98a3066fbdd509d4e0c884
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0
index 7965e25bb31a..c6fbfcad1b9f 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.2.0.tar.gz -> concurrent-ruby-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=24d492c35b10daf6f9572c679b93497b
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
index a4a43900317e..8656dc5bea92 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cc890b893baa337d3587e831ff8937c8
diff --git a/metadata/md5-cache/dev-ruby/console-1.16.2 b/metadata/md5-cache/dev-ruby/console-1.16.2
index 6d5fa966fc58..cb8c380f6cbd 100644
--- a/metadata/md5-cache/dev-ruby/console-1.16.2
+++ b/metadata/md5-cache/dev-ruby/console-1.16.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/console/archive/v1.16.2.tar.gz -> console-1.16.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=aac5ca39175c7b2c4af676e462c1b439
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.1 b/metadata/md5-cache/dev-ruby/contracts-0.16.1
index a019368ac89f..5b0a7ddaad42 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.1
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/contracts-0.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=402d905d05eb92b6379c2a7580ff7297
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.17 b/metadata/md5-cache/dev-ruby/contracts-0.17
index 27bdfcde1a7f..14dcbb898206 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.17
+++ b/metadata/md5-cache/dev-ruby/contracts-0.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.17
 SRC_URI=https://rubygems.org/gems/contracts-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=53352203f274dba26524bc3fc9dbf5e9
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1 b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
index 375d1b1806c0..7404dffda74a 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a8c00efa9c5b2d6f22e2c71b3e5eeace
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
index 46c65657817f..774707a27752 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/countdownlatch-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c8ce543f58f943c4988f90a26fd04e29
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4 b/metadata/md5-cache/dev-ruby/crack-0.4.4
index 26208bc9f56a..feb048a1a2f1 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=181ae215e9ec70555f1ee74051a77bf4
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.4-r1
index 1196680c5bbe..39522e35f064 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c9c0e64e453eff5df3c1dbc39a592da6
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4-r2 b/metadata/md5-cache/dev-ruby/crack-0.4.4-r2
index 44fd2a6063d4..015ff8a321ae 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4-r2
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7158b75e3bb48fab9e9a169def6486b0
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4-r3 b/metadata/md5-cache/dev-ruby/crack-0.4.4-r3
index 551dabaecfc4..52a05bc31154 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4-r3
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e0dd004dc2b571d5a9d64e98de85c017
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.6 b/metadata/md5-cache/dev-ruby/crass-1.0.6
index 11556a0f3e5c..839d6a36ca10 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.6
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rgrove/crass/archive/v1.0.6.tar.gz -> crass-1.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e282adb0525d5791b829a83ceb7a9730
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.6-r1 b/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
index 01d931b764bc..85af4a82b588 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rgrove/crass/archive/v1.0.6.tar.gz -> crass-1.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e88a9abcee2d9ab06811baeb691f092d
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1 b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
index 88e9e308aebe..edc4de952690 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a8bedce6efa810c8f71418a762893dd1
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.11-r1 b/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
index a70f4e9b94af..0334484ce11b 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cri-2.15.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a7d39d862fd5d9ca71d4f06095ca4620
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.11.0 b/metadata/md5-cache/dev-ruby/css_parser-1.11.0
index 3fc42592a0bf..0ed50a9a8280 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.11.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.11.0.tar.gz -> css_parser-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a27a693fc987f6290f83b19104261a5e
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.12.0 b/metadata/md5-cache/dev-ruby/css_parser-1.12.0
index 87d94f8679c5..c994db63b76c 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.12.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.12.0.tar.gz -> css_parser-1.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=05f31ae06bf0b2c43627a81a5c9f0cff
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.14.0 b/metadata/md5-cache/dev-ruby/css_parser-1.14.0
index 48501448ab28..125f1589c49b 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.14.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.14.0.tar.gz -> css_parser-1.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=638ab4e8ab5f1e8a35ff0ce2d5969935
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.3 b/metadata/md5-cache/dev-ruby/csv-3.2.3
index f58833fe9f9e..6a61aa5788ac 100644
--- a/metadata/md5-cache/dev-ruby/csv-3.2.3
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/csv/archive/v3.2.3.tar.gz -> csv-3.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0e34c1af33d2bcc500e048c95fecd406
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.4 b/metadata/md5-cache/dev-ruby/csv-3.2.4
index baab0d37f12d..2bbbf06ccf2f 100644
--- a/metadata/md5-cache/dev-ruby/csv-3.2.4
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/csv/archive/v3.2.4.tar.gz -> csv-3.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=98302b90d99c7f5274625d02fe5c0a96
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.5 b/metadata/md5-cache/dev-ruby/csv-3.2.5
index b4f15bc564ef..6ac752b4e32b 100644
--- a/metadata/md5-cache/dev-ruby/csv-3.2.5
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/csv/archive/v3.2.5.tar.gz -> csv-3.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=98302b90d99c7f5274625d02fe5c0a96
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.6 b/metadata/md5-cache/dev-ruby/csv-3.2.6
index 3df02eac04d6..2a553af5f575 100644
--- a/metadata/md5-cache/dev-ruby/csv-3.2.6
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/csv/archive/v3.2.6.tar.gz -> csv-3.2.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=98302b90d99c7f5274625d02fe5c0a96
diff --git a/metadata/md5-cache/dev-ruby/curb-1.0.1 b/metadata/md5-cache/dev-ruby/curb-1.0.1
index dbbfee5f50da..7b4cbff3c93b 100644
--- a/metadata/md5-cache/dev-ruby/curb-1.0.1
+++ b/metadata/md5-cache/dev-ruby/curb-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=03b4ad63bf464551916df91f3bada76e
diff --git a/metadata/md5-cache/dev-ruby/curb-1.0.3 b/metadata/md5-cache/dev-ruby/curb-1.0.3
index 835338e201e9..c148d36655c4 100644
--- a/metadata/md5-cache/dev-ruby/curb-1.0.3
+++ b/metadata/md5-cache/dev-ruby/curb-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7806e7499f93b2a6a45dcd7dfb5633dc
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.2 b/metadata/md5-cache/dev-ruby/curses-1.4.2
index c7a0c4f6b872..75bdee5d5598 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d9c505637f0b380b57557d6f7de89e3c
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.3 b/metadata/md5-cache/dev-ruby/curses-1.4.3
index a65f848d4754..aa39374ea2ae 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.3
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3dd00288330f9f20d37056f18948d919
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.4 b/metadata/md5-cache/dev-ruby/curses-1.4.4
index 7ecba020daab..5cbbebd7f9c1 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.4
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=537df034a926b749f56c9e99e3ef999a
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.4.1 b/metadata/md5-cache/dev-ruby/daemons-1.4.1
index 4c568a62fb8a..0286d05681d1 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.4.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.4.1.tar.gz -> daemons-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b77cadb616b693e07a5029bac8317eb9
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.2.3 b/metadata/md5-cache/dev-ruby/dalli-3.2.3
index 9b590970b002..944d9ae656ba 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.2.3
+++ b/metadata/md5-cache/dev-ruby/dalli-3.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.2.3.tar.gz -> dalli-3.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7bfc7d52c844dc3305ee08e96f4d6359
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.2.4 b/metadata/md5-cache/dev-ruby/dalli-3.2.4
index 40c62254c2db..eb34ed59c074 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.2.4
+++ b/metadata/md5-cache/dev-ruby/dalli-3.2.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.2.4.tar.gz -> dalli-3.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=131295e241f2df3e7d7f117187c442de
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
index 65bfa494fe8d..53fe216559fe 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-1.7.0.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d48ca7bb15aae4dd66f9b59e09e80a37
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
index 31d21ca7a6b6..798d67b03cc3 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f4a466b4223fa737c953bf3ed93155b8
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
index bf4ab24e85b7..6b8a9a16308f 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-active_record-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b8fa766f4ce9304d0b9f7773f82072c6
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.1.0 b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.1.0
index 84453bc52812..190c56b30c08 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.1.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.1
 SRC_URI=https://rubygems.org/gems/database_cleaner-active_record-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=63ca5b9bdc62e7a92cb602a4e2c6776b
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
index 03fd7b5293bc..954d509bcc54 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-core-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=19314e48f0b3667f4c731434508a0a72
diff --git a/metadata/md5-cache/dev-ruby/date-3.2.2 b/metadata/md5-cache/dev-ruby/date-3.2.2
index 0201b8a585cb..ecafef2e2168 100644
--- a/metadata/md5-cache/dev-ruby/date-3.2.2
+++ b/metadata/md5-cache/dev-ruby/date-3.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/date/archive/v3.2.2.tar.gz -> date-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f0d430d7ebe5f5256c7b8d2e604e5139
diff --git a/metadata/md5-cache/dev-ruby/date-3.3.0 b/metadata/md5-cache/dev-ruby/date-3.3.0
index a341d4584431..bff57fe6b3dd 100644
--- a/metadata/md5-cache/dev-ruby/date-3.3.0
+++ b/metadata/md5-cache/dev-ruby/date-3.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/date/archive/v3.3.0.tar.gz -> date-3.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1ba2d799f1f854f1e578dc5881215f81
diff --git a/metadata/md5-cache/dev-ruby/date-3.3.1 b/metadata/md5-cache/dev-ruby/date-3.3.1
index 50a70e309f86..0b362634526a 100644
--- a/metadata/md5-cache/dev-ruby/date-3.3.1
+++ b/metadata/md5-cache/dev-ruby/date-3.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/date/archive/v3.3.1.tar.gz -> date-3.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1ba2d799f1f854f1e578dc5881215f81
diff --git a/metadata/md5-cache/dev-ruby/date-3.3.3 b/metadata/md5-cache/dev-ruby/date-3.3.3
index 8cb1abd76327..4bf2347095ca 100644
--- a/metadata/md5-cache/dev-ruby/date-3.3.3
+++ b/metadata/md5-cache/dev-ruby/date-3.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/date/archive/v3.3.3.tar.gz -> date-3.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1ba2d799f1f854f1e578dc5881215f81
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.12.0 b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
index 3b2651d611d9..a795f65d7d05 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.12.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6f5853d1725c4a54275a92d3414ce1a4
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.3 b/metadata/md5-cache/dev-ruby/dbf-4.1.3
index 34c3fdbf5540..ef7c6e9aa682 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.3
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=080ae00d4914a2acca9d9fcfac739908
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.6 b/metadata/md5-cache/dev-ruby/dbf-4.1.6
index b10d106c1050..048f6bbc57a5 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.6
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=48ddc4c7a70cb7627bf350b6ca20a219
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.2.0 b/metadata/md5-cache/dev-ruby/dbf-4.2.0
index 0bee5576bf45..bd1983d011d3 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.2.0
+++ b/metadata/md5-cache/dev-ruby/dbf-4.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e9ad504eb45c4dfd74fdbf0a17f9de45
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.2.1 b/metadata/md5-cache/dev-ruby/dbf-4.2.1
index 15a95335a2f3..ac7cbd9576d8 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.2.1
+++ b/metadata/md5-cache/dev-ruby/dbf-4.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=db81f81496d051a89913694ad2602736
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.2.2 b/metadata/md5-cache/dev-ruby/dbf-4.2.2
index f43780d1444f..4482ea5e137a 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.2.2
+++ b/metadata/md5-cache/dev-ruby/dbf-4.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=db81f81496d051a89913694ad2602736
diff --git a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1 b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
index 560d56364bcf..04873442d26b 100644
--- a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmemoize-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=80879e9b0e522109b2904240db722659
diff --git a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
index 988d8cd9b0df..29c7589e2b71 100644
--- a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmetrics-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8eaad5d3848a7bcc04efd3f50e055646
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
index 3efe4b39040d..0e6da5b57271 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddplugin-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a31d24ca92a3a4d7fbc0958fbd442b66
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0 b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
index ec394d42f17a..d0bdbf2fc6b6 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/debug_inspector/archive/v1.1.0.tar.gz -> debug_inspector-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b3fde1e79e5adca0cdf1dd8ef896d244
diff --git a/metadata/md5-cache/dev-ruby/deckar01-task_list-2.3.2 b/metadata/md5-cache/dev-ruby/deckar01-task_list-2.3.2
index f634a79d7baa..f1067ae469a0 100644
--- a/metadata/md5-cache/dev-ruby/deckar01-task_list-2.3.2
+++ b/metadata/md5-cache/dev-ruby/deckar01-task_list-2.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/deckar01-task_list-2.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3dc7d953a7d9e51d64aec6c1fb966aa5
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
index bbc0baacedba..bf3ea6bab989 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.1.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0d8271629af08a5304a79ba8c44953e5
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.2 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
index 1d85d02302b0..f5ebaf71073a 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9bc8fe931d2c8279960bc4ea6fdd8abe
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.2.1 b/metadata/md5-cache/dev-ruby/delayer-1.2.1
index 816e845b5aa0..097ea058efe5 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.2.1
+++ b/metadata/md5-cache/dev-ruby/delayer-1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cef54d2a66ee55c0867f492b7eea9ca6
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
index 7d1f6422a94a..7359c0ed15cb 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/delayer-deferred-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ee6ca550afd1a5ff64191ef1f8ce8c9b
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
index 8f267d30610d..b9857b28efdc 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dependor-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b5347dce55e409a1aaef07ae3ba20a69
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
index 8efa7e95fcf2..b5a1ebbd7471 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/deprecated-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1fcda73caa7fd3007b1b1eb5f600fe85
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
index b84ee36281a1..132d5414a927 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/descendants_tracker-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ede7c969368ebbd63fb4bb1874cd9fdc
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
index c10e12eb3919..545e81c8ecc9 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7edf2a7b0bc9892b662ce4d5a7cf5a38
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
index 9d72de0c1d34..dcb2250dd872 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6b56b215686b09f8b373b17fb254e13d
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1 b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
index 1ca6bafc0f67..d6377313c45d 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=713b06812944779ddd5f21aed9ddf91b
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.2 b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.2
index 52eccf928444..8fd9beb44ff8 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.2
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=408e83254fd7dbcd8fc8e0db0da1549f
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.3 b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.3
index 0c8b0c227cbf..f57511373d60 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.3
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.6.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=408e83254fd7dbcd8fc8e0db0da1549f
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
index 1a35ec6aed9a..2c6e99b12e97 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=da2f2de15425c864a24c31daa45fb75e
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0 b/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
index 1b0f163e8ace..21a3cac3738b 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cfedbb36e55982ab7aca2a6f1879b6d1
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.0 b/metadata/md5-cache/dev-ruby/digest-3.1.0
index 20638a98d155..8b3af61a462a 100644
--- a/metadata/md5-cache/dev-ruby/digest-3.1.0
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/digest/archive/v3.1.0.tar.gz -> digest-3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0502147edc2792e239f559b2308e29ea
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.0-r1 b/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
index d6eaf01c86c0..9fab95b68dec 100644
--- a/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/digest/archive/v3.1.0.tar.gz -> digest-3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5f1dd1dba2c8608f26a9d1b13b5f6a52
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.1 b/metadata/md5-cache/dev-ruby/digest-3.1.1
index 9709d278ca2e..cf245c4d5f09 100644
--- a/metadata/md5-cache/dev-ruby/digest-3.1.1
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/digest/archive/v3.1.1.tar.gz -> digest-3.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9ad36bfcaa613e74512db4fdc03d37ac
diff --git a/metadata/md5-cache/dev-ruby/diva-1.1.1-r1 b/metadata/md5-cache/dev-ruby/diva-1.1.1-r1
index 65c0665102b5..1dc600f8aac7 100644
--- a/metadata/md5-cache/dev-ruby/diva-1.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/diva-1.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toshia/diva/archive/v1.1.1.tar.gz -> diva-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4cb019a19b733abf949d969c78dc3d68
diff --git a/metadata/md5-cache/dev-ruby/diva-2.0.1 b/metadata/md5-cache/dev-ruby/diva-2.0.1
index f52509d4a515..ae03423f8129 100644
--- a/metadata/md5-cache/dev-ruby/diva-2.0.1
+++ b/metadata/md5-cache/dev-ruby/diva-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toshia/diva/archive/v2.0.1.tar.gz -> diva-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=aebc0b1dcf55a7e1b2a3c00cebd69c56
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.9 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
index ee55b982559e..9d1fb8840fcd 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dnsruby-1.61.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eb36de8ba809bb526550bcb9bed03e5d
diff --git a/metadata/md5-cache/dev-ruby/docile-1.4.0 b/metadata/md5-cache/dev-ruby/docile-1.4.0
index ed9cab0b3086..902e348aa9e6 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.4.0
+++ b/metadata/md5-cache/dev-ruby/docile-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ms-ati/docile/archive/v1.4.0.tar.gz -> docile-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=70bba113aea5072345e3e5e44c269f56
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
index 7f15039e7792..7b2331d522a5 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9d4ef465a1e91012a4d866f24f903e6d
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
index 3f832f42e00d..15269f189973 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ab9c15c3a357d85de05df03a620c34ee
diff --git a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3 b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
index 5b7a60013986..e3964099494a 100644
--- a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/judofyr/duktape.rb/archive/v2.3.0.0.tar.gz -> duktape-rb-2.3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5a78c25017189c1e825a82baaa7951c8
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r3 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r3
index 011342cbbc16..0c7bb3d15d3a 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r3
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dust-0.1.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dba29e2bdcb10c1f1a43734c376a1a74
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
index f9676453d250..d768c5f9e77b 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e15884d77ad9206ccc6e481ce5fb7d21
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
index 01b1e754964b..b98f7aa2601e 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=575acdfb003ccda8ce6aebe0c36ba630
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.3.0 b/metadata/md5-cache/dev-ruby/ed25519-1.3.0
index 0370a110514e..765df61d8a8d 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.3.0
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.3.0.tar.gz -> ed25519-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6e0b5ab0f2097f536379b98241256309
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
index aec77944a77d..e22906936c6f 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3cf858fde80a3a04cceff394e7a76a8a
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
index 816cf14127c2..d7dd087d3e9b 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=90c6ade4733600429ca71fca4f7af429
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
index 66833d5d6f0b..751500d7c0d9 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=494cea2922d3dd0eedc82f89313ff677
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
index c113fca3acd0..9a258bdb8662 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8001f37db8a126bf4e461a591b05abd5
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33 b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
index 20c8ba62cc91..31adef5b6df2 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v0.0.33.tar.gz -> elasticsearch-ruby-0.0.33.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f86323843b07077b6a69f5e4ab73ec96
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
index 54399f480aa9..b2e9f3694ec0 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=15babb90f9d2e9c1689c3963ffb84fab
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
index 1c9db987cb3f..6d8c22f8fe9e 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c5c4041ee305ef0832d06472a3a1374a
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
index 5ad1c0f97b4d..825e8201356e 100644
--- a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
+++ b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.2.tar.gz -> em-websocket-0.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=814ff0279a62ddd81155e0af67277668
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.3 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.3
index f104a5d83363..604da4b6241a 100644
--- a/metadata/md5-cache/dev-ruby/em-websocket-0.5.3
+++ b/metadata/md5-cache/dev-ruby/em-websocket-0.5.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.3.tar.gz -> em-websocket-0.5.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ce9e4717a91bf26daa1c4cb8077159b0
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
index a4705661e149..a5f7c107873b 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equalizer-0.0.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=03eacd808b8ff2aed106e0f0ac82de1a
diff --git a/metadata/md5-cache/dev-ruby/equatable-0.7.0 b/metadata/md5-cache/dev-ruby/equatable-0.7.0
index 74bc0b7bcb87..1ce187756559 100644
--- a/metadata/md5-cache/dev-ruby/equatable-0.7.0
+++ b/metadata/md5-cache/dev-ruby/equatable-0.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/equatable/archive/v0.7.0.tar.gz -> equatable-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2f83bbf6c3c9a59c4ee04b9845a85c7a
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1 b/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
index 7509a75d927f..8570171e8fea 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
+++ b/metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/erubi/archive/1.10.0.tar.gz -> erubi-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bf928701fe4c6d55d30970ed08cbefe9
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.11.0 b/metadata/md5-cache/dev-ruby/erubi-1.11.0
index 6bca13bca869..e50cbf25c408 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.11.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/erubi/archive/1.11.0.tar.gz -> erubi-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7467ee2a21ab976351178964707af256
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.12.0 b/metadata/md5-cache/dev-ruby/erubi-1.12.0
index 0e854e4ffce3..58ae91afe1b3 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.12.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/erubi/archive/1.12.0.tar.gz -> erubi-1.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c65ff7b8c1df20a12fcef163fd93764f
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
index 974af7e9d332..d1930c40fa1d 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=34fb868e78986552a24718636b37f733
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
index d228c921fbb9..c8360bb82190 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5c97ed461ef047a868716e45b4067c3a
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.15.0 b/metadata/md5-cache/dev-ruby/ethon-0.15.0
index e5fe1d70a59c..cc18aa8b8254 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.15.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0cff87e295f6277c71576071bcfd0e1e
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.16.0 b/metadata/md5-cache/dev-ruby/ethon-0.16.0
index 1d8f94220eae..fe836d5957d7 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.16.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0cff87e295f6277c71576071bcfd0e1e
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
index 0b92cd61479b..65d0e9256579 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/evented-spec-0.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=13b2ccfbce0976da877b1fe63201ca97
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
index 27842d3a6597..e9891e1aead9 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eventmachine/eventmachine/archive/v1.2.7.tar.gz -> eventmachine-1.2.7.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ruby/eventmachine/eventmachine-1.2.7-openssl-patches.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=07bb53899e9775c845ebee3005cb2dae
diff --git a/metadata/md5-cache/dev-ruby/excon-0.92.4 b/metadata/md5-cache/dev-ruby/excon-0.92.4
index e474c429d4e8..ea17ea3f61ef 100644
--- a/metadata/md5-cache/dev-ruby/excon-0.92.4
+++ b/metadata/md5-cache/dev-ruby/excon-0.92.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/excon/excon/archive/v0.92.4.tar.gz -> excon-0.92.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=417f99688c590110b6ef845fb26ccbaa
diff --git a/metadata/md5-cache/dev-ruby/excon-0.93.1 b/metadata/md5-cache/dev-ruby/excon-0.93.1
index f0d09a3abade..5db3f6827dab 100644
--- a/metadata/md5-cache/dev-ruby/excon-0.93.1
+++ b/metadata/md5-cache/dev-ruby/excon-0.93.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/excon/excon/archive/v0.93.1.tar.gz -> excon-0.93.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4ca0310164127c70080e2c50d594c8fc
diff --git a/metadata/md5-cache/dev-ruby/excon-0.95.0 b/metadata/md5-cache/dev-ruby/excon-0.95.0
index 349490cf4ecf..4337af1307dd 100644
--- a/metadata/md5-cache/dev-ruby/excon-0.95.0
+++ b/metadata/md5-cache/dev-ruby/excon-0.95.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/excon/excon/archive/v0.95.0.tar.gz -> excon-0.95.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=11a0a675ba0857b2717f72de928a7ba6
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.1 b/metadata/md5-cache/dev-ruby/execjs-2.8.1
index 543a43341f51..01f62445ed4c 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.8.1.tar.gz -> execjs-2.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=19330c990ef3dddcf0c0b2ff3216fada
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.10 b/metadata/md5-cache/dev-ruby/exifr-1.3.10
index dc0b4ae2108a..a3451207ab24 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.10
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.10.tar.gz -> exifr-1.3.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=139dad4b3b7a997ef4297c5552e152e3
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.24 b/metadata/md5-cache/dev-ruby/facter-3.14.24
index a14df92e5fde..515bd45eece8 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.24
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.24
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.24.tar.gz -> facter-3.14.24.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9acc2dca281dead887dc6140a0e9f74f
diff --git a/metadata/md5-cache/dev-ruby/facter-4.3.0 b/metadata/md5-cache/dev-ruby/facter-4.3.0
index a2da97a93da5..a99365d84ec7 100644
--- a/metadata/md5-cache/dev-ruby/facter-4.3.0
+++ b/metadata/md5-cache/dev-ruby/facter-4.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/4.3.0.tar.gz -> facter-4.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=999630a95da8e798db54e9d72449bf0c
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.3.2 b/metadata/md5-cache/dev-ruby/fakefs-1.3.2
index 52584a1df39f..38e33bc7399f 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.3.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.3.2.tar.gz -> fakefs-1.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4bc525b89d5de14044b091d4153741c0
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.9.0 b/metadata/md5-cache/dev-ruby/fakefs-1.9.0
index 815710025f87..ae6fdaffa926 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.9.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.9.0.tar.gz -> fakefs-1.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=878bb21f2d32677b2d25e98a0eb632d9
diff --git a/metadata/md5-cache/dev-ruby/faker-2.23.0 b/metadata/md5-cache/dev-ruby/faker-2.23.0
index 63d4d98bc917..b1fff1ae2bbd 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.23.0
+++ b/metadata/md5-cache/dev-ruby/faker-2.23.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.23.0.tar.gz -> faker-2.23.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6316f04223d96b41ff1ba3a52bd5c3cc
diff --git a/metadata/md5-cache/dev-ruby/faker-2.23.0-r1 b/metadata/md5-cache/dev-ruby/faker-2.23.0-r1
index d1818c383258..0762d8715639 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.23.0-r1
+++ b/metadata/md5-cache/dev-ruby/faker-2.23.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.23.0.tar.gz -> faker-2.23.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=af4c190d8a3c5d17790304272b1cb903
diff --git a/metadata/md5-cache/dev-ruby/faker-3.1.0 b/metadata/md5-cache/dev-ruby/faker-3.1.0
index 60a1b191ccf3..f54c95db0184 100644
--- a/metadata/md5-cache/dev-ruby/faker-3.1.0
+++ b/metadata/md5-cache/dev-ruby/faker-3.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/stympy/faker/archive/v3.1.0.tar.gz -> faker-3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dd1d779835c44ad0c6f6acbb664fa0a6
diff --git a/metadata/md5-cache/dev-ruby/faraday-1.3.1 b/metadata/md5-cache/dev-ruby/faraday-1.3.1
index 63ac06d36f66..3a01e5c2667e 100644
--- a/metadata/md5-cache/dev-ruby/faraday-1.3.1
+++ b/metadata/md5-cache/dev-ruby/faraday-1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday/archive/v1.3.1.tar.gz -> faraday-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9c644d1d8af8bd2cea00ee0f23d7868a
diff --git a/metadata/md5-cache/dev-ruby/faraday-2.3.0 b/metadata/md5-cache/dev-ruby/faraday-2.3.0
index 95fe5ec12316..a54eaf4331be 100644
--- a/metadata/md5-cache/dev-ruby/faraday-2.3.0
+++ b/metadata/md5-cache/dev-ruby/faraday-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday/archive/v2.3.0.tar.gz -> faraday-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=209961c5ade162b4c8ffde637594941a
diff --git a/metadata/md5-cache/dev-ruby/faraday-2.4.0 b/metadata/md5-cache/dev-ruby/faraday-2.4.0
index 4b66185f1584..1e851d78f903 100644
--- a/metadata/md5-cache/dev-ruby/faraday-2.4.0
+++ b/metadata/md5-cache/dev-ruby/faraday-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday/archive/v2.4.0.tar.gz -> faraday-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6d4559d6b06d620d335452c0782929c4
diff --git a/metadata/md5-cache/dev-ruby/faraday-2.5.2 b/metadata/md5-cache/dev-ruby/faraday-2.5.2
index 250b6193a171..35a2330ec94b 100644
--- a/metadata/md5-cache/dev-ruby/faraday-2.5.2
+++ b/metadata/md5-cache/dev-ruby/faraday-2.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday/archive/v2.5.2.tar.gz -> faraday-2.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc10ce7caa5fc120897dcb858525b022
diff --git a/metadata/md5-cache/dev-ruby/faraday-2.6.0 b/metadata/md5-cache/dev-ruby/faraday-2.6.0
index a867b065509a..2706a4066f80 100644
--- a/metadata/md5-cache/dev-ruby/faraday-2.6.0
+++ b/metadata/md5-cache/dev-ruby/faraday-2.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday/archive/v2.6.0.tar.gz -> faraday-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc10ce7caa5fc120897dcb858525b022
diff --git a/metadata/md5-cache/dev-ruby/faraday-2.7.2 b/metadata/md5-cache/dev-ruby/faraday-2.7.2
index beae0fde9456..8ca879747422 100644
--- a/metadata/md5-cache/dev-ruby/faraday-2.7.2
+++ b/metadata/md5-cache/dev-ruby/faraday-2.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday/archive/v2.7.2.tar.gz -> faraday-2.7.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc10ce7caa5fc120897dcb858525b022
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1 b/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
index f3c6a61f053e..fe49c65c6cd1 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v1.0.1.tar.gz -> faraday-net_http-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a21053b0b87c2f170b85f920a20a88d4
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3 b/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
index a54a213d616b..9d459f0493f1 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v2.0.3.tar.gz -> faraday-net_http-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c474e70246e4f9a542e31e1ecf090343
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-2.1.0 b/metadata/md5-cache/dev-ruby/faraday-net_http-2.1.0
index 29bd8ca074a5..7df206c5bf97 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-2.1.0
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v2.1.0.tar.gz -> faraday-net_http-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=432af7ef27f8c1663054671158884e2a
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.0 b/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.0
index 94adffe9ef8a..6fbf6eab98c2 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.0
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v3.0.0.tar.gz -> faraday-net_http-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1746b1c64c6d8a1c8b8b2c93b3ac2969
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.1 b/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.1
index d91fd4a5d41a..27e2d609e9ae 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.1
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v3.0.1.tar.gz -> faraday-net_http-3.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1746b1c64c6d8a1c8b8b2c93b3ac2969
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.2 b/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.2
index 7c4e25a51385..32741c407671 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.2
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v3.0.2.tar.gz -> faraday-net_http-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1746b1c64c6d8a1c8b8b2c93b3ac2969
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
index 2ae1e32e22ec..b7417dd25deb 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.2.0.tar.gz -> faraday_middleware-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=27ad279729dd2e33d68ef7f4f1701bb0
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
index 405e124cb12c..8618bdec81bf 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5f4f771b4be03ac76609bf2a9b361969
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
index f7037444ed8d..4eab9b99518e 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7d3ef4d0dffdade42c23b27c4cc96089
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
index a93835f6cc40..bc2afe243f42 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=57a8c20dd5e147e8cdb23e2350612fe8
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1 b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
index 93ef0198ed52..6ff96a6d1e60 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.8.0.tar.gz -> fast_gettext-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b505e7889b47636c517e780d6a8d689b
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0 b/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
index eac28a4da1a0..9ba32349e0ca 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.2.0.tar.gz -> fast_gettext-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=94b9fc2ff94cd86dceb575f9d17e9d58
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.3.0 b/metadata/md5-cache/dev-ruby/fast_gettext-2.3.0
index 92144db4da7b..45fe99b71cdf 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.3.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.3.0.tar.gz -> fast_gettext-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cfa013fb7507989ef8a936c366b9aab5
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
index 2c8c0f10ac7e..eaf689e133e6 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast_xs-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=03b636dd419ee711b5d36ec5694711e4
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1 b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
index ee0d0269cf2c..0190a98276d7 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dd8a1f5c19c77ae820cd6780d296a4c2
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
index 2835bde0d394..d16de3567067 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fcgi-0.9.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ae7ed29b0f64dd072a197f157052bc91
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.2 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.2
index 2594d53dd97c..df13f27df780 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.2
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fcgi-0.9.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1b412c6fb6010e2ff870fed32505616d
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.20.0 b/metadata/md5-cache/dev-ruby/ffaker-2.20.0
index 8bd0d3ef75fa..db3d0b4408c6 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.20.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.20.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.20.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0dbb345876586e8bf39ca63c05980d3c
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.21.0 b/metadata/md5-cache/dev-ruby/ffaker-2.21.0
index a1aa72014252..73465803b9cf 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.21.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bfb706d8486a84b82658273613ec4c42
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.5 b/metadata/md5-cache/dev-ruby/ffi-1.15.5
index fd477a402c24..da8142032f20 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.5
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.5.tar.gz -> ffi-git-1.15.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=de65d9cb7572d5714f8033801edaa47b
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1 b/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
index 08c293a7f187..01f157b74e84 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.5.tar.gz -> ffi-git-1.15.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7b59a9594fea6638e3f7fe1a8492f1fb
diff --git a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
index 0c835b61d7db..5c5e40d5b424 100644
--- a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffi-compiler-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6a600951e457ccd6b34c056457e67e64
diff --git a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r2 b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r2
index 7a6ba0f03abc..70d3a2352f15 100644
--- a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffi-compiler-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6398557efdf0f26b3230a694028906a3
diff --git a/metadata/md5-cache/dev-ruby/fiber-local-1.0.0 b/metadata/md5-cache/dev-ruby/fiber-local-1.0.0
index 28412a8022d5..4c0c51b93462 100644
--- a/metadata/md5-cache/dev-ruby/fiber-local-1.0.0
+++ b/metadata/md5-cache/dev-ruby/fiber-local-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/fiber-local/archive/refs/tags/v1.0.0.tar.gz -> fiber-local-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=63119affaa8e36349eadc85f2af6795a
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1 b/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
index d1c86a15c6cc..e006a3ec3aa2 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/file-tail-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=62afc87434cba663cb929fead0275104
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1 b/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
index 877333a51ea7..f46e77eff7f4 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/filesize-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.2.0
 SRC_URI=https://rubygems.org/gems/filesize-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6091c0882185999c1fc01081cd4ad221
diff --git a/metadata/md5-cache/dev-ruby/filigree-0.4.1 b/metadata/md5-cache/dev-ruby/filigree-0.4.1
index 12e598ad1999..f4a09c7543d6 100644
--- a/metadata/md5-cache/dev-ruby/filigree-0.4.1
+++ b/metadata/md5-cache/dev-ruby/filigree-0.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/filigree-0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3390ebc212220e198dc41e7c8e599a09
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.7 b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
index ee29df6b2cdb..08ad27ea1fb6 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.7
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fivemat-1.3.7.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=509c0fcb29819cac1fb98d615ed1e729
diff --git a/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1 b/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
index c93eca60f611..aeae108c89a1 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/flexmock-2.3.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/doudou/flexmock/archive/v2.3.6.tar.gz -> flexmock-2.3.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9b1c046d11f7162d2add36a2cc61a953
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.10 b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
index a2d06679d875..3aebcd1b2974 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.10
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flickraw-0.9.10.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bf8d75c6dbb49f4bdf7eea0241aec3d2
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.5 b/metadata/md5-cache/dev-ruby/flog-4.6.5
index e0ac9925e9a4..85d26d1889de 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.5
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8055c9d79aa0c03a06ce872996d5b563
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.6 b/metadata/md5-cache/dev-ruby/flog-4.6.6
index 783e5142ea22..06877fcffc6f 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.6
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ea523686a250728e4a7dff445b187a88
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
index 8c7337319a66..9c07f2d949c7 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8e53dafa94ea69bf60185ce63b1b2518
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.8.1 b/metadata/md5-cache/dev-ruby/forgery-0.8.1
index b33f426e19f4..5dff09512843 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.8.1
+++ b/metadata/md5-cache/dev-ruby/forgery-0.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/forgery-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f26a7493b4b636fbc37bdf1da124b181
diff --git a/metadata/md5-cache/dev-ruby/forwardable-1.3.2 b/metadata/md5-cache/dev-ruby/forwardable-1.3.2
index 2e44f66bc949..b4e5dcf1480b 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-1.3.2
+++ b/metadata/md5-cache/dev-ruby/forwardable-1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/forwardable/archive/v1.3.2.tar.gz -> forwardable-1.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ff428970cab1b2121a9f3c3002b6414b
diff --git a/metadata/md5-cache/dev-ruby/forwardable-1.3.3 b/metadata/md5-cache/dev-ruby/forwardable-1.3.3
index 7320221fbf59..a3faab80ac1a 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-1.3.3
+++ b/metadata/md5-cache/dev-ruby/forwardable-1.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/forwardable/archive/v1.3.3.tar.gz -> forwardable-1.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=da22b12698d97eeeb3bd258f6941c71a
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
index 7072135f6991..814b7bd72c86 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/forwardable-extended/archive/v2.6.0.tar.gz -> forwardable-extended-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2b0b8900f31ccda2f395d248ddf5ff12
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
index 9200fee4da89..1b157f430aef 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.1.tar.gz -> fuubar-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8c16ed2ec3d673c0d963b38c50f3f4b7
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2 b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
index 5f305d181874..e06bcd5f1897 100644
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/gettext-setup-gem/archive/0.34.tar.gz -> gettext-setup-0.34.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b874490fd0579c00bcf65fe0b29e5532
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.10.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.10.0
index f5c3e49f8b1a..0bdd1450f104 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.10.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.10.0.tar.gz -> gettext_i18n_rails-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8da432d6ae21753406ba31613fa1e8d0
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1-r1 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1-r1
index 890007529431..deeabd2c67df 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.8.1.tar.gz -> gettext_i18n_rails-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=62f14340e4d8e1a73e4b07a9253fd104
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.9.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.9.0
index da398178a973..4f5712a32321 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.9.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.9.0.tar.gz -> gettext_i18n_rails-1.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=76b5235f8f23ebc4ca93b1169a19d2cf
diff --git a/metadata/md5-cache/dev-ruby/gh-0.18.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
index 27850dbcd76b..592374b9375d 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
+++ b/metadata/md5-cache/dev-ruby/gh-0.18.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/travis-ci/gh/archive/v0.18.0.tar.gz -> gh-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d20710d26d509542348079efe03ba5d1
diff --git a/metadata/md5-cache/dev-ruby/gist-6.0.0 b/metadata/md5-cache/dev-ruby/gist-6.0.0
index 00ad42de8155..500f7dac45b1 100644
--- a/metadata/md5-cache/dev-ruby/gist-6.0.0
+++ b/metadata/md5-cache/dev-ruby/gist-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gist-6.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a2ca7a67b25b5c33ad7351059919933b
diff --git a/metadata/md5-cache/dev-ruby/git-1.13.0-r1 b/metadata/md5-cache/dev-ruby/git-1.13.0-r1
index b96de59f3dc7..deef84141264 100644
--- a/metadata/md5-cache/dev-ruby/git-1.13.0-r1
+++ b/metadata/md5-cache/dev-ruby/git-1.13.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.13.0.tar.gz -> git-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8654be95b2e3ff88ba5d793c8d8addfb
diff --git a/metadata/md5-cache/dev-ruby/git-1.13.1 b/metadata/md5-cache/dev-ruby/git-1.13.1
index cd4544bc0aca..c838d441e5be 100644
--- a/metadata/md5-cache/dev-ruby/git-1.13.1
+++ b/metadata/md5-cache/dev-ruby/git-1.13.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.13.1.tar.gz -> git-1.13.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a2bc0432e81eb6b9832506eb53f03f7c
diff --git a/metadata/md5-cache/dev-ruby/git-1.13.2 b/metadata/md5-cache/dev-ruby/git-1.13.2
index 08a756e272fd..09e7ed325315 100644
--- a/metadata/md5-cache/dev-ruby/git-1.13.2
+++ b/metadata/md5-cache/dev-ruby/git-1.13.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-git/ruby-git/archive/v1.13.2.tar.gz -> git-1.13.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0c7fa4cc7247218c9c389cbf2316351d
diff --git a/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1 b/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
index d0eb42c319fb..78bb757fae0b 100644
--- a/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/globalid-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v1.0.0.tar.gz -> globalid-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=81abe5f1065825b61b5ddf744881eecc
diff --git a/metadata/md5-cache/dev-ruby/globalid-1.0.0-r2 b/metadata/md5-cache/dev-ruby/globalid-1.0.0-r2
index 8bc190f7f591..4c95ffe9127e 100644
--- a/metadata/md5-cache/dev-ruby/globalid-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/globalid-1.0.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v1.0.0.tar.gz -> globalid-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=477b48ce85fa7333a1037408a7a25109
diff --git a/metadata/md5-cache/dev-ruby/globalid-1.0.1 b/metadata/md5-cache/dev-ruby/globalid-1.0.1
index c7a761c12d06..929f3d36417f 100644
--- a/metadata/md5-cache/dev-ruby/globalid-1.0.1
+++ b/metadata/md5-cache/dev-ruby/globalid-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v1.0.1.tar.gz -> globalid-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3e3d005dbcd40548c5f4d4bbb4b1880a
diff --git a/metadata/md5-cache/dev-ruby/globalid-1.1.0 b/metadata/md5-cache/dev-ruby/globalid-1.1.0
index 0f6905dc637f..1e347547d0da 100644
--- a/metadata/md5-cache/dev-ruby/globalid-1.1.0
+++ b/metadata/md5-cache/dev-ruby/globalid-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v1.1.0.tar.gz -> globalid-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3e3d005dbcd40548c5f4d4bbb4b1880a
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
index dcaeb34184bf..5500476c8b57 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gnuplot-2.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1285709d12d1f5222a27f2d9169848ff
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
index 397f8805e7c1..fbea3c1a7c26 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> google-protobuf-3.14.0-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f495d8b4807204618d2a02873b95d8b8
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3 b/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
index 63bd99b77cf2..afe94506e733 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.3.tar.gz -> google-protobuf-3.19.3-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=55f5a5c5f165b76682228f3baf7243ca
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.19.6 b/metadata/md5-cache/dev-ruby/google-protobuf-3.19.6
index 5a2799e421fa..738200e0dabc 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.19.6
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.19.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> google-protobuf-3.19.6-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ba8a6bf2064f43f6afe53ff1b3aab326
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3 b/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
index b4064ea47f09..020d125f9885 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.20.tar.gz -> ruby-gpgme-2.0.20.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9c7dd5bc1badcfcef8a67597a6edd3d0
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.21 b/metadata/md5-cache/dev-ruby/gpgme-2.0.21
index 3758fa3ec0e5..1e1f9a7370ce 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.21
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.21
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.21.tar.gz -> ruby-gpgme-2.0.21.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a0c59cb6377ed6d86fa54411fff23841
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.22 b/metadata/md5-cache/dev-ruby/gpgme-2.0.22
index 20679a81c562..f56d1ea1b8f2 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.22
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.22
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.22.tar.gz -> ruby-gpgme-2.0.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a0c59cb6377ed6d86fa54411fff23841
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.14.0 b/metadata/md5-cache/dev-ruby/gruff-0.14.0
index fd4883644b4f..5edc7cefe824 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.14.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.14.0.tar.gz -> gruff-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=05fda139f6ce51876d62390649023847
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.18.0 b/metadata/md5-cache/dev-ruby/gruff-0.18.0
index e7710e9cae41..433e24ae61d9 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.18.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.18.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.18.0.tar.gz -> gruff-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b521d205e7706db5b680c44726074355
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.19.0 b/metadata/md5-cache/dev-ruby/gruff-0.19.0
index c47d9013f828..34370210e32f 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.19.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.19.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.19.0.tar.gz -> gruff-0.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7d51208f5478586db867e83e886d6860
diff --git a/metadata/md5-cache/dev-ruby/haml-5.2.2 b/metadata/md5-cache/dev-ruby/haml-5.2.2
index 56a7282e6c06..3d4a2de245b2 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.2.2
+++ b/metadata/md5-cache/dev-ruby/haml-5.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/haml/haml/archive/v5.2.2.tar.gz -> haml-5.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=aba7c36426322218060d3ec35371c119
diff --git a/metadata/md5-cache/dev-ruby/haml-6.1.1 b/metadata/md5-cache/dev-ruby/haml-6.1.1
index bbcc4bfaaa93..2b97dad13f2b 100644
--- a/metadata/md5-cache/dev-ruby/haml-6.1.1
+++ b/metadata/md5-cache/dev-ruby/haml-6.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/haml/haml/archive/v6.1.1.tar.gz -> haml-6.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=455d74e832b1cfeb8e401a5fc3fd90c9
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
index 6657b448c122..998a55d6168b 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/haml-rails-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=70b8723dfce8bd3d56e00370762a5146
diff --git a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2 b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
index bbea145a8fb1..2d6e7b60ab67 100644
--- a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hamster-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=47cbfdf6c5ea2371af6a9352bbe52529
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1 b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
index be21d78fb9b1..9f6a25485c8f 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
+++ b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashdiff-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c7d17d757ab96e74fd7ced3ca1b52a81
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
index 774660a62c98..fd741eaefa55 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashery-2.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7073bc80b9c44882d34fa5c860d14269
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
index b570ba8b057f..2a5cacf4bc87 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a23bab997651015f331e7f5a45f0d41c
diff --git a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1 b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
index 00016910a762..13007f32b4f5 100644
--- a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/intridea/hashie/archive/v4.1.0.tar.gz -> hashie-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7b10063964693285d28cde8f61d12143
diff --git a/metadata/md5-cache/dev-ruby/hashie-5.0.0 b/metadata/md5-cache/dev-ruby/hashie-5.0.0
index d0c393606bf0..5c7f117f7d63 100644
--- a/metadata/md5-cache/dev-ruby/hashie-5.0.0
+++ b/metadata/md5-cache/dev-ruby/hashie-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/intridea/hashie/archive/v5.0.0.tar.gz -> hashie-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3cf353dcde0f6ee1ca06e7be4631cf0c
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1 b/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
index f5a7187b4f16..78766e82820c 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashr-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a058bff25ce2c6774f8c72a0c111ac43
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
index 22b0a531f2b2..e7446363bcaa 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/heredoc_unindent-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=331d9eb7b9df38da10ba57ab63a5b1ab
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.10.0 b/metadata/md5-cache/dev-ruby/hiera-3.10.0
index a0210fa62f51..20e36d4e8448 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.10.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fd834f868124830c178d07e4fb4892ee
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.11.0 b/metadata/md5-cache/dev-ruby/hiera-3.11.0
index 56e2d2edcb8d..700807c6a00a 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.11.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fd834f868124830c178d07e4fb4892ee
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.12.0 b/metadata/md5-cache/dev-ruby/hiera-3.12.0
index 35ed28d7a89a..820c64a1e6b2 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.12.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=65c1ab9a27c4424e8b5c3edd9de0d72d
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.9.0 b/metadata/md5-cache/dev-ruby/hiera-3.9.0
index 1e0d8c6e9f6b..e12895565cb9 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.9.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=27e02dcb24471742dfa9db8b6ea6adb0
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
index 5f12acf8a524..472ccb89af2f 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.1.1.tar.gz -> hiera-eyaml-3.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1d1b86102a0d03737bb006149edb610c
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
index 8a76f4d2c108..2d135c844425 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.2.2.tar.gz -> hiera-eyaml-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ad3c14b280e4dfc8078b8cbf42405bb8
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.3.0 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.3.0
index a213614669d9..c46db925ef17 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.3.0
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.3.0.tar.gz -> hiera-eyaml-3.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=90cb1101d2b2c98c6c28e640a64a4dae
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
index 1538deb47059..8d9c2f7116c4 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-gpg-0.7.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96bac9d74e0c46558ca895ca9722023b
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
index ed585927d9b3..cd279febf46f 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a8ccaae3a7b065965cbe6444466844de
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3 b/metadata/md5-cache/dev-ruby/highline-2.0.3
index e1a5021c249f..dd61e9e9a806 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=85e7b999217f6489756b07e95d9d63a0
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3-r1 b/metadata/md5-cache/dev-ruby/highline-2.0.3-r1
index 4cfd61058678..de7353f87548 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b27ca2941f22f5af776eff4f18fd21fe
diff --git a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1 b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
index e438c0ce551f..2d1e6b75df4f 100644
--- a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
+++ b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/histogram-0.2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=418f3414c7f4b5ed0c6521a8d2c1494b
diff --git a/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1 b/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
index 21de3a71691d..1dd8c01335d9 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hitimes-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=50665dfeccbd6626e1bccb3c0063a103
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1 b/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
index 5f90d00afde7..ae4d4e5aeae0 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/ruby-hocon/archive/1.3.1.tar.gz -> hocon-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f42983eee0a149978f85901f269689ba
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.21.0 b/metadata/md5-cache/dev-ruby/hoe-3.21.0
index cfba500f78ac..8cdc57afc27a 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.21.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d8c7bea2c5d9bcb94785e01c0a53c47f
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.23.1 b/metadata/md5-cache/dev-ruby/hoe-3.23.1
index 336679562a0d..88757d316945 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.23.1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.23.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.23.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1a051944963b548cba57fb0a9d5f6a49
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.24.0 b/metadata/md5-cache/dev-ruby/hoe-3.24.0
index 9dd3226c74f6..67ea807f84db 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.24.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.24.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.24.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1a051944963b548cba57fb0a9d5f6a49
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.25.0 b/metadata/md5-cache/dev-ruby/hoe-3.25.0
index c3e6d5bcfd26..982650e8a3fc 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.25.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.25.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.25.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=914a0cc161272470bc163cd89b5c9580
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.26.0 b/metadata/md5-cache/dev-ruby/hoe-3.26.0
index 8e7de1309ecd..59dbc42110a5 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.26.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.26.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.26.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=914a0cc161272470bc163cd89b5c9580
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
index 21caad98327b..8323e7aad6a4 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1754daadbe0e6bf8dd784dede418f5c8
diff --git a/metadata/md5-cache/dev-ruby/html-pipeline-2.14.2 b/metadata/md5-cache/dev-ruby/html-pipeline-2.14.2
index 76f683a2bf11..83235e72f8ac 100644
--- a/metadata/md5-cache/dev-ruby/html-pipeline-2.14.2
+++ b/metadata/md5-cache/dev-ruby/html-pipeline-2.14.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/gjtorikian/html-pipeline/archive/v2.14.2.tar.gz -> html-pipeline-2.14.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3c7c12a94f924d20fa5820c8557d7206
diff --git a/metadata/md5-cache/dev-ruby/html-pipeline-2.14.3 b/metadata/md5-cache/dev-ruby/html-pipeline-2.14.3
index 15eef42eb43f..3b3d0e17cc4b 100644
--- a/metadata/md5-cache/dev-ruby/html-pipeline-2.14.3
+++ b/metadata/md5-cache/dev-ruby/html-pipeline-2.14.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/gjtorikian/html-pipeline/archive/v2.14.3.tar.gz -> html-pipeline-2.14.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3c7c12a94f924d20fa5820c8557d7206
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
index b69fc183c02c..e0f346003040 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/html2haml-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6089907745ea644e38443a0798bb3e5f
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.3.0 b/metadata/md5-cache/dev-ruby/html2haml-2.3.0
index 10eff128463c..6320f1553afd 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.3.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/html2haml-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cb377fdfb3b43b65c24e7138a8d76fa5
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
index d8c98e134800..b567b952a8bb 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/htmlentities-4.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=990c3142cd061198241d7b208b09b8be
diff --git a/metadata/md5-cache/dev-ruby/http-4.4.1-r1 b/metadata/md5-cache/dev-ruby/http-4.4.1-r1
index e8b3d0b3fdf0..44b0cf0c32ae 100644
--- a/metadata/md5-cache/dev-ruby/http-4.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/http-4.4.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/http-4.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=091b660578cc2d838bfbec3ae0ca1ab8
diff --git a/metadata/md5-cache/dev-ruby/http-5.1.0 b/metadata/md5-cache/dev-ruby/http-5.1.0
index 171a9a5cd785..bcd2485c64a9 100644
--- a/metadata/md5-cache/dev-ruby/http-5.1.0
+++ b/metadata/md5-cache/dev-ruby/http-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/http-5.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=db9d97db6b49a3cdc1f4c31f13f41b2f
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
index cb6e1d2d6ab1..9089be1a8d59 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-1.7.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=93a96e143a3f2a31436bb26929866005
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1 b/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
index 09fe8f18d0ca..a18576d9be61 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.1.1.tar.gz -> http-accept-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=414f4a785a5e46d31dba14a034f0cfe0
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.2.0 b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
index 231bca066769..87f2285d23d1 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.2.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.2.0.tar.gz -> http-accept-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=76d943a5b305a8592089d5896c2cdafa
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
index 0cc74c2c5502..ff81b178d9e6 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=44d4d671fb6d2b43941bd438e7ac1405
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.5 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.5
index bfdc1a159057..59da96d1c8a5 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.5
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5bf2691d98ac26b9fd6cc126d0347a6d
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
index 85a2eb5dfc97..57978c489d7f 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/http-form_data-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0f2c83f47b1bb99f7cbb3b833f961a4c
diff --git a/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1 b/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
index e6c6f89f3420..528b146628ba 100644
--- a/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/http-parser-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3a96d2e8116dac2f6076e489625a7ca5
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
index a97d52e38ed4..62aa25fb8f70 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http_parser.rb-0.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b0f2bfdcf287d4fbb306face85bcb55a
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.8.0 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.8.0
index 55cc6d1416eb..1316b6db6369 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.8.0
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http_parser.rb-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9f0a2eb0e59e4cfe7c0c7a8a7a2034bb
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.20.0 b/metadata/md5-cache/dev-ruby/httparty-0.20.0
index 9b3795ebde8e..fffa8b279eb0 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.20.0
+++ b/metadata/md5-cache/dev-ruby/httparty-0.20.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.20.0.tar.gz -> httparty-0.20.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6b2663c138f845196c167e608aa1dc0d
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.21.0 b/metadata/md5-cache/dev-ruby/httparty-0.21.0
index bc7c7167e3e2..aefab0f49534 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.21.0
+++ b/metadata/md5-cache/dev-ruby/httparty-0.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.21.0.tar.gz -> httparty-0.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7b879f43a0da5af0497ab66e53466fdf
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
index f4d8981f1608..a0dd3f69f610 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ffec366593c2b65f6d27f268d1864928
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
index c27a7b70c335..171e6dc9ce93 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=401a2807ac0bd50e1f6a921839a9bd77
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.11.0 b/metadata/md5-cache/dev-ruby/i18n-1.11.0
index c42408525894..f09673ee3e4f 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.11.0
+++ b/metadata/md5-cache/dev-ruby/i18n-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.11.0.tar.gz -> i18n-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=86735f7e7ba9e58c346b0f86984cfb26
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.12.0 b/metadata/md5-cache/dev-ruby/i18n-1.12.0
index 55d4ba93e9f2..bee04cd31d1e 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.12.0
+++ b/metadata/md5-cache/dev-ruby/i18n-1.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.12.0.tar.gz -> i18n-1.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d1111b0065a1910c2e24af61f51d3b60
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.11 b/metadata/md5-cache/dev-ruby/i18n-1.8.11
index 5cbef165c9d6..a31cb3109303 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.11
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.11.tar.gz -> i18n-1.8.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b95e45d34392d73b53d35e8a1780beef
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 40b366c61712..bf20d5cfecad 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
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ee86831afdbff95e471bd2ac75980b9
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
index 080e9125a596..bfbfd56e903b 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=671665ae4de18e07707d856059e4784d
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
index 7ad473c1d2c0..07ed83e71935 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3a242850661130d49d475bcce2e3682a
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.5 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.5
index c34bdc9a6c27..5e914e857ff0 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.5
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=57575a740fde4fcb8c92cd46f24dd17a
diff --git a/metadata/md5-cache/dev-ruby/image_processing-1.12.2 b/metadata/md5-cache/dev-ruby/image_processing-1.12.2
index c8ea343e1d8f..3f9dc2f9145e 100644
--- a/metadata/md5-cache/dev-ruby/image_processing-1.12.2
+++ b/metadata/md5-cache/dev-ruby/image_processing-1.12.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janko/image_processing/archive/v1.12.2.tar.gz -> image_processing-1.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=059de102ccb86e78e9a5e49f3e5d88b4
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
index 828b62285709..f56a65eba53c 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=73bdcc1642518db7ef63f314e83bd565
diff --git a/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1 b/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
index 26054c179606..c30984f8b630 100644
--- a/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/inflecto-0.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/inflecto-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7775dc7614cb84a6cf690d445c94bf7d
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
index d8e3040b703f..2ab60864d052 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instance_storage-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ac25c52417723dea140f2281e54efd3f
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
index 9361ba27d0ab..95bc14521031 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/instance_storage-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=aada695271470825fbaaaf1420aa6d07
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
index fa6d14ee2a7a..12b9509a8556 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instantiator-0.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=52ececfb137b4663bc283f6dffa650d7
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1 b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
index d3ebc86b4dd8..af511239c9f4 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b97588386b4a65370be18eadf00830af
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.1.2 b/metadata/md5-cache/dev-ruby/io-event-1.1.2
index d5b67ba57025..878dbead4c23 100644
--- a/metadata/md5-cache/dev-ruby/io-event-1.1.2
+++ b/metadata/md5-cache/dev-ruby/io-event-1.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/socketry/io-event/archive/v1.1.2.tar.gz -> io-event-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a21b6149d4ca3654ab4379ae93da97ad
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.1.3 b/metadata/md5-cache/dev-ruby/io-event-1.1.3
index cb7e4b723fd6..bf931b60cd27 100644
--- a/metadata/md5-cache/dev-ruby/io-event-1.1.3
+++ b/metadata/md5-cache/dev-ruby/io-event-1.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/socketry/io-event/archive/v1.1.3.tar.gz -> io-event-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a21b6149d4ca3654ab4379ae93da97ad
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.1.4 b/metadata/md5-cache/dev-ruby/io-event-1.1.4
index b06092dfc2ca..8b1bd34f3298 100644
--- a/metadata/md5-cache/dev-ruby/io-event-1.1.4
+++ b/metadata/md5-cache/dev-ruby/io-event-1.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/socketry/io-event/archive/v1.1.4.tar.gz -> io-event-1.1.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a21b6149d4ca3654ab4379ae93da97ad
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.1.6 b/metadata/md5-cache/dev-ruby/io-event-1.1.6
index f36e75a0c5b8..975aa7ed11de 100644
--- a/metadata/md5-cache/dev-ruby/io-event-1.1.6
+++ b/metadata/md5-cache/dev-ruby/io-event-1.1.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/socketry/io-event/archive/v1.1.6.tar.gz -> io-event-1.1.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f3aa4fe22b59a1213db38a8d3b7bb18d
diff --git a/metadata/md5-cache/dev-ruby/io-wait-0.2.1 b/metadata/md5-cache/dev-ruby/io-wait-0.2.1
index acc22347a9e0..0c161b8def79 100644
--- a/metadata/md5-cache/dev-ruby/io-wait-0.2.1
+++ b/metadata/md5-cache/dev-ruby/io-wait-0.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/io-wait/archive/v0.2.1.tar.gz -> io-wait-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=85e5aafcb270c4d74cad4471c84c70e2
diff --git a/metadata/md5-cache/dev-ruby/io-wait-0.2.3 b/metadata/md5-cache/dev-ruby/io-wait-0.2.3
index 547dbf3ce8ee..0b91b590e61a 100644
--- a/metadata/md5-cache/dev-ruby/io-wait-0.2.3
+++ b/metadata/md5-cache/dev-ruby/io-wait-0.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/io-wait/archive/v0.2.3.tar.gz -> io-wait-0.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=85e5aafcb270c4d74cad4471c84c70e2
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.6.1 b/metadata/md5-cache/dev-ruby/itextomml-1.6.1
index fee16693f57e..e15942fd659d 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.6.1
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/itextomml-1.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=102e3db660d03ae02b07b715649051be
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.5 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
index 1155e99f26bc..cb4ae9f97efd 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.11.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9cd12e885b9c623cb18817b44997d479
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.6.1 b/metadata/md5-cache/dev-ruby/jmespath-1.6.1
index 6726cc4ab036..e23b11ab67ce 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.6.1
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.6.1.tar.gz -> jmespath-1.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=392935e47fcc3d742bca0015cef42b01
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.6.1-r1 b/metadata/md5-cache/dev-ruby/jmespath-1.6.1-r1
index 8892e7562335..ddb8117b2b34 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.6.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.6.1.tar.gz -> jmespath-1.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1f8fefd79af421742fdf08a894ab565a
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.6.2 b/metadata/md5-cache/dev-ruby/jmespath-1.6.2
index 84d55f08b793..9e141418c2a6 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.6.2
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.6.2.tar.gz -> jmespath-1.6.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1f8fefd79af421742fdf08a894ab565a
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
index 3ffcf684bcef..2d8ee9c4285d 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/jquery-rails-4.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=49571e9b0f0138bf8253d02940dad608
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0 b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
index 7ca4ae691b36..df56c5c9700f 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/jquery-rails-4.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=49571e9b0f0138bf8253d02940dad608
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.1
index 5a81affef8e7..66aa0eae7de9 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.1
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/jquery-rails-4.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4a877f2c85686d604fb18506581468b5
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
index b4cd56bb758e..7337d9d65e84 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/jquery-ui-rails-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f3e8ee98d30daf607b0f3c71124b33e3
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
index e831c854a3fa..3f8ac7b33d92 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4.2
 SRC_URI=https://rubygems.org/gems/jsobfu-0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=057763b7ed408666b299ae7034c95029
diff --git a/metadata/md5-cache/dev-ruby/json-2.5.1-r1 b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
index 61a544c3db93..2b08d358341e 100644
--- a/metadata/md5-cache/dev-ruby/json-2.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.5.1.tar.gz -> json-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=60319df6c35e090ff92e8b985910a437
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.1 b/metadata/md5-cache/dev-ruby/json-2.6.1
index bb8c37786613..accac1fbc82c 100644
--- a/metadata/md5-cache/dev-ruby/json-2.6.1
+++ b/metadata/md5-cache/dev-ruby/json-2.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.6.1.tar.gz -> json-2.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8917f3fbeacf4ec5877cafc6c149e24a
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.2 b/metadata/md5-cache/dev-ruby/json-2.6.2
index e5fb4e4f92f0..cb490043415f 100644
--- a/metadata/md5-cache/dev-ruby/json-2.6.2
+++ b/metadata/md5-cache/dev-ruby/json-2.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.6.2.tar.gz -> json-2.6.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0400dceb4ae6d87dfe79df059d5cbaa6
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.3 b/metadata/md5-cache/dev-ruby/json-2.6.3
index cded159e6a95..2163eb9f2de8 100644
--- a/metadata/md5-cache/dev-ruby/json-2.6.3
+++ b/metadata/md5-cache/dev-ruby/json-2.6.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.6.3.tar.gz -> json-2.6.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ee657bf312a9123b307e342a485ed359
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.9 b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
index 4edbdd53fae3..74560de11515 100644
--- a/metadata/md5-cache/dev-ruby/json_schema-0.20.9
+++ b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.9.tar.gz -> json_schema-0.20.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=19f1b498088c61ab4cd3d42b65e4c625
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.3 b/metadata/md5-cache/dev-ruby/jwt-2.2.3
index 09721ce77729..847a71578554 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.2.3
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.3.tar.gz -> jwt-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b769bfb940bf040c19bb02b01e002a96
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.5.0 b/metadata/md5-cache/dev-ruby/jwt-2.5.0
index 11b7864a63c9..ca7169a76632 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.5.0
+++ b/metadata/md5-cache/dev-ruby/jwt-2.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.5.0.tar.gz -> jwt-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=823794e3da19f0b32f3409feee9d9b0b
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.6.0 b/metadata/md5-cache/dev-ruby/jwt-2.6.0
index 0bc0b01adb58..4911f75b302f 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.6.0
+++ b/metadata/md5-cache/dev-ruby/jwt-2.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.6.0.tar.gz -> jwt-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=823794e3da19f0b32f3409feee9d9b0b
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.7.0 b/metadata/md5-cache/dev-ruby/jwt-2.7.0
index edad29fba8bb..40b637bb4447 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.7.0
+++ b/metadata/md5-cache/dev-ruby/jwt-2.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.7.0.tar.gz -> jwt-2.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4d706707d103a8e7684f88ac8f3b1120
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
index ce1086a036e0..01b84c6eb842 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/KirbyBase-2.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=43e3cd2a8b24dfd080b84a150b1a91eb
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
index 6add5e795391..ebcd81293044 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kissfft-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fccbabc23458c3710650d2899bb03965
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1 b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
index 9b828d46dd94..49877ac9fbfd 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.1.0.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9a994fb0c3df901cf2a9407ae9d1deb5
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.2.0 b/metadata/md5-cache/dev-ruby/kpeg-1.2.0
index f4922434ce07..ea9eeb58a520 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.2.0
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc8ea8c182048d3b492446bab422b026
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.3.0 b/metadata/md5-cache/dev-ruby/kpeg-1.3.0
index 0c50fbdcdf44..c7e5a9ae3657 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.3.0
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc8ea8c182048d3b492446bab422b026
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.3.1 b/metadata/md5-cache/dev-ruby/kpeg-1.3.1
index 53ba56ffa1fe..413f82698e3f 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.3.1
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a28155fe9eb30ab097b80a58e0f4fe2e
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.3.2 b/metadata/md5-cache/dev-ruby/kpeg-1.3.2
index 49b33a3b0ed5..f74744066872 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.3.2
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b49ba9582c66a65b92c41231d32dd048
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.4.0 b/metadata/md5-cache/dev-ruby/kramdown-2.4.0
index 8b18bd36be34..369e6a53e005 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-2.4.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/kramdown-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3279bac35b56793d1ed3aa83947e7aee
diff --git a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0 b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
index 6eec2bd20a37..302f16c632bd 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-parser-gfm-1.1.0.gem
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ced1f583effeece85ca27f310a401c9f
diff --git a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1 b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
index bc66010fba37..8a420168fb5c 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-syntax-coderay-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=915f2aff4e019f932457fe39fc505f23
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.5.0 b/metadata/md5-cache/dev-ruby/launchy-2.5.0
index 5aaa42eedbde..ba4c3cbc3fcb 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.5.0
+++ b/metadata/md5-cache/dev-ruby/launchy-2.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/launchy-2.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dfc43a73d5cdda063515759e1f6021f8
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.5.2 b/metadata/md5-cache/dev-ruby/launchy-2.5.2
index 94b5bf170832..70acdc7b40b1 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.5.2
+++ b/metadata/md5-cache/dev-ruby/launchy-2.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/launchy-2.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=49f732161b64ae7395765ab058b0b043
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
index 38dc621f383d..ab1df39ddd15 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lemon-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2b38ac004f5e574c83a9e43d09d65c79
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.8.0 b/metadata/md5-cache/dev-ruby/letter_opener-1.8.0
index e91b075bd2e1..9c81aba21cd6 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.8.0
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.8.0.tar.gz -> letter_opener-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0a911ec913c1262e7a97ee5f9719c60c
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.8.1 b/metadata/md5-cache/dev-ruby/letter_opener-1.8.1
index 1e81fda4ebc4..d02ef3c12623 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.8.1
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.8.1.tar.gz -> letter_opener-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0a911ec913c1262e7a97ee5f9719c60c
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
index f3480f45b43f..5bb6fb87b918 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/levenshtein-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b4f0cd944611a12f53a146925c75e901
diff --git a/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1 b/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
index 15d0a2b75c0f..4ba58cdb7afc 100644
--- a/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
+++ b/metadata/md5-cache/dev-ruby/libusb-0.6.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/libusb-0.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8f87aee07190d031d2ac978d28865802
diff --git a/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1 b/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
index 4699be3bba72..18f6a0a10358 100644
--- a/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/liquid-4.0.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Shopify/liquid/archive/v4.0.3.tar.gz -> liquid-4.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cc78ec40d6d9c62f130462a1d3924bab
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.0.1 b/metadata/md5-cache/dev-ruby/liquid-5.0.1
index 08a19afa8ea3..8a0c656db818 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.0.1
+++ b/metadata/md5-cache/dev-ruby/liquid-5.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.0.1.tar.gz -> liquid-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8439b1563be269eaf398bac553e9b4be
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.1.0 b/metadata/md5-cache/dev-ruby/liquid-5.1.0
index 4dd0eea393e7..3be068d1a21c 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.1.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.1.0.tar.gz -> liquid-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8d9d73ccaf7e07ccfe46867da8f43edc
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.2.0 b/metadata/md5-cache/dev-ruby/liquid-5.2.0
index abf0df463de2..be2df6cdcfc3 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.2.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.2.0.tar.gz -> liquid-5.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e809a8bfbdb2a55d073ce54a72bd0f4c
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.3.0 b/metadata/md5-cache/dev-ruby/liquid-5.3.0
index 8de257a37c0e..7374eb53d877 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.3.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.3.0.tar.gz -> liquid-5.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e809a8bfbdb2a55d073ce54a72bd0f4c
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.4.0 b/metadata/md5-cache/dev-ruby/liquid-5.4.0
index 9f96874db2f3..a8d3d03ad462 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.4.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.4.0.tar.gz -> liquid-5.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b7c6fa2955a38471a7e69a9f48875bb0
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1 b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
index c50e7d6a2770..5b37294d0f7c 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/liquid-c-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c47a72f1f40e8bea02b822b53756dc45
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.1.0 b/metadata/md5-cache/dev-ruby/liquid-c-4.1.0
index e4e1b0e9d66d..de2ee17f1d44 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.1.0
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/liquid-c-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=92faa52141bbe0dcd8b5ffcd91a8673a
diff --git a/metadata/md5-cache/dev-ruby/listen-3.5.1 b/metadata/md5-cache/dev-ruby/listen-3.5.1
index b9a017d8133e..d7da40b53b80 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.5.1
+++ b/metadata/md5-cache/dev-ruby/listen-3.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.5.1.tar.gz -> listen-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=461543c32d0739b0dd3aa19eb2b92739
diff --git a/metadata/md5-cache/dev-ruby/listen-3.7.1 b/metadata/md5-cache/dev-ruby/listen-3.7.1
index 3d4f2a193bef..6b26d9f1c47b 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.7.1
+++ b/metadata/md5-cache/dev-ruby/listen-3.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.7.1.tar.gz -> listen-3.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9eb8f6b2d685dd23dbf393ddc3f5e1ec
diff --git a/metadata/md5-cache/dev-ruby/listen-3.8.0 b/metadata/md5-cache/dev-ruby/listen-3.8.0
index 1e4c9f260598..830fef021bef 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.8.0
+++ b/metadata/md5-cache/dev-ruby/listen-3.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.8.0.tar.gz -> listen-3.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a784b92982bc69a1dfb080e285f9463d
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
index f16d83bdb07a..c864fa671bbc 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/little-plugger-1.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c80c9f9f7163c657c86abfa12e4456b2
diff --git a/metadata/md5-cache/dev-ruby/llhttp-ffi-0.4.0 b/metadata/md5-cache/dev-ruby/llhttp-ffi-0.4.0
index ed9e295a4215..7f87287dbe3f 100644
--- a/metadata/md5-cache/dev-ruby/llhttp-ffi-0.4.0
+++ b/metadata/md5-cache/dev-ruby/llhttp-ffi-0.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0/0.4
 SRC_URI=https://github.com/metabahn/llhttp/archive/refs/tags/2021-09-09.tar.gz -> llhttp-0.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b3003c4eb5e18fec8a8bffad813fe904
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.3 b/metadata/md5-cache/dev-ruby/locale-2.1.3
index 96f7afd195f1..dada25f860f0 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.3
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.3.tar.gz -> locale-2.1.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bd3feaa1626d2241fdfe2824e1ad3e3a
diff --git a/metadata/md5-cache/dev-ruby/localhost-1.1.9 b/metadata/md5-cache/dev-ruby/localhost-1.1.9
index e54bdc781277..9dde97e5bbee 100644
--- a/metadata/md5-cache/dev-ruby/localhost-1.1.9
+++ b/metadata/md5-cache/dev-ruby/localhost-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/localhost/archive/v1.1.9.tar.gz -> localhost-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=31c2b9ca46e8cc41c9cbbab57e8f802e
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
index 8b5d0a1f0f58..59c28d552f4a 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lockfile-2.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e66efc3be586f59f2d9c660257dd5f62
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
index fafeabfc6c40..52d3ca58f385 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log4r-1.1.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9b6e9c00e21f65553b8db15c9eac1ff5
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.19.1 b/metadata/md5-cache/dev-ruby/loofah-2.19.1
index 44118ad47533..8c269f0d1197 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.19.1
+++ b/metadata/md5-cache/dev-ruby/loofah-2.19.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.19.1.tar.gz -> loofah-2.19.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=422b99d17c89d3ba1ad24fc6f466fd70
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r4 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r4
index d702e5fbb8a4..652205e23be6 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r4
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/loquacious-1.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3a5d036f456275f742be1c92113c0d1e
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
index 18c313ab71fb..8db70973b92d 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.8.tar.gz -> lumberjack-1.2.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=15a56aad0b8c88481a474ef2be045e01
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3-r2 b/metadata/md5-cache/dev-ruby/mab-0.0.3-r2
index 7924e32260e1..9188a7887c1b 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mab-0.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=21cddda6d57462706ae3c069d2302a1b
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1 b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
index aa24d4c1bbeb..13bebd1685e9 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5399893bc074ed83750255693e616a25
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9-r2 b/metadata/md5-cache/dev-ruby/magic-0.2.9-r2
index acb5eb2a30dd..98f2dcffc4f4 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9-r2
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=24d3d825f17abf190c6d3ec6a5d4084a
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.1-r1 b/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
index 1024d2404cde..2ef44123504e 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.7
 SRC_URI=https://github.com/mikel/mail/archive/2.7.1.tar.gz -> mail-2.7.1-git.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=26bc6b522d9c4f5d7a96188198184700
diff --git a/metadata/md5-cache/dev-ruby/mail-2.8.0 b/metadata/md5-cache/dev-ruby/mail-2.8.0
index b5c9eec5485d..01046652f04d 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.8.0
+++ b/metadata/md5-cache/dev-ruby/mail-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://github.com/mikel/mail/archive/2.8.0.tar.gz -> mail-2.8.0-git.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=11bce30021ab5876ea611f2a168a90b1
diff --git a/metadata/md5-cache/dev-ruby/mail-2.8.0.1 b/metadata/md5-cache/dev-ruby/mail-2.8.0.1
index 379db0068c04..e1f564b58c26 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.8.0.1
+++ b/metadata/md5-cache/dev-ruby/mail-2.8.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://github.com/mikel/mail/archive/2.8.0.1.tar.gz -> mail-2.8.0.1-git.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=88b29f8e6c1030e443ea376556a4c8f9
diff --git a/metadata/md5-cache/dev-ruby/mail-2.8.1 b/metadata/md5-cache/dev-ruby/mail-2.8.1
index afe653975160..b97a97d714bc 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mail-2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://github.com/mikel/mail/archive/2.8.1.tar.gz -> mail-2.8.1-git.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=88b29f8e6c1030e443ea376556a4c8f9
diff --git a/metadata/md5-cache/dev-ruby/maildir-2.2.3 b/metadata/md5-cache/dev-ruby/maildir-2.2.3
index 74d8799e9238..08911a8ff0e4 100644
--- a/metadata/md5-cache/dev-ruby/maildir-2.2.3
+++ b/metadata/md5-cache/dev-ruby/maildir-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/maildir-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4d3d43843b826bed2f28dc0f88476b41
diff --git a/metadata/md5-cache/dev-ruby/marcel-1.0.2 b/metadata/md5-cache/dev-ruby/marcel-1.0.2
index 24f8af5855c7..6a8410023998 100644
--- a/metadata/md5-cache/dev-ruby/marcel-1.0.2
+++ b/metadata/md5-cache/dev-ruby/marcel-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/basecamp/marcel/archive/v1.0.2.tar.gz -> marcel-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2d66945fa4546c6d55695300075e37ff
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1 b/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
index addea644a3ac..fcb626c53c50 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/maruku-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fae6ce3282b32613301c2cdd29aa6810
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r3 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
index a33135bf3330..2f511dfec688 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mash-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dc1495d42035d29b050e6b1910e1c570
diff --git a/metadata/md5-cache/dev-ruby/matrix-0.4.2 b/metadata/md5-cache/dev-ruby/matrix-0.4.2
index 2258bcd863f2..04bca9836516 100644
--- a/metadata/md5-cache/dev-ruby/matrix-0.4.2
+++ b/metadata/md5-cache/dev-ruby/matrix-0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/matrix/archive/v0.4.2.tar.gz -> matrix-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8adb2e9d322ea4410ba1070a375c336a
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.7.0 b/metadata/md5-cache/dev-ruby/maxitest-3.7.0
index e81027a660f6..49228d127068 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.7.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.7.0.tar.gz -> maxitest-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c566a087fdfca0f369a6a0cdc14ecdf7
diff --git a/metadata/md5-cache/dev-ruby/maxitest-4.3.0 b/metadata/md5-cache/dev-ruby/maxitest-4.3.0
index 6541f4428720..a11400b37cc1 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-4.3.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-4.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v4.3.0.tar.gz -> maxitest-4.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d07c9c94506d392a6350cb3309d83519
diff --git a/metadata/md5-cache/dev-ruby/maxitest-4.4.0 b/metadata/md5-cache/dev-ruby/maxitest-4.4.0
index 21c2af67fa08..3aa1c916dacf 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-4.4.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-4.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v4.4.0.tar.gz -> maxitest-4.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3621ba1c7a4dd4e78dddadc7628f1835
diff --git a/metadata/md5-cache/dev-ruby/maxitest-4.4.1 b/metadata/md5-cache/dev-ruby/maxitest-4.4.1
index 3341af2cb602..69acc3e08b40 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-4.4.1
+++ b/metadata/md5-cache/dev-ruby/maxitest-4.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v4.4.1.tar.gz -> maxitest-4.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3621ba1c7a4dd4e78dddadc7628f1835
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
index 662eb4f02a52..012a6a3b0751 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
@@ -12,5 +12,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-ruby-0.996.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e5522af7f6acc6505759063d4dbaace5
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.4 b/metadata/md5-cache/dev-ruby/mechanize-2.8.4
index b7e02dfc93a7..163628bb78ad 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.4
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=79a2332d377f6c6cc7b1ec6d1a5186d7
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.5 b/metadata/md5-cache/dev-ruby/mechanize-2.8.5
index ac9b1fea44fe..75de743a1087 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.5
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=79a2332d377f6c6cc7b1ec6d1a5186d7
diff --git a/metadata/md5-cache/dev-ruby/memo_wise-1.6.0 b/metadata/md5-cache/dev-ruby/memo_wise-1.6.0
index 06c8cb47367a..c86e5b3897b3 100644
--- a/metadata/md5-cache/dev-ruby/memo_wise-1.6.0
+++ b/metadata/md5-cache/dev-ruby/memo_wise-1.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/panorama-ed/memo_wise/archive/v1.6.0.tar.gz -> memo_wise-1.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cfa49604500c9e7350ddb1bb41343e24
diff --git a/metadata/md5-cache/dev-ruby/memo_wise-1.7.0 b/metadata/md5-cache/dev-ruby/memo_wise-1.7.0
index d07582e532c0..3b365bd8a623 100644
--- a/metadata/md5-cache/dev-ruby/memo_wise-1.7.0
+++ b/metadata/md5-cache/dev-ruby/memo_wise-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/panorama-ed/memo_wise/archive/v1.7.0.tar.gz -> memo_wise-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e8423d5973e9e1be9f388ff9df553a6a
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.16.2 b/metadata/md5-cache/dev-ruby/memoist-0.16.2
index dc4e92b85bf0..103af85c8c9a 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.16.2
+++ b/metadata/md5-cache/dev-ruby/memoist-0.16.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoist-0.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ed2eb86441c4f08116b50d198ced80fc
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
index 073d83cb4d19..f20a3ccae2ab 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoizable-0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d7fac76bd2891989626bf54ca020fc9a
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
index a75e6d3a79c7..8668feb07aae 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoize-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cd03154c38cfd266d6695937ef199dd1
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.4.0 b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
index a6e4eb9f9b2c..015537ea04d1 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.4.0
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mercenary-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=42a456151bd16190a9a2cd018896d5a4
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
index df063af67643..e09f445ebf12 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7efe596069b4c82020c806c4d0da62e6
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
index 21c5356abdb5..ee88f2d3419b 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7fc4ae66c914eb3b95baa15c1ae4b4e3
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1 b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
index 0e45c6708a8d..3e241eee7084 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/metasm-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3ec67ecf73c2adfdd2f74901c68fafb8
diff --git a/metadata/md5-cache/dev-ruby/method_source-1.0.0 b/metadata/md5-cache/dev-ruby/method_source-1.0.0
index 407dcf42df52..b201502fa47f 100644
--- a/metadata/md5-cache/dev-ruby/method_source-1.0.0
+++ b/metadata/md5-cache/dev-ruby/method_source-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/method_source-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=345edf6244d98b387564d88d0b7ac4bc
diff --git a/metadata/md5-cache/dev-ruby/middleware-0.1.0 b/metadata/md5-cache/dev-ruby/middleware-0.1.0
index c8731ff35c46..10e9e6994038 100644
--- a/metadata/md5-cache/dev-ruby/middleware-0.1.0
+++ b/metadata/md5-cache/dev-ruby/middleware-0.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/middleware-0.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=970cb3602ad87c3a8280bb9fff0da4f3
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.4.1 b/metadata/md5-cache/dev-ruby/mime-types-3.4.1
index a65b0060acc2..24226ecd11b3 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.4.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-3.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e6ff73e27728d77ea53830b0aa7f9411
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
index d943313f7267..79a3be6b1a8d 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2022.0105
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2022.0105.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3cb95bd8962308a3f526e7a535b2e90d
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2023.0218.1 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2023.0218.1
index 26dabfeb0749..0f063d20d8a1 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2023.0218.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2023.0218.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2023.0218.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7ebede1f84016f9be6c337ce6d9b15e0
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
index 10e9842cc0d4..baa2657b8bf1 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.3.10.tar.gz -> mimemagic-0.3.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d8cea8b455708e85d72d76868c1a59e7
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
index 919f29825d5f..70c61916137a 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.3.10.tar.gz -> mimemagic-0.3.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8bb639fca2e58d986d8b04f1ee58cf0f
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3 b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
index 1c594010cfdd..47017e2003cc 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.4.3.tar.gz -> mimemagic-0.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=efcbca3c854049164e3949ccf3ced057
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1 b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
index eedb868671da..c38b52e8ff02 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.4.3.tar.gz -> mimemagic-0.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=45e0ed3cd6dc968e4580860d0b0cfd6f
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1 b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
index 87c322b2ce80..527100400dea 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.11.0.tar.gz -> mini_magick-4.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=659d1f889e96ed33959ae5a76e54caf5
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.12.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.12.0
index a0e211342389..282377d86160 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.12.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.12.0.tar.gz -> mini_magick-4.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=328be1260a2521c68f1feac7c9120861
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
index 545248fab11b..d661a9b3f952 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.3.tar.gz -> mini_mime-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc8267fc90625e5f91550b2fb0eb3b7c
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.1 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
index 61f2a5283ccc..b8d010fa2db7 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.1.tar.gz -> mini_mime-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8c385e14ab7693b86ba291183347c080
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.2 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
index 01a0c6717e8f..f566da5e7deb 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.2.tar.gz -> mini_mime-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dc45a64acd94e5f7248081b0c3b73863
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1 b/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
index 15ffbb8d138c..a1a8bb43d973 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=013b69b95bf66e06b59f42a55dcc009f
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1 b/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
index a7a0017250a2..ae2d854ddc34 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.7
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=18776e09ecb607afdd6a5cec2b781752
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
index e7f89bc93313..e206e8cf4802 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=70381ca36c064fd92beb0f9e0114ad70
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1
index 816ada49866f..41e67b6ae5ce 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=69648394a1a601c3fe6d333c4144e0f2
diff --git a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1 b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
index 40ee85040914..07fc58f05449 100644
--- a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minispec-metadata-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a498bb4aa37c1f97ae58a72b2dee152c
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9 b/metadata/md5-cache/dev-ruby/minitar-0.9
index 0eda14424fca..8df9d0973190 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ffaffcfc927183d811e64794a9922959
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9-r1 b/metadata/md5-cache/dev-ruby/minitar-0.9-r1
index 8a4aa94358e4..9000fcec0b79 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9-r1
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2fe6c55a493cc9fe1217bbd120713eb2
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.13.0 b/metadata/md5-cache/dev-ruby/minitest-5.13.0
index 0c0e6dcde669..2ebb58ce6c76 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.13.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8124596b9eab8ef82e16e1e87916dff4
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.4 b/metadata/md5-cache/dev-ruby/minitest-5.14.4
index 50673c165e86..80b25af908a6 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9317d03b2b4ff7373b40d10c47a9daa0
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.15.0 b/metadata/md5-cache/dev-ruby/minitest-5.15.0
index b8a4eb9c4af6..d5cf20f56613 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.15.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=45826a82dffc65016b38c92964c3dd88
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.2 b/metadata/md5-cache/dev-ruby/minitest-5.16.2
index 6a785ae2ead2..0fefa1d9ec48 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.16.2
+++ b/metadata/md5-cache/dev-ruby/minitest-5.16.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b1fc05d6b7f39093640361d4dfa5cf1d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.3 b/metadata/md5-cache/dev-ruby/minitest-5.16.3
index f8de1b9263ac..c8bc9ef6f818 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.16.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.16.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.16.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5c6534a84dcf12f9f4b26d885b7011c9
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.17.0 b/metadata/md5-cache/dev-ruby/minitest-5.17.0
index 220604da668f..ab322048cf87 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.17.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.17.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ed46568fe06d2574ce7fde9ba45b44a
diff --git a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1 b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
index 7615e6803c94..f2ca0e7b3d4b 100644
--- a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-around-0.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=618a3979484a4eff336d6380c789bd38
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
index 77c09418f9e3..74e7a865ada7 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a5ebab4e2ac4ce36939736bc2e145933
diff --git a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1 b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
index 2526d0441527..fc69c3bde366 100644
--- a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-global_expectations-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f8ce45a5cf4e253a3a869e50d5dfef8d
diff --git a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
index eb4ac9eed3f1..d752645227eb 100644
--- a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-global_expectations-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2ef6a273015b4c7aa226d25b7b64b3a2
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
index 5de6b2236022..e710a37eabd4 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-hooks-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d77c793efe0453c556c02db8498c3c0e
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
index 8ea56a5552ea..1f8b3d4a7e1e 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-power_assert-0.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bdbd9dd28131b0b84875082ffdf5818f
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
index a22380d7528d..6a7e83b62e5b 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bb7b4d1b193c5fcc3bbe7fe21a600d2c
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9 b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
index 1f57bdd8dd7f..60fa07a05b4c 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/v3.0.9.tar.gz -> mixlib-shellout-3.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=234f85fdc7a1aeb858f17da8def1318c
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1 b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
index b4043bb64b8f..8a33fd484498 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.14
 SRC_URI=https://rubygems.org/gems/mocha-0.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=44f7a40fd292fa9e52a493ab2868e8e8
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.13.0 b/metadata/md5-cache/dev-ruby/mocha-1.13.0
index eea365bc8c76..c60647f57ee0 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.13.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.13.0.tar.gz -> mocha-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3c570772cdcf81f2cdc6bfb93d444d28
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.14.0 b/metadata/md5-cache/dev-ruby/mocha-1.14.0
index 7212104b9cf9..b94d39beaf91 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.14.0.tar.gz -> mocha-1.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8ce16f3975ca0a45bc401a492f6751d7
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.15.0 b/metadata/md5-cache/dev-ruby/mocha-1.15.0
index 2d33755a2b0c..03fbbe86de59 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.15.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.15.0.tar.gz -> mocha-1.15.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b61c80e85468d653a1a77fc95d336d39
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.16.0 b/metadata/md5-cache/dev-ruby/mocha-1.16.0
index 2b521df58450..b685ead9ca26 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.16.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.16.0.tar.gz -> mocha-1.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b61c80e85468d653a1a77fc95d336d39
diff --git a/metadata/md5-cache/dev-ruby/mocha-2.0.1 b/metadata/md5-cache/dev-ruby/mocha-2.0.1
index e9da1ae3546e..0cf449ebc79e 100644
--- a/metadata/md5-cache/dev-ruby/mocha-2.0.1
+++ b/metadata/md5-cache/dev-ruby/mocha-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/freerange/mocha/archive/v2.0.1.tar.gz -> mocha-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a63b2cfa9e955f3d417e742a668ca5a7
diff --git a/metadata/md5-cache/dev-ruby/mocha-2.0.2 b/metadata/md5-cache/dev-ruby/mocha-2.0.2
index e50221075c13..1b0c79adb07b 100644
--- a/metadata/md5-cache/dev-ruby/mocha-2.0.2
+++ b/metadata/md5-cache/dev-ruby/mocha-2.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/freerange/mocha/archive/v2.0.2.tar.gz -> mocha-2.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a63b2cfa9e955f3d417e742a668ca5a7
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.1 b/metadata/md5-cache/dev-ruby/moneta-1.4.1
index 98d5277bea09..bd06f3f64077 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.1
+++ b/metadata/md5-cache/dev-ruby/moneta-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.4.1.tar.gz -> moneta-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=77821d333160d60c002e87eacb05f929
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.5.1 b/metadata/md5-cache/dev-ruby/moneta-1.5.1
index 12491aca1c56..07fdac48d557 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.5.1
+++ b/metadata/md5-cache/dev-ruby/moneta-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.5.1.tar.gz -> moneta-1.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=77821d333160d60c002e87eacb05f929
diff --git a/metadata/md5-cache/dev-ruby/mqtt-0.5.0 b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
index 2d7de1f6393f..918d324f3830 100644
--- a/metadata/md5-cache/dev-ruby/mqtt-0.5.0
+++ b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/njh/ruby-mqtt/archive/v0.5.0.tar.gz -> mqtt-0.5.0.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ebdd4c1bf06228ee8c0a1b0f57aec687
diff --git a/metadata/md5-cache/dev-ruby/mqtt-0.6.0 b/metadata/md5-cache/dev-ruby/mqtt-0.6.0
index 4793bcdd2645..9d33c81a0dc1 100644
--- a/metadata/md5-cache/dev-ruby/mqtt-0.6.0
+++ b/metadata/md5-cache/dev-ruby/mqtt-0.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/njh/ruby-mqtt/archive/v0.6.0.tar.gz -> mqtt-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=427a321cd16477450aa937184843c7dd
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.2 b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
index 30367c779a44..a894ab163355 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.2
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2329da581e09bcdf739cb530346da3cb
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.3 b/metadata/md5-cache/dev-ruby/msgpack-1.5.3
index 5bbb78d49801..107900250133 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.3
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2329da581e09bcdf739cb530346da3cb
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.4 b/metadata/md5-cache/dev-ruby/msgpack-1.5.4
index 51623794fc51..a52e92388038 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.4
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4d2247896d02cff042216e4f98031847
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.6 b/metadata/md5-cache/dev-ruby/msgpack-1.5.6
index 207801960ac4..3f8a70cc40ed 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.6
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4d2247896d02cff042216e4f98031847
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.6.0 b/metadata/md5-cache/dev-ruby/msgpack-1.6.0
index ccd2caea9cf2..8054bc77a9d4 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.6.0
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f5253681fc3785c09483c45cc9839bf6
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.15.0 b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
index 01a6785907d3..879b6396ce74 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.15.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.15.0.tar.gz -> multi_json-1.15.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e2fb5b0aa996b845477208ae1ab07246
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
index 3b7a4979b9ee..6db43b471e2e 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ec84829980277d8a7135445e496645c9
diff --git a/metadata/md5-cache/dev-ruby/multi_test-1.1.0 b/metadata/md5-cache/dev-ruby/multi_test-1.1.0
index eb21207e609c..28ae6e553ab1 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-1.1.0
+++ b/metadata/md5-cache/dev-ruby/multi_test-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/multi_test-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=41b64c6d8f73f18926a9002b4c87ca8d
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
index 934b3b96c731..9549e8ab97e1 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=094b78269534e7904e99ab76f38b0e40
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1 b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
index 84f0ae01050d..9d85a0b41402 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multipart-post-2.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bb49e1b555e9e14fe434b574784f129e
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.2.0 b/metadata/md5-cache/dev-ruby/multipart-post-2.2.0
index af0d2a0959fe..4bd3a0cf5718 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.2.0
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/multipart-post/archive/v2.2.0.tar.gz -> multipart-post-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f52131522e52c36d7cdedb154e1b79e0
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.2.2 b/metadata/md5-cache/dev-ruby/multipart-post-2.2.2
index 9efcc12b73ae..c0b438922204 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.2.2
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/multipart-post/archive/v2.2.2.tar.gz -> multipart-post-2.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f52131522e52c36d7cdedb154e1b79e0
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.2.3 b/metadata/md5-cache/dev-ruby/multipart-post-2.2.3
index 52d10f0ca232..2c9d7dd70720 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.2.3
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/multipart-post/archive/v2.2.3.tar.gz -> multipart-post-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0c443b18e623aad0f9d2e3ef8f5fe305
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.2.3-r1 b/metadata/md5-cache/dev-ruby/multipart-post-2.2.3-r1
index d73f3c8b227a..a6be7050f74b 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.2.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/socketry/multipart-post/archive/v2.2.3.tar.gz -> multipart-post-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=54296fbb5fd5dacdf4c9fb20009466fe
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1
index 109e9d449a17..0215865eef9d 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d17f53ba25c840665f9a7a2e2874b1c4
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
index 82131ea3e520..af0fbad743f6 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ac1ff99407334ba71522875601f734b0
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.1.2 b/metadata/md5-cache/dev-ruby/mustermann-1.1.2
index 936817754c1e..c4188625b8ef 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.1.2
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/mustermann-1.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3aa53e4fa1743c0763589a3b9f44ec02
diff --git a/metadata/md5-cache/dev-ruby/mustermann-2.0.2 b/metadata/md5-cache/dev-ruby/mustermann-2.0.2
index f56740ce781f..307b0c1430d0 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-2.0.2
+++ b/metadata/md5-cache/dev-ruby/mustermann-2.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/mustermann-2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d5fd207d525f516b93b8a9ac9f22e55e
diff --git a/metadata/md5-cache/dev-ruby/mustermann-3.0.0 b/metadata/md5-cache/dev-ruby/mustermann-3.0.0
index c42edebf88fc..7b52a1f7e0c7 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-3.0.0
+++ b/metadata/md5-cache/dev-ruby/mustermann-3.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mustermann-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fee158ee965806bbb4023720a5854a7e
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
index bc1e2abf7ee1..222e4f6462a4 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://rubygems.org/gems/mysql2-0.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2ee1cda08464110842bace043b79133c
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920 b/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
index 3dfce3b6fb35..caddb844bdcf 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.3.20210920
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby27 ruby_targets_ruby30 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://github.com/brianmario/mysql2/archive/6652da20010ddfbbe6bceb8e41666d05e512346c.tar.gz -> mysql2-0.5.3.20210920.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0b8b1ffa5be129d4bc411841981a2919
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.4 b/metadata/md5-cache/dev-ruby/mysql2-0.5.4
index 2f4a2047a1e0..df3ea94dc341 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.4
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.4
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby27 ruby_targets_ruby30 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://github.com/brianmario/mysql2/archive/0.5.4.tar.gz -> mysql2-0.5.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7828ccd2e0ad571fef28de53d1b71ca5
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.5 b/metadata/md5-cache/dev-ruby/mysql2-0.5.5
index 6b69b4470c90..e114d0e1e365 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.5
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.5
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby27 ruby_targets_ruby30 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://github.com/brianmario/mysql2/archive/0.5.5.tar.gz -> mysql2-0.5.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f3ac253507b9ed521a58d9741f50c583
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
index 0ba77036706d..0309fc270414 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=840589afa227ccb0586db77ea8476660
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
index f95e83a1590f..4c7ef0bd119b 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c0172debcf58f99e7401bfb6eaf864c2
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
index 2e0c99da4075..09ef5e5c0463 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7619becbf1d5393091eae517a0745a8
diff --git a/metadata/md5-cache/dev-ruby/naught-1.1.0-r1 b/metadata/md5-cache/dev-ruby/naught-1.1.0-r1
index fa103b611706..55f789b39aed 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/naught-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/naught-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4ee64cb2ca7f0e0f5e2630133412fbcc
diff --git a/metadata/md5-cache/dev-ruby/necromancer-0.7.0 b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
index c2f908bc2664..d0342b7314a6 100644
--- a/metadata/md5-cache/dev-ruby/necromancer-0.7.0
+++ b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/necromancer/archive/v0.7.0.tar.gz -> necromancer-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0b3edc397a3c182b5662b5dde9f71a2f
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1 b/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
index f6d695422438..483f18ddeec5 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0722841f903d0392cb57222e82312616
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.9.0 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.9.0
index f4b52026ac5b..1434d728b66c 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.9.0
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/neovim-0.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=15e09822a6abefce4552fa15cc1e0a2c
diff --git a/metadata/md5-cache/dev-ruby/net-ftp-0.1.3 b/metadata/md5-cache/dev-ruby/net-ftp-0.1.3
index 97bf9d05a64f..b25d1946094e 100644
--- a/metadata/md5-cache/dev-ruby/net-ftp-0.1.3
+++ b/metadata/md5-cache/dev-ruby/net-ftp-0.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-ftp/archive/v0.1.3.tar.gz -> net-ftp-0.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=44f596769546ee99cbc1619781c59ee9
diff --git a/metadata/md5-cache/dev-ruby/net-ftp-0.2.0 b/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
index 22cd7922933d..d999230b4239 100644
--- a/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-ftp/archive/v0.2.0.tar.gz -> net-ftp-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1a0ebe73b1b159f15b17ab4646cfb7fb
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
index a687c2dcc6a2..561ff2fb126f 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fd706a3cd80c154674ba44173d3f615c
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
index 686209bb5844..17b7a157b2d2 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/net-http-persistent-3.1.0.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2d4823acda6f39b2a3bac8340d7acefc
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1 b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
index a4415d286899..efaaa9209751 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/net-http-persistent-4.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e4ff974216054b120d6757c3692efd27
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
index 5ddc1f99ba1c..f732c08b3a64 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/net-http-pipeline-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1e44a8dc364e424939fbdc80f60a71e1
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.2.3 b/metadata/md5-cache/dev-ruby/net-imap-0.2.3
index 809a6862306c..550f1b2bd0bc 100644
--- a/metadata/md5-cache/dev-ruby/net-imap-0.2.3
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-imap/archive/v0.2.3.tar.gz -> net-imap-0.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f4aa22faaafe28e7e2339cdf10e5a8d7
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.3.1 b/metadata/md5-cache/dev-ruby/net-imap-0.3.1
index a149470c0216..09f4bd9d50f2 100644
--- a/metadata/md5-cache/dev-ruby/net-imap-0.3.1
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-imap/archive/v0.3.1.tar.gz -> net-imap-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=71093a27814017e2375e0283acf9c220
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.3.4 b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
index ff9d8a63dace..26b0a36ff731 100644
--- a/metadata/md5-cache/dev-ruby/net-imap-0.3.4
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-imap/archive/v0.3.4.tar.gz -> net-imap-0.3.4.tar.gz test? ( https://www.rfc-editor.org/rfc/rfc3454.txt )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=82f2da4fefea191cd1306789d16dea6e
diff --git a/metadata/md5-cache/dev-ruby/net-pop-0.1.1 b/metadata/md5-cache/dev-ruby/net-pop-0.1.1
index c5512619f2fe..429ad87dda24 100644
--- a/metadata/md5-cache/dev-ruby/net-pop-0.1.1
+++ b/metadata/md5-cache/dev-ruby/net-pop-0.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-pop/archive/v0.1.1.tar.gz -> net-pop-0.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0a0bc970e2125136c25926faca586ceb
diff --git a/metadata/md5-cache/dev-ruby/net-pop-0.1.2 b/metadata/md5-cache/dev-ruby/net-pop-0.1.2
index 1d9da4e6471d..f906f286cd0a 100644
--- a/metadata/md5-cache/dev-ruby/net-pop-0.1.2
+++ b/metadata/md5-cache/dev-ruby/net-pop-0.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-pop/archive/v0.1.2.tar.gz -> net-pop-0.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=425f1a3e543b002c54d61eca16379965
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.1.2 b/metadata/md5-cache/dev-ruby/net-protocol-0.1.2
index fed17e7661cb..d6e149a5ef69 100644
--- a/metadata/md5-cache/dev-ruby/net-protocol-0.1.2
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-protocol/archive/v0.1.2.tar.gz -> net-protocol-0.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cd7031a52cfb1f51cfd04c3b26789935
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.1.3 b/metadata/md5-cache/dev-ruby/net-protocol-0.1.3
index 98b55e64c8f6..8f910b33c070 100644
--- a/metadata/md5-cache/dev-ruby/net-protocol-0.1.3
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-protocol/archive/v0.1.3.tar.gz -> net-protocol-0.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=58ab95f03d247cc0ea7f7e567caf024b
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.2.0 b/metadata/md5-cache/dev-ruby/net-protocol-0.2.0
index 66263b604bb6..2a49c584be7b 100644
--- a/metadata/md5-cache/dev-ruby/net-protocol-0.2.0
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-protocol/archive/v0.2.0.tar.gz -> net-protocol-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0d0a2028387021f8945db9585c58e8c0
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.2.1 b/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
index 1029412baeba..a2c7ea67127a 100644
--- a/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-protocol/archive/v0.2.1.tar.gz -> net-protocol-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0d0a2028387021f8945db9585c58e8c0
diff --git a/metadata/md5-cache/dev-ruby/net-scp-3.0.0 b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
index b8075e014219..a2b4f65e63c8 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-scp/archive/v3.0.0.tar.gz -> net-scp-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a1805616700bac41a901f2b0a7022093
diff --git a/metadata/md5-cache/dev-ruby/net-scp-4.0.0 b/metadata/md5-cache/dev-ruby/net-scp-4.0.0
index 8ed5b6ce3f9a..5173d7914c02 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-4.0.0
+++ b/metadata/md5-cache/dev-ruby/net-scp-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-scp/archive/v4.0.0.tar.gz -> net-scp-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=485e013e88dced57de9e4ec720615734
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-4.0.0 b/metadata/md5-cache/dev-ruby/net-sftp-4.0.0
index c46c02d53597..0a4d6127a3fd 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-4.0.0
+++ b/metadata/md5-cache/dev-ruby/net-sftp-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-sftp/archive/v4.0.0.tar.gz -> net-sftp-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=23ebe745b7e5d615cc18b0590a25db08
diff --git a/metadata/md5-cache/dev-ruby/net-smtp-0.3.1 b/metadata/md5-cache/dev-ruby/net-smtp-0.3.1
index 7fcea9263a53..0134dea18997 100644
--- a/metadata/md5-cache/dev-ruby/net-smtp-0.3.1
+++ b/metadata/md5-cache/dev-ruby/net-smtp-0.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-smtp/archive/v0.3.1.tar.gz -> net-smtp-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=79a2b158b1bac44cdab4e642a0278caf
diff --git a/metadata/md5-cache/dev-ruby/net-smtp-0.3.2 b/metadata/md5-cache/dev-ruby/net-smtp-0.3.2
index e988f47f33ed..40fb148a10cb 100644
--- a/metadata/md5-cache/dev-ruby/net-smtp-0.3.2
+++ b/metadata/md5-cache/dev-ruby/net-smtp-0.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-smtp/archive/v0.3.2.tar.gz -> net-smtp-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=79a2b158b1bac44cdab4e642a0278caf
diff --git a/metadata/md5-cache/dev-ruby/net-smtp-0.3.3 b/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
index 5dc568d99be2..52ce6af680de 100644
--- a/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
+++ b/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-smtp/archive/v0.3.3.tar.gz -> net-smtp-0.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=79a2b158b1bac44cdab4e642a0278caf
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2 b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
index b48aafcac94b..415e258bee73 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v6.1.0.tar.gz -> net-ssh-git-6.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=edade429249ed46ba552bdf50a3b4434
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-7.0.1 b/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
index de1706a431b0..010c923af05e 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v7.0.1.tar.gz -> net-ssh-git-7.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3aebf12986cd233b749ca06a94e0d78c
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
index 5c0656dcdb92..21fa043a20db 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bc63069ec1878582cae7b1a5e1a7c274
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
index 10b1c655cb64..2c7675fbebc3 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.2.0.tar.gz -> net-telnet-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c8d7d2fdf71fa0a688442b931316fe0c
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1 b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
index 7a118790a41f..df75eafd0474 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5329abc6aa20ad820f511134299058d8
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1 b/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
index 888128baa762..9197178e661c 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/network_interface-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e5715262502a0fa3e6a22fb592c42095
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
index 7d27efe6cd9b..747a170974f6 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/niceogiri-1.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=361ce9d16376c2e5abcda69fa34782f2
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.8 b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
index f3695ba49821..a1ba7391e835 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.8
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9373e0a583f5943bbe6836d0ef7a6871
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.13.10 b/metadata/md5-cache/dev-ruby/nokogiri-1.13.10
index 56b812d9bd6b..db9d573eb816 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.13.10
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.13.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.13.10.tar.gz -> nokogiri-1.13.10-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9b48e1243709ae2d24f46213a5a6792e
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.14.0 b/metadata/md5-cache/dev-ruby/nokogiri-1.14.0
index 184f9b4d9e07..c10f0ecfea6e 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.14.0
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.14.0.tar.gz -> nokogiri-1.14.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8c457390347ab58a8285f80f26e69968
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.14.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.14.1
index 167793ff8562..6f4e9e000f53 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.14.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.14.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.14.1.tar.gz -> nokogiri-1.14.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8c457390347ab58a8285f80f26e69968
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.14.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.14.2
index 5a9c78272ebe..b822e3d2db3c 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.14.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.14.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.14.2.tar.gz -> nokogiri-1.14.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8c457390347ab58a8285f80f26e69968
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
index 106ff36bce9e..aa460c005b51 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nokogiri-diff-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f98e39d5ca9985de22d711fb9c0e4696
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.10 b/metadata/md5-cache/dev-ruby/oauth-0.5.10
index 88253c5c3a50..c3bc66e42da2 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.10
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.10.tar.gz -> oauth-0.5.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fd7cd38302dbdb0a1c24929b62ca97b9
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.14 b/metadata/md5-cache/dev-ruby/oauth-0.5.14
index 68f2d61cad5a..53dd22195979 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.14
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.14.tar.gz -> oauth-0.5.14.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=44730030e27df0752806f0fb8c1fac06
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.8 b/metadata/md5-cache/dev-ruby/oauth-0.5.8
index e6824b3fc9c8..24803fb150af 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.8
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.8.tar.gz -> oauth-0.5.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b600ec75d8aa010efe52380052d9e59c
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.10 b/metadata/md5-cache/dev-ruby/oauth2-1.4.10
index d3f76ae3bc38..867bb265b4a2 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.10
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth2/archive/v1.4.10.tar.gz -> oauth2-1.4.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=072c618bf1c25e69f992f2b9e5601979
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.7 b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
index cace69f4a2bc..7fb3b720290a 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.7
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.7.tar.gz -> oauth2-1.4.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d54ad2da4786715e455c529415e282cb
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.24.0 b/metadata/md5-cache/dev-ruby/octokit-4.24.0
index d7be1e4a8522..913eaacf3a27 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.24.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.24.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.24.0.tar.gz -> octokit-4.24.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3cf768aedd28987950a1a13e91fe0d1f
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.25.1 b/metadata/md5-cache/dev-ruby/octokit-4.25.1
index 3df175924234..74229a4d8f9a 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.25.1
+++ b/metadata/md5-cache/dev-ruby/octokit-4.25.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.25.1.tar.gz -> octokit-4.25.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d7cf6d39efe39fe561bf7e24f5f668ca
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.1.0 b/metadata/md5-cache/dev-ruby/omniauth-2.1.0
index 5336ad8b7bc7..fae9ac7af159 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-2.1.0
+++ b/metadata/md5-cache/dev-ruby/omniauth-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/intridea/omniauth/archive/v2.1.0.tar.gz -> omniauth-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bc23fd3d1dc7e50fdab520fa59454c7d
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.1.1 b/metadata/md5-cache/dev-ruby/omniauth-2.1.1
index 3c7163854ef9..b1cf588fd5fc 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-2.1.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-2.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/omniauth/omniauth/archive/v2.1.1.tar.gz -> omniauth-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=80ce381bdc75253b0af1d222c3c5bed3
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4-r1 b/metadata/md5-cache/dev-ruby/open4-1.3.4-r1
index 4c24c1f65dd5..be9d23f68503 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/open4-1.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=103d46572d84279267e5921d32f8380e
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
index 53ed10b9db6a..d453f931bd31 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.2.2
 SRC_URI=https://rubygems.org/gems/openssl-ccm-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=875e989ac26aa458b7d3cdd6aa5d1108
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.3 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.3
index 21a026f68f60..194fe11050fa 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.3
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.2.3
 SRC_URI=https://rubygems.org/gems/openssl-ccm-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=875e989ac26aa458b7d3cdd6aa5d1108
diff --git a/metadata/md5-cache/dev-ruby/optimist-3.0.1 b/metadata/md5-cache/dev-ruby/optimist-3.0.1
index 0e138a214718..b53d5b12cd05 100644
--- a/metadata/md5-cache/dev-ruby/optimist-3.0.1
+++ b/metadata/md5-cache/dev-ruby/optimist-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/optimist-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dfad935f2eec0806c1fbf9d0c01ff418
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1 b/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
index a4d9b086c4ea..f72c21729e82 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/optionable-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=74aea0f8fdc5eda59051d98808541e53
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
index abd63798bc8b..9cb8468bc6cc 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7b0007a128d2fa69d4498acf093bce3a
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.11 b/metadata/md5-cache/dev-ruby/ox-2.14.11
index 68f050b42462..6f2e6df8509c 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.11
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.11.tar.gz -> ox-2.14.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8fdc0b558b9ec0ed1384ee6bc5c364a0
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.12 b/metadata/md5-cache/dev-ruby/ox-2.14.12
index 9cc705a6b6e2..055d93b47732 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.12
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.12
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.12.tar.gz -> ox-2.14.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ac24d392eeec8c0d9d1cc62019b07aa5
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.13 b/metadata/md5-cache/dev-ruby/ox-2.14.13
index 96b6f2880123..83afc969402b 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.13
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.13
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.13.tar.gz -> ox-2.14.13.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0d7c01eb52556731fcf34b791ff2e174
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.14 b/metadata/md5-cache/dev-ruby/ox-2.14.14
index 2c91885e55c4..8dc3161ce6ad 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.14
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.14.tar.gz -> ox-2.14.14.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0d7c01eb52556731fcf34b791ff2e174
diff --git a/metadata/md5-cache/dev-ruby/paint-2.2.1 b/metadata/md5-cache/dev-ruby/paint-2.2.1
index 73685b4dce24..5f1d0683c245 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.2.1
+++ b/metadata/md5-cache/dev-ruby/paint-2.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.2.1.tar.gz -> paint-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=73d59dc3f97bfb54ed7b10878aa5cc0e
diff --git a/metadata/md5-cache/dev-ruby/paint-2.3.0 b/metadata/md5-cache/dev-ruby/paint-2.3.0
index 3d73f3646a67..0745c1569f8e 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.3.0
+++ b/metadata/md5-cache/dev-ruby/paint-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.3.0.tar.gz -> paint-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=73d59dc3f97bfb54ed7b10878aa5cc0e
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.22.1 b/metadata/md5-cache/dev-ruby/parallel-1.22.1
index 0cd9c98315ce..ffee5c8422ea 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.22.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.22.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.22.1.tar.gz -> parallel-1.22.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=72faa8249bb9356c3b723a0eea6c7c12
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
index 9c1814e4f2a7..25b860117c0c 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eb1c3b74530dc318685479a20bfceba5
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
index e314a1d4d169..06555149849c 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4813e5af95324157fdcb85d23cded044
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.1.0 b/metadata/md5-cache/dev-ruby/parser-3.1.1.0
index 31cad649aa46..2d7535a7ce53 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.1.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.1.0.tar.gz -> parser-3.1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.2.0 b/metadata/md5-cache/dev-ruby/parser-3.1.2.0
index b9c04f9cb05b..db3735059fc1 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.2.0.tar.gz -> parser-3.1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.2.1 b/metadata/md5-cache/dev-ruby/parser-3.1.2.1
index 3d6d7d1ef8c4..d8b235ecdd63 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.2.1
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.2.1.tar.gz -> parser-3.1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4db970d803de2b0c7bc92397124d54e0
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.3.0 b/metadata/md5-cache/dev-ruby/parser-3.1.3.0
index 63dce78f76f1..e2e92a7e469a 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.3.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.3.0.tar.gz -> parser-3.1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4db970d803de2b0c7bc92397124d54e0
diff --git a/metadata/md5-cache/dev-ruby/parser-3.2.0.0 b/metadata/md5-cache/dev-ruby/parser-3.2.0.0
index ac84aab95278..eef5623a514c 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.2.0.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.2.0.0.tar.gz -> parser-3.2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6391bba9dd412bd3f162bfeaf17e5ddd
diff --git a/metadata/md5-cache/dev-ruby/parser-3.2.1.0 b/metadata/md5-cache/dev-ruby/parser-3.2.1.0
index a01b46e8ff17..6429d209b56c 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.2.1.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.2.1.0.tar.gz -> parser-3.2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6391bba9dd412bd3f162bfeaf17e5ddd
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.8.0 b/metadata/md5-cache/dev-ruby/pastel-0.8.0
index 5c6a5a477890..5269f1a635f3 100644
--- a/metadata/md5-cache/dev-ruby/pastel-0.8.0
+++ b/metadata/md5-cache/dev-ruby/pastel-0.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.8.0.tar.gz -> pastel-0.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cce0b02aa83ad133ce225ea3b655f96e
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.1.0 b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
index fb6ca992424e..dcfe09564598 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.1.0
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/path_expander-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3ab5ccb7bf9c9ed9f2de854d681b41fb
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.1.1 b/metadata/md5-cache/dev-ruby/path_expander-1.1.1
index 932be4b56a78..253e2a080ee5 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.1.1
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/path_expander-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=490e902121c3af5e03c98dc1b54cc625
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.16.2 b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
index 52e3172504c3..b8d059e994b5 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.16.2
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/pathutil/archive/v0.16.2.tar.gz -> pathutil-0.16.2.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2773ee4d8a0940af16e09e628959d21b
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
index ec21f975d50b..463fa0e39e49 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4d98a3500dc0e3ba5ef585864a1c4552
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.13.1 b/metadata/md5-cache/dev-ruby/pcaprub-0.13.1
index ee3997506364..7f57d86828c4 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.13.1
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.13.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0.13
 SRC_URI=https://rubygems.org/gems/pcaprub-0.13.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f422acf74dd9f7222ab9888e78686c1f
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
index 5a0fc5145e32..bdc8055d8cf1 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.9.0.tar.gz -> pdf-core-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a598fffc7e2f4b9264ee2ca12245a956
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
index 06af2a0b0a13..43be61edd8f6 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pdf-inspector-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=92bb57c1735e9f7a655832547bab7ba7
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
index 4434df9f71ce..b4774c21c3a3 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=61202f5c65127c5a5d649b40fc586a69
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
index d414251652f5..996a84e09fb6 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.10.0.tar.gz -> pdf-reader-2.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ac676146b053884b5c4cfb297d143eb7
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.11.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.11.0
index 3c1f90879c9b..8e59018afe01 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.11.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.11.0.tar.gz -> pdf-reader-2.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=452c86a540d354efb683a26769f71124
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
index 7bab23f35148..4d4ea7fb0867 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/permutation-0.1.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2d39ef77dbcdd9e24c729744af41686f
diff --git a/metadata/md5-cache/dev-ruby/pg-1.3.5 b/metadata/md5-cache/dev-ruby/pg-1.3.5
index 6132fe53804b..eb2926b7fa10 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.3.5
+++ b/metadata/md5-cache/dev-ruby/pg-1.3.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ged/ruby-pg/archive/v1.3.5.tar.gz -> pg-1.3.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ae5fd8c1908750632673ee745941ea92
diff --git a/metadata/md5-cache/dev-ruby/pg-1.4.1 b/metadata/md5-cache/dev-ruby/pg-1.4.1
index aaa9084bdb81..7be5487f5363 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pg-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ged/ruby-pg/archive/v1.4.1.tar.gz -> pg-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e7f15b8e92ae958af2bb655e13132aae
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
index 8293e68f88ee..4b8b53bbe654 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.0.9
 SRC_URI=https://rubygems.org/gems/pg_array_parser-0.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=728ee6f22c8ab109920d14ae953eb62a
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.9 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.9
index bcb305b93242..9c761b2d47c8 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.9
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6fe65e85a3353bb94ab73286452d637c
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.5.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
index 134bcc9e5058..a3feb2e2b8cc 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a764f8eb57e01b203dffee41745dc3bd
diff --git a/metadata/md5-cache/dev-ruby/plist-3.6.0 b/metadata/md5-cache/dev-ruby/plist-3.6.0
index 4d43c4ba0e95..48bf0cd3385c 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.6.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.6.0.tar.gz -> plist-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3cb10d88689c7544b92912cfa55bef96
diff --git a/metadata/md5-cache/dev-ruby/plist-3.7.0 b/metadata/md5-cache/dev-ruby/plist-3.7.0
index d7961dbe29b0..f9475a5c49d7 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.7.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.7.0.tar.gz -> plist-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b391538de03274d457e1163e0382575b
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
index 3fb0351a52cf..4a2143849241 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6f138e10f675e9d31eb1117f97789470
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
index 496bd04dc03e..03c5ab31f766 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/podcast-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e445c45fa3d637501b81bb79d402462a
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
index 825c5c7f11c8..3bb4231f7b63 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/polyglot-0.3.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a553ec18f77e42931fbf4411b5fc49ec
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.7 b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
index 1ba5e866a9dd..52434b28a6e3 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.7
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.7.tar.gz -> power_assert-1.1.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b01c7376d047a656c1f9f137fdf2b8c7
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.2.0 b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
index cb0669dd61a9..8b0ce460ca9d 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.2.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v1.2.0.tar.gz -> power_assert-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1eb317142440695aef3304b2d7f60a58
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.0 b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
index 0ca3a091ca3a..fd1d43559ca4 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.0.tar.gz -> power_assert-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=202b4d3644cd1db5af8af0040e8b4c6f
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.1 b/metadata/md5-cache/dev-ruby/power_assert-2.0.1
index 4ef48c4622bf..22eb07892b85 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.1.tar.gz -> power_assert-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7afc6bbf41a61ea8f2fa1c2e67a970ad
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.2 b/metadata/md5-cache/dev-ruby/power_assert-2.0.2
index a88d8cadf854..c02b0d296f94 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.2
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.2.tar.gz -> power_assert-2.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59b2a9b441bd7e331bc7fc823d49993f
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.3 b/metadata/md5-cache/dev-ruby/power_assert-2.0.3
index ae81bb57a630..957e4e386c8e 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.3
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.3.tar.gz -> power_assert-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59b2a9b441bd7e331bc7fc823d49993f
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.4.0 b/metadata/md5-cache/dev-ruby/prawn-2.4.0
index 77d48856527e..9f274bc0eacf 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.4.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.4.0.tar.gz -> prawn-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1edcdd17eeac836fe2a283d8ac9626a0
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
index ec022a53cc85..bff6a9f55c8b 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/prawn-table-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e9f678d5fd6baa991c235766e47e2a4c
diff --git a/metadata/md5-cache/dev-ruby/prime-0.1.2 b/metadata/md5-cache/dev-ruby/prime-0.1.2
index 2f6da7b78329..166613cccb77 100644
--- a/metadata/md5-cache/dev-ruby/prime-0.1.2
+++ b/metadata/md5-cache/dev-ruby/prime-0.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/prime/archive/v0.1.2.tar.gz -> prime-0.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ba904a5e8ca30af6b3786c305a63d043
diff --git a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1 b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
index ae0a3a284b49..4dd3b97c7fa0 100644
--- a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/prime/archive/v0.1.2.tar.gz -> prime-0.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3270ca105db0d469e5feb650bfb7c5a3
diff --git a/metadata/md5-cache/dev-ruby/propshaft-0.6.1 b/metadata/md5-cache/dev-ruby/propshaft-0.6.1
index b85d512951ab..4d6eafc8f49b 100644
--- a/metadata/md5-cache/dev-ruby/propshaft-0.6.1
+++ b/metadata/md5-cache/dev-ruby/propshaft-0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/propshaft/archive/v0.6.1.tar.gz -> propshaft-0.6.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ccf16070c5ea39308831ffae3de373b9
diff --git a/metadata/md5-cache/dev-ruby/propshaft-0.6.4 b/metadata/md5-cache/dev-ruby/propshaft-0.6.4
index 2220565dc285..499f6b5abb95 100644
--- a/metadata/md5-cache/dev-ruby/propshaft-0.6.4
+++ b/metadata/md5-cache/dev-ruby/propshaft-0.6.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/propshaft/archive/v0.6.4.tar.gz -> propshaft-0.6.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=adbbddfe1448848bb85177c94af82cb1
diff --git a/metadata/md5-cache/dev-ruby/pry-0.14.1 b/metadata/md5-cache/dev-ruby/pry-0.14.1
index 27c8a2152422..952272626cc6 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.14.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.14.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.14.1.tar.gz -> pry-0.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5c0e256505feb6add20c17c5bfb0f49a
diff --git a/metadata/md5-cache/dev-ruby/pry-0.14.2 b/metadata/md5-cache/dev-ruby/pry-0.14.2
index 8792bd71aada..937ac940d97f 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.14.2
+++ b/metadata/md5-cache/dev-ruby/pry-0.14.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.14.2.tar.gz -> pry-0.14.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=302eaf8772fc6b5a9bf9ed437d0fd438
diff --git a/metadata/md5-cache/dev-ruby/psych-4.0.6 b/metadata/md5-cache/dev-ruby/psych-4.0.6
index 4e0c20f83ba8..15897614448d 100644
--- a/metadata/md5-cache/dev-ruby/psych-4.0.6
+++ b/metadata/md5-cache/dev-ruby/psych-4.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/psych-4.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5963a923a84e6436d48de31650dbf447
diff --git a/metadata/md5-cache/dev-ruby/psych-5.0.1 b/metadata/md5-cache/dev-ruby/psych-5.0.1
index 20b056d39a82..e89e77864cf8 100644
--- a/metadata/md5-cache/dev-ruby/psych-5.0.1
+++ b/metadata/md5-cache/dev-ruby/psych-5.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/psych-5.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5295558a7d1a145ff20618a532896572
diff --git a/metadata/md5-cache/dev-ruby/psych-5.0.2 b/metadata/md5-cache/dev-ruby/psych-5.0.2
index b801907f1285..13df70b114c9 100644
--- a/metadata/md5-cache/dev-ruby/psych-5.0.2
+++ b/metadata/md5-cache/dev-ruby/psych-5.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/psych-5.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f97269080231b56e35e2544a70f352ad
diff --git a/metadata/md5-cache/dev-ruby/psych-5.1.0 b/metadata/md5-cache/dev-ruby/psych-5.1.0
index b288e94da6e7..eb2e6ff386f4 100644
--- a/metadata/md5-cache/dev-ruby/psych-5.1.0
+++ b/metadata/md5-cache/dev-ruby/psych-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/psych-5.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f97269080231b56e35e2544a70f352ad
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
index fcc5db9089bd..9eca1a9030d1 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=befd869c2768a89a65597ff165e01ecf
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.7 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.7
index c729829c9fb8..e46184309879 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.7
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=61f0dff98a98df8612cbe2c04cf42c99
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-5.0.0 b/metadata/md5-cache/dev-ruby/public_suffix-5.0.0
index fb18282495f1..64218acb0e4c 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-5.0.0
+++ b/metadata/md5-cache/dev-ruby/public_suffix-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/public_suffix-5.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d43553dbfa9a7907c4b8526cbe097145
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-5.0.1 b/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
index b5a280fd824f..64e20273fb7e 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
+++ b/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/public_suffix-5.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d43553dbfa9a7907c4b8526cbe097145
diff --git a/metadata/md5-cache/dev-ruby/pundit-2.2.0 b/metadata/md5-cache/dev-ruby/pundit-2.2.0
index 4ba76c449d77..19a3cc9371a4 100644
--- a/metadata/md5-cache/dev-ruby/pundit-2.2.0
+++ b/metadata/md5-cache/dev-ruby/pundit-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/pundit-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7c75000b139683429d34adc21829c4a4
diff --git a/metadata/md5-cache/dev-ruby/pundit-2.3.0 b/metadata/md5-cache/dev-ruby/pundit-2.3.0
index ca865f1cd8aa..671720de5cf0 100644
--- a/metadata/md5-cache/dev-ruby/pundit-2.3.0
+++ b/metadata/md5-cache/dev-ruby/pundit-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/pundit-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7c75000b139683429d34adc21829c4a4
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0 b/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
index d465c98f03ee..ad5749361e52 100644
--- a/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/puppet_forge-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=80897aec5d3e53ffeb01020d32cd48f5
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
index 35e9f1823610..634ce0ff22df 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pusher-client-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=76b5e738b805c7c340ef299f364e8537
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2-r1 b/metadata/md5-cache/dev-ruby/qed-2.9.2-r1
index 94b37b4ef388..7e6540bb8432 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/qed-2.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=73da0c905f61ebe986490bd66f885499
diff --git a/metadata/md5-cache/dev-ruby/racc-1.6.0 b/metadata/md5-cache/dev-ruby/racc-1.6.0
index 36eac101f608..be96cde9adea 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.6.0
+++ b/metadata/md5-cache/dev-ruby/racc-1.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.6.0.tar.gz -> racc-1.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8d507bcdc59461d61ba159d8e9a62cd9
diff --git a/metadata/md5-cache/dev-ruby/racc-1.6.1 b/metadata/md5-cache/dev-ruby/racc-1.6.1
index 7cb8260d6f54..a8b998d1d103 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.6.1
+++ b/metadata/md5-cache/dev-ruby/racc-1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.6.1.tar.gz -> racc-1.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a4d034199363ef2de7a31d3a78db582b
diff --git a/metadata/md5-cache/dev-ruby/racc-1.6.2 b/metadata/md5-cache/dev-ruby/racc-1.6.2
index d894689c4192..fb6e5fd828b4 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.6.2
+++ b/metadata/md5-cache/dev-ruby/racc-1.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.6.2.tar.gz -> racc-1.6.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a4d034199363ef2de7a31d3a78db582b
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.4 b/metadata/md5-cache/dev-ruby/rack-2.2.4
deleted file mode 100644
index 641801a0febf..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-2.2.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] =dev-ruby/psych-4*[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby30(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby30(-)] =dev-ruby/psych-4*[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby31(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby31(-)] =dev-ruby/psych-4*[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A modular Ruby webserver interface
-EAPI=8
-HOMEPAGE=https://github.com/rack/rack
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) !!<dev-ruby/rack-2.0.8-r1:2.0 !!<dev-ruby/rack-2.1.1-r1:2.1 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2.2
-SRC_URI=https://github.com/rack/rack/archive/2.2.4.tar.gz -> rack-2.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=10642e9182c41ba8720aeda02cd4b0b6
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.5 b/metadata/md5-cache/dev-ruby/rack-2.2.5
deleted file mode 100644
index 9f2e81840c17..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-2.2.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] =dev-ruby/psych-4*[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby30(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby30(-)] =dev-ruby/psych-4*[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby31(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby31(-)] =dev-ruby/psych-4*[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A modular Ruby webserver interface
-EAPI=8
-HOMEPAGE=https://github.com/rack/rack
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) !!<dev-ruby/rack-2.1.1-r1:2.1 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2.2
-SRC_URI=https://github.com/rack/rack/archive/v2.2.5.tar.gz -> rack-2.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6959624b8788758efca51ef033136576
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.6.2 b/metadata/md5-cache/dev-ruby/rack-2.2.6.2
index 387048676bdc..55a76bced1cb 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.6.2
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/v2.2.6.2.tar.gz -> rack-2.2.6.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=06f87ca3e22308f420ec3a45815b5831
diff --git a/metadata/md5-cache/dev-ruby/rack-3.0.3 b/metadata/md5-cache/dev-ruby/rack-3.0.3
deleted file mode 100644
index e12c446a2ade..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-3.0.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A modular Ruby webserver interface
-EAPI=8
-HOMEPAGE=https://github.com/rack/rack
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3.0
-SRC_URI=https://github.com/rack/rack/archive/v3.0.3.tar.gz -> rack-3.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=35d173875d98a8e2841c1a4da08553b6
diff --git a/metadata/md5-cache/dev-ruby/rack-3.0.4.1 b/metadata/md5-cache/dev-ruby/rack-3.0.4.1
index 7f94295bcf21..d711301b8327 100644
--- a/metadata/md5-cache/dev-ruby/rack-3.0.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-3.0.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/rack/rack/archive/v3.0.4.1.tar.gz -> rack-3.0.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=35d173875d98a8e2841c1a4da08553b6
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.6.1 b/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
index 6f72e0bb1ad3..1e4c236c9f31 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=71e2ed8530f8377b21c09edcc4ea76cb
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.13.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
index 6b86ec985a6b..1301494c5de2 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.13.0.tar.gz -> rack-cache-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7a199c9160e107c49527a2c5e6b3ff54
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
index b40597e9d61f..5d19e31d71ed 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9779bdb1011cf774e6179b3a3d73be4a
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.2.3 b/metadata/md5-cache/dev-ruby/rack-protection-2.2.3
index 6a12927bf397..8d6102a2c7c7 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.2.3
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rack-protection-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=88651b643745e19826b0ac0cdb0dd79d
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-3.0.1 b/metadata/md5-cache/dev-ruby/rack-protection-3.0.1
index 8bc14b494646..15f91f0739cc 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-3.0.1
+++ b/metadata/md5-cache/dev-ruby/rack-protection-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rack-protection-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=781190f392884bbb77f98d9f1104c499
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-3.0.2 b/metadata/md5-cache/dev-ruby/rack-protection-3.0.2
index 3162ca6edcbf..fb535d5981c5 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-3.0.2
+++ b/metadata/md5-cache/dev-ruby/rack-protection-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rack-protection-3.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=781190f392884bbb77f98d9f1104c499
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-3.0.4 b/metadata/md5-cache/dev-ruby/rack-protection-3.0.4
index 2a032f4c93d1..0c12f1e39c6b 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-3.0.4
+++ b/metadata/md5-cache/dev-ruby/rack-protection-3.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rack-protection-3.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=781190f392884bbb77f98d9f1104c499
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-3.0.5 b/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
index 7a699dafe513..043137a32dec 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
+++ b/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rack-protection-3.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4a36b74eae173dc90ab007f72edc6286
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1 b/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
index ca8e4cf4e4a4..538c555d75cb 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.1.0.tar.gz -> rack-test-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=981ab683062588451c81c5e157beebab
diff --git a/metadata/md5-cache/dev-ruby/rack-test-2.0.2 b/metadata/md5-cache/dev-ruby/rack-test-2.0.2
index 6cb48f1711b5..0b7b48e03253 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-2.0.2
+++ b/metadata/md5-cache/dev-ruby/rack-test-2.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rack-test/rack-test/archive/v2.0.2.tar.gz -> rack-test-2.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=39c08e66e28e4e548a03cae5ce000803
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.5-r1 b/metadata/md5-cache/dev-ruby/radius-0.7.5-r1
index 1a526b0070e9..aa0f9e2eed25 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.5-r1
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/radius-0.7.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=570746d066a13e4e177b29cf058b834b
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.8.1 b/metadata/md5-cache/dev-ruby/rails-5.2.8.1
index fdcd73481d23..dde9b1e02fa7 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://rubygems.org/gems/rails-5.2.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8fe1b7ac9eb2a91c2916686056f12b5c
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.5.1 b/metadata/md5-cache/dev-ruby/rails-6.0.5.1
index 5a9d7fa2d568..8a13832d1437 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/rails-6.0.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d4e9505c62dd22a5dac3cd8e1aa88c82
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.6.1 b/metadata/md5-cache/dev-ruby/rails-6.0.6.1
index f56b12515708..214ebdffc294 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/rails-6.0.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5e4e59905abd2ae6a27dc8ee5459812e
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.6.1 b/metadata/md5-cache/dev-ruby/rails-6.1.6.1
index 5e32ebe17c7b..799251392c04 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1e8420f07c9e57a507b6816cb8bf6bc2
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.7 b/metadata/md5-cache/dev-ruby/rails-6.1.7
index 03f35948fae1..33d0d966e17f 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.7
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ce75910e521afaa212e47259255e86c9
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.7.2 b/metadata/md5-cache/dev-ruby/rails-6.1.7.2
index e44e24199206..90c4cba2bac5 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=41a7835663cbd84417ebfc869976e0fe
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.4 b/metadata/md5-cache/dev-ruby/rails-7.0.4
index 412f974593cf..7b56909e8de2 100644
--- a/metadata/md5-cache/dev-ruby/rails-7.0.4
+++ b/metadata/md5-cache/dev-ruby/rails-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://rubygems.org/gems/rails-7.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5b091bfa95b1cd72d318134a844e3a29
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.4.2 b/metadata/md5-cache/dev-ruby/rails-7.0.4.2
index fcdd4a6ab8e1..51fd1e9a2b01 100644
--- a/metadata/md5-cache/dev-ruby/rails-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/rails-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://rubygems.org/gems/rails-7.0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5b091bfa95b1cd72d318134a844e3a29
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
index 9bfd6cba03e2..f602b586ec5b 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rails-dom-testing-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3a389e304adb4e83ddfe5602a2e4da68
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.4 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.4
index 98415cdae36e..01499c5bed7e 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.4
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=51a2a7bac82adc0b31e52251188ff7da
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.5.0 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.5.0
index ef949ebcf325..774ed58b4f5d 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.5.0
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5223aa987b11784e5e35bdb42ef05132
diff --git a/metadata/md5-cache/dev-ruby/railties-5.2.8.1 b/metadata/md5-cache/dev-ruby/railties-5.2.8.1
index 1168440d8cf3..6d0782173516 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.2.8.1
+++ b/metadata/md5-cache/dev-ruby/railties-5.2.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.1.tar.gz -> rails-5.2.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cb9e1cf1620ec4505f22e4441fb80a3d
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.5.1 b/metadata/md5-cache/dev-ruby/railties-6.0.5.1
index a14243d9d732..ecdc050b66fc 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.5.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.1.tar.gz -> rails-6.0.5.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c1100d16925d397214459291b96cbdb6
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.6.1 b/metadata/md5-cache/dev-ruby/railties-6.0.6.1
index 7bd2ae0113ad..623de74b18c8 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.6.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ceccc29a612e3f1424836f8522ddb252
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.6.1 b/metadata/md5-cache/dev-ruby/railties-6.1.6.1
index 818e8d367139..088945ddd833 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.6.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6e66ceba211676eb1c14285730c2d60a
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.7 b/metadata/md5-cache/dev-ruby/railties-6.1.7
index a2fb561aa263..9f323afb3f26 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.7
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.tar.gz -> rails-6.1.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=323aaf4b718b77c8b1b639f10389107a
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.7.2 b/metadata/md5-cache/dev-ruby/railties-6.1.7.2
index 52bf13ba6e49..50b58072b15a 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.7.2
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=47c120c59e448798fcbd99a119a771a9
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.4 b/metadata/md5-cache/dev-ruby/railties-7.0.4
index b14035347a91..10f28e489879 100644
--- a/metadata/md5-cache/dev-ruby/railties-7.0.4
+++ b/metadata/md5-cache/dev-ruby/railties-7.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.tar.gz -> rails-7.0.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=191dd9e26bebea3e62f0462ee88436cf
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.4.2 b/metadata/md5-cache/dev-ruby/railties-7.0.4.2
index d71ec9d6cde3..f0f86cb8daf5 100644
--- a/metadata/md5-cache/dev-ruby/railties-7.0.4.2
+++ b/metadata/md5-cache/dev-ruby/railties-7.0.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
 SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=191dd9e26bebea3e62f0462ee88436cf
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.0.0 b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
index a03298eda0f3..3ac5bf2adc5f 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-3.0.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sickill/rainbow/archive/v3.0.0.tar.gz -> rainbow-git-3.0.0.tgz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b2ed6ab41078bcb1cc281870c9d8fc7d
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.1.1 b/metadata/md5-cache/dev-ruby/rainbow-3.1.1
index 3615d972165f..de2b15f5a73c 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-3.1.1
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sickill/rainbow/archive/v3.1.1.tar.gz -> rainbow-git-3.1.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b211376ebbbb70f9070ad1df1a6cebac
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1 b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
index c18da89fb3b1..a122d360aa0b 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.3.tar.gz -> rake-13.0.3.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c35578a5f46cdd37d953a0fc759f69a4
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.4 b/metadata/md5-cache/dev-ruby/rake-13.0.4
index 79412f83c23d..87125f1d08c2 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.4
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.4.tar.gz -> rake-13.0.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f1f8dc5748b050b972f5456415f01792
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.6 b/metadata/md5-cache/dev-ruby/rake-13.0.6
index 8bcd2f23efcc..467f445680f2 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.6.tar.gz -> rake-13.0.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e5eaf48595aefb8600a6c6582211e3fa
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.6-r1 b/metadata/md5-cache/dev-ruby/rake-13.0.6-r1
index 8afa7ec1dff4..e55eabf1efac 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.6.tar.gz -> rake-13.0.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=42e30d7e06f60c6e315ed0a48a97add3
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
index 42be60b168ae..214ba84da7c4 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d7ccb16dc3a5618953172bd12ad3d122
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
index 00e4f8dd7ae7..2eb0b1a21735 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.3.tar.gz -> rake-compiler-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=31851b496f8eb76cda1254bc52782e40
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
index 09ea68ab8f26..2443f142fe0c 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.9.tar.gz -> rake-compiler-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=14f3e9e1f6afc534f59e79f83d38eed2
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0 b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
index f88acde40ef6..183a81757fcb 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.2.0.tar.gz -> rake-compiler-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f5185189cddcaf46037e69549a1f70aa
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.2.1 b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.1
index 920d28d4117f..02ea48c763f3 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.2.1.tar.gz -> rake-compiler-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9fb38a542aa4b3bd9ed1e9edf08a159d
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
index 8d233427d066..61adfb77e5d9 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rake-remote_task-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=be6a111f58bac513159dbcbefa1e1680
diff --git a/metadata/md5-cache/dev-ruby/rantly-2.0.0 b/metadata/md5-cache/dev-ruby/rantly-2.0.0
index cdf56cff73a8..85bb5090aa6b 100644
--- a/metadata/md5-cache/dev-ruby/rantly-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rantly-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rantly-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=936d5bd074dc7505e4f48f6122567bff
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.12 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
index fa0c348e3ddc..119d446cddb4 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.12
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rash_alt-0.4.12.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=88f73a34895242c3f52a3f831670235c
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1 b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
index 4ef6ea5195f5..45fd029b225f 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gsl-2.1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a683a6196d47d1a410a9d2617dfe0943
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
index 592e0e849e15..9d255d1c7fa9 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-inotify-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5819c2b71865cb104c8a4c1d445367b3
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
index 576d671aa69a..261e2bf36850 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-readline-0.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=58d81e41535689bedfbc84838e5ddf96
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1 b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
index 8800c32f3206..f1db2e403ed1 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rbnacl-7.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d4934ca7c7591662375fb0de9e3e07ec
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2 b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
index b010b617d938..b68e1e618f72 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naitoh/rbpdf/archive/1.20.1.tar.gz -> rbpdf-1.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ecd4de46d6431e9908e2c2533d371c86
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.21.0 b/metadata/md5-cache/dev-ruby/rbpdf-1.21.0
index ee9ff8118c82..903aad8b5c9b 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.21.0
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naitoh/rbpdf/archive/1.21.0.tar.gz -> rbpdf-1.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6d125a66e667e7295f9e6e28eacf7ec0
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
index 58d631b970ce..79ff4c4c95f5 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbpdf-font-1.19.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=101b918e177134a787610a09af68d633
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.5.1 b/metadata/md5-cache/dev-ruby/rbs-1.5.1
index 9084d5ef528b..424c3768a342 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rbs-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.5.1.tar.gz -> rbs-1.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=478ddbc952c5f924fe0254de39cb6fd0
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.3.2 b/metadata/md5-cache/dev-ruby/rbs-2.3.2
index adbf1ba1e0ba..ff28c7685d25 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.3.2
+++ b/metadata/md5-cache/dev-ruby/rbs-2.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.3.2.tar.gz -> rbs-2.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=24281d85286c8d15f39fc365471b3e11
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.5.1 b/metadata/md5-cache/dev-ruby/rbs-2.5.1
index 9e6a42afadb1..598b3be31e66 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.5.1
+++ b/metadata/md5-cache/dev-ruby/rbs-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.5.1.tar.gz -> rbs-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=24281d85286c8d15f39fc365471b3e11
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.8.0 b/metadata/md5-cache/dev-ruby/rbs-2.8.0
index 07ce408217cf..a15e6015c047 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.8.0
+++ b/metadata/md5-cache/dev-ruby/rbs-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v2.8.0.tar.gz -> rbs-2.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c2565b3dee9f7353284e096c0b083e5f
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.8.2 b/metadata/md5-cache/dev-ruby/rbs-2.8.2
index 5da214a14669..8c46da9d858d 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.8.2
+++ b/metadata/md5-cache/dev-ruby/rbs-2.8.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/refs/tags/v2.8.2.tar.gz -> rbs-2.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1d2e950c4b722dc9870134dff5c2a350
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.8.3 b/metadata/md5-cache/dev-ruby/rbs-2.8.3
index ea3f988c23f3..3aa051d569aa 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.8.3
+++ b/metadata/md5-cache/dev-ruby/rbs-2.8.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/refs/tags/v2.8.3.tar.gz -> rbs-2.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b1f74147187f31a0176ce70a19eb20e3
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.8.4 b/metadata/md5-cache/dev-ruby/rbs-2.8.4
index 4cbd2f642a3d..4268e40bd488 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.8.4
+++ b/metadata/md5-cache/dev-ruby/rbs-2.8.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/refs/tags/v2.8.4.tar.gz -> rbs-2.8.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b1f74147187f31a0176ce70a19eb20e3
diff --git a/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1 b/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
index 3b7f72b8b4b8..ea55d0746ce2 100644
--- a/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/rbst-0.6.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xwmx/rbst/archive/0.6.5.tar.gz -> rbst-0.6.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=def003e3cbdea77d5bdc6fc67fe34ee5
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.5 b/metadata/md5-cache/dev-ruby/rbtree-0.4.5
index f3f84fc41719..238593b007ec 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.5
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbtree-0.4.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=089a648cc02e902df19f9c1c548cd344
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.6 b/metadata/md5-cache/dev-ruby/rbtree-0.4.6
index 4e8afe327109..e36237f69b5f 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.6
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbtree-0.4.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7b86d38402862b31aa391276e09690ad
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1 b/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1
index 66a3e03cdefa..bb2fb1ca7cc8 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.17.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a4368463d9eeb48ffa3604524260a6af
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.8 b/metadata/md5-cache/dev-ruby/rcairo-1.17.8
index 7b0dca4c1852..de3c3f2e4e79 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.17.8
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.17.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8ea3c653d30a3063a87526d72e51e0a0
diff --git a/metadata/md5-cache/dev-ruby/rchardet-1.8.0 b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
index fc6d62d748a4..45c2dfc32835 100644
--- a/metadata/md5-cache/dev-ruby/rchardet-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmhodges/rchardet/archive/v1.8.0.tar.gz -> rchardet-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=64a8662c738034c0db5d70351785a9f0
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
index 09f83789062a..709a31a1d963 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=75fa15fe82b7b24a61c388d34bc15885
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
index dd0f24657eae..57f36c3dcb1b 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6fab71383948268b3be0c6d8804f0a1a
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.7 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.7
index b15ff3474ce0..70224de4d7af 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.7
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=69a0d5abbd4a5e497bc3a2009b27589b
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.2 b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
index 2a90f7560e44..0ef9d97a49f7 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.2.tar.gz -> rdoc-6.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a526a7a8d229237fca187a33a6daebd4
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.3 b/metadata/md5-cache/dev-ruby/rdoc-6.3.3
index 764f135a5857..e35d68472687 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.3
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.3.tar.gz -> rdoc-6.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=134f4398daaea460443c2dd78694c882
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1 b/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
index 5f7d80c5c2a2..a603c4647d5e 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.3.tar.gz -> rdoc-6.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=567f59d67d63b09cdd311f1f3dcb22b7
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.4.0 b/metadata/md5-cache/dev-ruby/rdoc-6.4.0
index 5a38b9584ec1..0f859bd6749d 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.4.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.4.0.tar.gz -> rdoc-6.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=26f1532b90b87de05d443e8276753606
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.5.0 b/metadata/md5-cache/dev-ruby/rdoc-6.5.0
index 4e3815627440..002f828a07fb 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.5.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.5.0.tar.gz -> rdoc-6.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9bd51be45612f0377ac685bb35bf8a24
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
index 09cedea28b66..a3c406e4f6b5 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdtool-0.6.38.gem
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=51e883a7b7fb08cdbf5cb210ca4b6c92
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.23 b/metadata/md5-cache/dev-ruby/recog-2.3.23
index 17a3f1f7e24b..dbbb9e5290a4 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.23
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.23
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.23.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=edd235fe65a9300dc4eac8d8f2f89013
diff --git a/metadata/md5-cache/dev-ruby/recog-3.0.2 b/metadata/md5-cache/dev-ruby/recog-3.0.2
index e2693dee79ee..415a03862167 100644
--- a/metadata/md5-cache/dev-ruby/recog-3.0.2
+++ b/metadata/md5-cache/dev-ruby/recog-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/recog-3.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=68aa93c0f64068232052854ffc67fed9
diff --git a/metadata/md5-cache/dev-ruby/recog-3.0.3 b/metadata/md5-cache/dev-ruby/recog-3.0.3
index 8bd7540add25..eb19d5b1946c 100644
--- a/metadata/md5-cache/dev-ruby/recog-3.0.3
+++ b/metadata/md5-cache/dev-ruby/recog-3.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/recog-3.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=68aa93c0f64068232052854ffc67fed9
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1 b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
index 72929e627dbb..164ef70e0537 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c9568ffab33f7785523ec254ab4a73c2
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1 b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
index 59833acf275f..40e2b2d6f6d2 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.5.1.tar.gz -> redcarpet-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a611166d53290f3ae2ea4302a1e3b56c
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.6.0 b/metadata/md5-cache/dev-ruby/redcarpet-3.6.0
index 952abece08ac..1e9996bfc33c 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.6.0
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.6.0.tar.gz -> redcarpet-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9eb2c45a72ad4e1ecaf159dd5d83f294
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
index 97f5fc79d33d..c95c23d1f86a 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4211ad4de864661f207003170f4961e8
diff --git a/metadata/md5-cache/dev-ruby/redis-4.7.1 b/metadata/md5-cache/dev-ruby/redis-4.7.1
index 6bc1c9732012..1aa0dcb73d56 100644
--- a/metadata/md5-cache/dev-ruby/redis-4.7.1
+++ b/metadata/md5-cache/dev-ruby/redis-4.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/redis/redis-rb/archive/v4.7.1.tar.gz -> redis-rb-4.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d17ae4f3195e4f0d2f0abdb62b5bdc0d
diff --git a/metadata/md5-cache/dev-ruby/redis-4.8.0 b/metadata/md5-cache/dev-ruby/redis-4.8.0
index fbbfc3023843..4a823d7e45db 100644
--- a/metadata/md5-cache/dev-ruby/redis-4.8.0
+++ b/metadata/md5-cache/dev-ruby/redis-4.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/redis/redis-rb/archive/v4.8.0.tar.gz -> redis-rb-4.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=80f2215071d70368a6735bf674ec726c
diff --git a/metadata/md5-cache/dev-ruby/ref-2.0.0-r1 b/metadata/md5-cache/dev-ruby/ref-2.0.0-r1
index 0d182bfbf661..95af7e4bfa9b 100644
--- a/metadata/md5-cache/dev-ruby/ref-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/ref-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ruby-concurrency/ref/archive/v2.0.0.tar.gz -> ref-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f3c1880b3e2d24f2d059d2d1b1090fea
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
index 339cb3ad050c..cadadb2a153a 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.4.0.tar.gz -> regexp_parser-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cc6caeb2782838b9ab26e07d2d8aeb00
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.6.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.0
index 407379c1efd2..32fcd02f22a8 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.6.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.6.0.tar.gz -> regexp_parser-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=122d1fe4aaef0acb73684f8e21ef110b
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.6.1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.1
index 405986736dcd..341ff7b88eed 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.6.1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.6.1.tar.gz -> regexp_parser-2.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=122d1fe4aaef0acb73684f8e21ef110b
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.6.2 b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.2
index edb92a623135..5b84a2e2c15f 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.6.2
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.6.2.tar.gz -> regexp_parser-2.6.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=549238947dca69f461d1754cb4e9ab6d
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0
index cb36f0fd4f56..7cf9520c96a8 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.7.0.tar.gz -> regexp_parser-2.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=592088be3398f35a73dd6e9f6fb6692c
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
index 71127dab8cf9..09a86ef3713c 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.2.0.tar.gz -> regexp_property_values-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c06ed112017072deaf3cb21a81bddd9e
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
index 86b04c3f09a5..2305c26a062f 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.3.0.tar.gz -> regexp_property_values-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=802092e76677438847d5b909fdfabe3e
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.5.0 b/metadata/md5-cache/dev-ruby/request_store-1.5.0
index ddd617526949..107aa4dd4081 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.5.0
+++ b/metadata/md5-cache/dev-ruby/request_store-1.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/request_store-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bcdd9622edcd12f133069d55de5a6d6d
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.5.1 b/metadata/md5-cache/dev-ruby/request_store-1.5.1
index 4097df4fdce2..76bbdb4eaa89 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.5.1
+++ b/metadata/md5-cache/dev-ruby/request_store-1.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/request_store-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=566a332243a4798a7d6f50b56a6dcf28
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1 b/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
index ed04390bfd8c..ba78dea3c396 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rest-client-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a382ddd6aaa1274cb3345d99e648fae1
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index 18520b269d2a..4c305406dd27 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ce3639c1afb20a4322d9dbdf2bd411ed
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1 b/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
index a3d2648cb651..1ab90840ed12 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9a5242b436a51595322064f3cb0e0005
diff --git a/metadata/md5-cache/dev-ruby/rexml-3.2.5 b/metadata/md5-cache/dev-ruby/rexml-3.2.5
index 318573dfba0d..388a8ff1f24a 100644
--- a/metadata/md5-cache/dev-ruby/rexml-3.2.5
+++ b/metadata/md5-cache/dev-ruby/rexml-3.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/rexml/archive/v3.2.5.tar.gz -> rexml-3.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=61d450a66eb4a0f557c2ae6e8af24d65
diff --git a/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1 b/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
index d4ff77e7a678..81406195e8cc 100644
--- a/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/rexml-3.2.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/rexml/archive/v3.2.5.tar.gz -> rexml-3.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4a94396d6870efcdfea6d7ddc9de8b63
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1 b/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
index 477899265001..9e45901b58ed 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rinku-2.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dcce8fce8a5c2249454fe8b4f96c05b2
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
index 893f61b9dbb9..b54a0e7762e0 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ritex-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7e53c9412411679d385743575ddae45c
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.5 b/metadata/md5-cache/dev-ruby/rjb-1.6.5
index abd4c2981910..c3211b81a0b2 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.5
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59065b77c80789f02468eb3be7792d18
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.6 b/metadata/md5-cache/dev-ruby/rjb-1.6.6
index 1dc1b01fd004..053f890331d2 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.6
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fe57050fa194885c30dabc5bc7a8cb38
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.7 b/metadata/md5-cache/dev-ruby/rjb-1.6.7
index 4e3b8c0ca700..e6b0a8cb0509 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.7
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=47f29d965a132fab837adacddc66c9b3
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
index dff8a886f9bd..5596d35199d5 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rkelly-remix-0.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5db4cdf05918ba6ecd4df4c8096975aa
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.5 b/metadata/md5-cache/dev-ruby/rmagick-4.2.5
index 3de3778bf9c4..463fa815ba3a 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.5
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-5.tar.gz -> rmagick-4.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dc629fa02808c9bd5c873bf3f6e6b2e5
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.3.0 b/metadata/md5-cache/dev-ruby/rmagick-4.3.0
index da4425bb12d4..ee4c6ac35faf 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.3.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-3-0.tar.gz -> rmagick-4.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8364aa0698d46dfb78fa96087761bdc9
diff --git a/metadata/md5-cache/dev-ruby/rmagick-5.0.0 b/metadata/md5-cache/dev-ruby/rmagick-5.0.0
index a108a61e755c..bf44620bf769 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-5.0.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_5-0-0.tar.gz -> rmagick-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=981f23af4f477ac8b11a3511dda12847
diff --git a/metadata/md5-cache/dev-ruby/rmagick-5.1.0 b/metadata/md5-cache/dev-ruby/rmagick-5.1.0
index 0c0d6c883b32..0cf2191771a0 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-5.1.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_5-1-0.tar.gz -> rmagick-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7668dc41a29e45cef4dcd0eb605eba64
diff --git a/metadata/md5-cache/dev-ruby/roadie-4.0.0 b/metadata/md5-cache/dev-ruby/roadie-4.0.0
index eee6c287067f..54ded3cf49b1 100644
--- a/metadata/md5-cache/dev-ruby/roadie-4.0.0
+++ b/metadata/md5-cache/dev-ruby/roadie-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Mange/roadie/archive/v4.0.0.tar.gz -> roadie-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=73746b558edd2ce80565ce9b2b1519bf
diff --git a/metadata/md5-cache/dev-ruby/roadie-5.0.0 b/metadata/md5-cache/dev-ruby/roadie-5.0.0
index f9c51575bb2e..17f9a051533b 100644
--- a/metadata/md5-cache/dev-ruby/roadie-5.0.0
+++ b/metadata/md5-cache/dev-ruby/roadie-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Mange/roadie/archive/v5.0.0.tar.gz -> roadie-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a23d5bfd5e131f571871367340e73aa7
diff --git a/metadata/md5-cache/dev-ruby/roadie-5.0.1 b/metadata/md5-cache/dev-ruby/roadie-5.0.1
index c838a6757b5c..2ef8f313702d 100644
--- a/metadata/md5-cache/dev-ruby/roadie-5.0.1
+++ b/metadata/md5-cache/dev-ruby/roadie-5.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Mange/roadie/archive/v5.0.1.tar.gz -> roadie-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a23d5bfd5e131f571871367340e73aa7
diff --git a/metadata/md5-cache/dev-ruby/roadie-5.1.0 b/metadata/md5-cache/dev-ruby/roadie-5.1.0
index 52b8ba8f76d3..b5e84106e866 100644
--- a/metadata/md5-cache/dev-ruby/roadie-5.1.0
+++ b/metadata/md5-cache/dev-ruby/roadie-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Mange/roadie/archive/v5.1.0.tar.gz -> roadie-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=003a43255ecd277c64248fcc3dcb1bce
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0 b/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
index 74195683dc1e..f01831088de3 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v2.3.0.tar.gz -> roadie-rails-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e7cd4343ca0d9889ad77463ceba42e25
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1 b/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
index cc33d0807daa..00d550e05d7b 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v3.0.0.tar.gz -> roadie-rails-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=24d6d4f666c887fb788b560410089de1
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r3 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r3
index 22de58e1c065..b2a6315aa583 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r3
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/robots-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dfc4424fc32e6029e9b051171ded1b2b
diff --git a/metadata/md5-cache/dev-ruby/rotp-6.2.0 b/metadata/md5-cache/dev-ruby/rotp-6.2.0
index 4a6ebdbe6616..b932fbb0f03c 100644
--- a/metadata/md5-cache/dev-ruby/rotp-6.2.0
+++ b/metadata/md5-cache/dev-ruby/rotp-6.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mdp/rotp/archive/refs/tags/v6.2.0.tar.gz -> rotp-6.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e8877f4d28b83aa430db10d606cc65f6
diff --git a/metadata/md5-cache/dev-ruby/rotp-6.2.1 b/metadata/md5-cache/dev-ruby/rotp-6.2.1
index bb515a1f737c..0c1cff45fb09 100644
--- a/metadata/md5-cache/dev-ruby/rotp-6.2.1
+++ b/metadata/md5-cache/dev-ruby/rotp-6.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mdp/rotp/archive/v6.2.1.tar.gz -> rotp-6.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=13ccb72509dd8a68937a5c987a3e0193
diff --git a/metadata/md5-cache/dev-ruby/rotp-6.2.2 b/metadata/md5-cache/dev-ruby/rotp-6.2.2
index 3ed2fad87ab6..66bd633a7c3e 100644
--- a/metadata/md5-cache/dev-ruby/rotp-6.2.2
+++ b/metadata/md5-cache/dev-ruby/rotp-6.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mdp/rotp/archive/v6.2.2.tar.gz -> rotp-6.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=13ccb72509dd8a68937a5c987a3e0193
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.29.0 b/metadata/md5-cache/dev-ruby/rouge-3.29.0
index 81e956a05d94..96a000320c7f 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.29.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.29.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.29.0.tar.gz -> rouge-3.29.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=87aa126548dffd202bf1d34c07343996
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.30.0 b/metadata/md5-cache/dev-ruby/rouge-3.30.0
index c1ac2ae8b97b..ae2240e0ebab 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.30.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.30.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.30.0.tar.gz -> rouge-3.30.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=87aa126548dffd202bf1d34c07343996
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1 b/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1
index 55aa15365923..207c4a4f6901 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1
+++ b/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.30.0.tar.gz -> rouge-3.30.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5fdab353698ce0ae9923342ad4fa90f3
diff --git a/metadata/md5-cache/dev-ruby/rouge-4.0.0 b/metadata/md5-cache/dev-ruby/rouge-4.0.0
index 31e88149e036..b2c571b1e904 100644
--- a/metadata/md5-cache/dev-ruby/rouge-4.0.0
+++ b/metadata/md5-cache/dev-ruby/rouge-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/jneen/rouge/archive/v4.0.0.tar.gz -> rouge-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4a27e8abaf41e1474a566624738ecff7
diff --git a/metadata/md5-cache/dev-ruby/rouge-4.0.1 b/metadata/md5-cache/dev-ruby/rouge-4.0.1
index 04600f93e043..9d8c9e789dbc 100644
--- a/metadata/md5-cache/dev-ruby/rouge-4.0.1
+++ b/metadata/md5-cache/dev-ruby/rouge-4.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/jneen/rouge/archive/v4.0.1.tar.gz -> rouge-4.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4a27e8abaf41e1474a566624738ecff7
diff --git a/metadata/md5-cache/dev-ruby/rouge-4.1.0 b/metadata/md5-cache/dev-ruby/rouge-4.1.0
index 91d24424e792..2c89452b9853 100644
--- a/metadata/md5-cache/dev-ruby/rouge-4.1.0
+++ b/metadata/md5-cache/dev-ruby/rouge-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rouge-ruby/rouge/archive/v4.1.0.tar.gz -> rouge-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5043cf7d96d658db1a9a37d8bb0d3140
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.1.0 b/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
index e321c529ec6b..96d13152ef15 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.1.0.tar.gz -> rqrcode-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d5bd3e045dcd64f9f8316fc5221bdc6a
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.1.1 b/metadata/md5-cache/dev-ruby/rqrcode-2.1.1
index eb9571adc2f7..680fc3b67d43 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.1.1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.1.1.tar.gz -> rqrcode-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=813c729dffccf48697237b754a70407a
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.1.2 b/metadata/md5-cache/dev-ruby/rqrcode-2.1.2
index 14b2fc43bad9..6472d64897cc 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.1.2
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.1.2.tar.gz -> rqrcode-2.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=813c729dffccf48697237b754a70407a
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
index 14c33571e89d..692bbd7edc1a 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v1.1.0.tar.gz -> rqrcode_core-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=712370465b1f5ba80ffa02146c9e11ea
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
index 5255ec6733d1..eb687ca06726 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v1.2.0.tar.gz -> rqrcode_core-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=11af1dd5f50fc7695dec5c2675ed075b
diff --git a/metadata/md5-cache/dev-ruby/rr-3.1.0 b/metadata/md5-cache/dev-ruby/rr-3.1.0
index ad453109a075..dda26c083e51 100644
--- a/metadata/md5-cache/dev-ruby/rr-3.1.0
+++ b/metadata/md5-cache/dev-ruby/rr-3.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v3.1.0.tar.gz -> rr-3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ff60fd4c0e354caf15251c996cb94dfb
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
index 5a498313055f..d357b066a68a 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oetiker/rrdtool-1.x/releases/download/v1.8.0/rrdtool-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=02e29a85bbe44d5b63daa51857486046
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 7ec025abc505..294694ef5bfc 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rspec-2.99.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fef1a60c55e1448a1b28fcd1d57b7889
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-3.10.0
index ff1cb0c6fc83..d93484f5bf58 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.10.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=137bb00ef315c630e5a2322e3aa2a0e2
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-3.11.0
index e23051a158bd..cd62ac8de184 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7f96284ab076c31b65ab7d33f7530808
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.12.0 b/metadata/md5-cache/dev-ruby/rspec-3.12.0
index 07ac782f1944..af88eab02335 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.12.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=88d340ab06b2206d9018ea52e866a620
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
index 03b35f8b2860..db23b8e95731 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-collection_matchers-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cc650b95f25c22f7b7bc7021b2854c41
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index b0e69fec9942..c27a9ca43467 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=28823ce7f8e14c190b19c15eb48ea183
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
index fef4f14bceb0..b52aa7e64bc3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.1.tar.gz -> rspec-core-3.10.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=807f00c65b934180678c1dce850cb5ab
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.2
index 585eedb334f6..2af405fb3a3a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.2.tar.gz -> rspec-core-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b6797619d828eea36fc1f42a0f5c39fb
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
index f4b286d622a5..25525550164d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.11.0.tar.gz -> rspec-core-3.11.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5bb02807f08465de34775f7d3e2119ff
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.12.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.12.0
index 6213ddbee0b1..e34cdb187505 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.12.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.12.0.tar.gz -> rspec-core-3.12.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=23b702ae43e4cfef757ad103104aa151
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.12.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.12.1
index 80d4706fa9fe..2368586927a4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.12.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.12.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.12.1.tar.gz -> rspec-core-3.12.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=39c55aa584c2b9c55c8d1b94a778a6c2
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index ca1deafb273d..51f049f25802 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=601a7409a2e615602e47fa6f036031cc
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
index a26188d3d7dc..1c764ce21f25 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.1.tar.gz -> rspec-expectations-3.10.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=55fc1016d9bda076c9128805127c1364
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
index 55807b2eceee..d94c68421406 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.2.tar.gz -> rspec-expectations-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a591d38d3ec412bcaeae88ddbfd0fa5a
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
index 2a35cc0bf919..2f30b4b56c4e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.11.0.tar.gz -> rspec-expectations-3.11.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e600c706c4fd4ee630e10a799a14b88d
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1
index 115d635c153c..49282a582313 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.11.1.tar.gz -> rspec-expectations-3.11.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f69f697d689968e4ee9cd5b523966da1
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.0
index 99ec54669a46..1332d47f631b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.12.0.tar.gz -> rspec-expectations-3.12.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=878b1bc766474f2e7285cc0dadab7398
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.1
index 827b9580edf8..d0213869b24e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.12.1.tar.gz -> rspec-expectations-3.12.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=878b1bc766474f2e7285cc0dadab7398
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.2
index d5552e216922..a490ae5845fe 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.12.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.12.2.tar.gz -> rspec-expectations-3.12.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6aa4987b77d0769c16a7042f06f956a6
diff --git a/metadata/md5-cache/dev-ruby/rspec-files-1.1.2 b/metadata/md5-cache/dev-ruby/rspec-files-1.1.2
index 5d761d5883f4..e8059a7c8110 100644
--- a/metadata/md5-cache/dev-ruby/rspec-files-1.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-files-1.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/rspec-files/archive/refs/tags/v1.1.2.tar.gz -> rspec-files-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cae02b00b8daf9a91ad16115b2326a03
diff --git a/metadata/md5-cache/dev-ruby/rspec-files-1.1.3 b/metadata/md5-cache/dev-ruby/rspec-files-1.1.3
index a32a910d9220..33a9ab42f903 100644
--- a/metadata/md5-cache/dev-ruby/rspec-files-1.1.3
+++ b/metadata/md5-cache/dev-ruby/rspec-files-1.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/rspec-files/archive/v1.1.3.tar.gz -> rspec-files-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=61a950abc16b0b573d3d864162a61ba5
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
index fca71f7cd688..ed1ec6a6c12e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-its-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a66c4e93eedab8221e7f57289f5fa588
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
index 1aef4bbbc24f..48dcbb564fdb 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-json_expectations-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=12dd4fe7b772e15b87235111ae557fe1
diff --git a/metadata/md5-cache/dev-ruby/rspec-memory-1.0.3 b/metadata/md5-cache/dev-ruby/rspec-memory-1.0.3
index ee77db370a0e..8a122d30617f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-memory-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rspec-memory-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/rspec-memory/archive/v1.0.3.tar.gz -> rspec-memory-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fcdd299c2d7a727eadf75a8d0eac54e2
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
index 8428da6a5512..4a579aea0ad3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b48093cfbe967f2aa5dea162ef2bee15
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
index 53477a4f3c31..a41ac522f3c1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.2.tar.gz -> rspec-mocks-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d510b95abeedf47cccb398e66a297893
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
index 9a00ad6b42a9..3f88a02ce151 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.3.tar.gz -> rspec-mocks-3.10.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c9160a76dd10ec29915cd9064a47d8ff
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2
index 23bb5fddf3b8..474fcc21e7ee 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.11.2.tar.gz -> rspec-mocks-3.11.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0ca5edbf86fb982db65fd63a382d4e47
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.2
index 90dd1e674cf5..7c10f22c92b0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.12.2.tar.gz -> rspec-mocks-3.12.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0b48afb8f0992aa265794650335e5dd6
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.3 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.3
index 87e604ef91b6..82b75b8f57c5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.3
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.12.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.12.3.tar.gz -> rspec-mocks-3.12.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0b48afb8f0992aa265794650335e5dd6
diff --git a/metadata/md5-cache/dev-ruby/rspec-pending_for-0.1.16 b/metadata/md5-cache/dev-ruby/rspec-pending_for-0.1.16
index 3b50f9eb3a1d..b5e998957275 100644
--- a/metadata/md5-cache/dev-ruby/rspec-pending_for-0.1.16
+++ b/metadata/md5-cache/dev-ruby/rspec-pending_for-0.1.16
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pboling/rspec-pending_for/archive/v0.1.16.tar.gz -> rspec-pending_for-0.1.16.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=92f4bf707f6b26286f19e960ba8c37f9
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2 b/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
index 9456dd399e50..0d67f3598eb5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-5.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v5.1.2.tar.gz -> rspec-rails-5.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c1165ef64f72a21e0c081215d8117892
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-6.0.0 b/metadata/md5-cache/dev-ruby/rspec-rails-6.0.0
index e507347bf719..0728786a509f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-6.0.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v6.0.0.tar.gz -> rspec-rails-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7c1100cf02f93522dbbe9c2c9d2ff0e4
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-6.0.1 b/metadata/md5-cache/dev-ruby/rspec-rails-6.0.1
index 89a6abcdee47..8196e29661fc 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-6.0.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-6.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v6.0.1.tar.gz -> rspec-rails-6.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7c1100cf02f93522dbbe9c2c9d2ff0e4
diff --git a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0 b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
index 6794449fe9f4..f2535fc1247e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
+++ b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-stubbed_env-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=beb863ffaa7ad3c296b03475147a10b0
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
index c5c15a976be3..78c215b5b95a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.2.tar.gz -> rspec-support-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dcc6b86ad3c80909dd819b0aaed2dca1
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.3 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.3
index 21747b9f9090..be004fdcdc6f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.3
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.3.tar.gz -> rspec-support-3.10.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5ae7fd75d501e1a86c901376dc1bdda0
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.11.0
index 67f90b6f7db5..7411c0e61ea6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.11.0.tar.gz -> rspec-support-3.11.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ba56cfcc1b05cc3462fd7591d21b8005
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.11.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.11.1
index 9da9730deb0f..ba6beb652e54 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.11.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.11.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.11.1.tar.gz -> rspec-support-3.11.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e3d51820815b0659bcbb4d4201aec5e2
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.12.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.12.0
index 41362d75923e..f6f9f6434684 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.12.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.12.0.tar.gz -> rspec-support-3.12.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8835dca52e197efa1749d1a04ef42a1e
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
index 2d4d12403590..25cc6341d68f 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspectacular-0.70.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8803ead13ae3591084e05b54921dca28
diff --git a/metadata/md5-cache/dev-ruby/rss-0.2.9 b/metadata/md5-cache/dev-ruby/rss-0.2.9
index 157a5c5de2dd..b344057ba28e 100644
--- a/metadata/md5-cache/dev-ruby/rss-0.2.9
+++ b/metadata/md5-cache/dev-ruby/rss-0.2.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rss-0.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d87ddb125c91e831b8b9f10db3965a30
diff --git a/metadata/md5-cache/dev-ruby/rss-0.2.9-r1 b/metadata/md5-cache/dev-ruby/rss-0.2.9-r1
index 4248f2aaa4a8..208a6f631ad2 100644
--- a/metadata/md5-cache/dev-ruby/rss-0.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/rss-0.2.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rss-0.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c8d6642193b306ddc9f1aa54bc30ae8d
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
index 76845b8fa866..d82e27805511 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0d81abe5f2faeee8649fe2725faeb8f0
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
index e77fd4f65b59..1196b66fdaa6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=883598defca7ddcab239dbd75b7013b2
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
index cff7eeb2984b..e9426978e0d7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1c0b85558c58146026c355d505176568
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
index bc0d10dd5f78..532e3456bd9f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2fb03f2780a7d0562a44408aba51649b
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
index aa3d8b89d14c..f60fdaaae46b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=996030de843311b6f969f87f62bf4599
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
index b6b0d58049d9..480fe49ee023 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.10.0.tar.gz -> ruby-feedparser-0.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=14bcf30136f43ddc6f8746f6cb24f3fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.0 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.0
index 877447c5a501..892fc037f92d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.0
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.11.0.tar.gz -> ruby-feedparser-0.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=02caef015059f8fd5b3dc4b2222cf7ee
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.2 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.2
index 2ee2c1b6a648..19bf6ca8f969 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.2
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.11.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.11.2.tar.gz -> ruby-feedparser-0.11.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=02caef015059f8fd5b3dc4b2222cf7ee
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
index d5ec31c518b8..07c5d9d5dc3c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-filemagic-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2810360ff656294c4f15f074eb67200c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
index b679ba2d1f30..b668bad3046b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59b84f84f88bc8e2d6b2b2b38bf4b2ec
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
index 56b469cd80a6..cc1a0946aee1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9f6615e78fe4a1733c2cf3132df19e13
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
index 81e538a7ea68..2bbd3ae757d2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9010f90c5677019ece6efdda7a363d91
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
index f3f5b976677c..ea74ae637394 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=78adf3c42be503afc3cc9b504f4c3d34
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
index c77aeb3c5ea7..735463f1b93d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b897748610054b52821627dfd27a9d42
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
index 079b81ca90d5..7029128a14c6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2147316dcb5638edb849ac578cf43674
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
index 7dc33fd8c1f8..881a100fa9ac 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1d98da586b794237b0157ed1b98d55da
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
index 52c9709b435c..39eae1429d26 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
 _md5_=b4ee6e052aa3d19b097b4fefe77d26a4
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
index 2371f5df165d..0bf3b2f275ed 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-hmac-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f9edeef5cf9c63a52c6578c88d06d030
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
index b6ed9ee1b210..057dc69c7a57 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ldap-0.9.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3743bbb7542c1fd34d06ec8b28b90ef9
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1 b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
index 70316c20cd5f..fc608521c12d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/v2.5.1.tar.gz -> ruby-macho-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=87c70c9a5cf1e1648d7997c270ef58af
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
index f7e755bb4150..7005b5aa98b0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.10.tar.gz -> ruby-mp3info-0.8.10-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2b33f20892dae6e58c6a393b35766cbc
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
index 90f10a52c554..1feca3ab42dd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-ldap/ruby-net-ldap/archive/v0.17.1.tar.gz -> ruby-net-ldap-0.17.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=70822af19b7bacd82e00e57b36aae3df
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
index 67ffa84c3f87..a37afb423956 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.999991.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=793a38356ad241ec9178e5cbbe10a692
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
index d805e8d375b3..d9dcf2ab0238 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-oembed/ruby-oembed/archive/v0.16.1.tar.gz -> ruby-oembed-0.16.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ed104c8dac3c57537d989372f8c416cd
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
index 1ddf0bf8e139..bbb3c9027606 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ole-1.2.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=881bb779616ebde1dd4446b28cab42ff
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
index 616fe85d80a3..f9aed368c473 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/opengl-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2159d5598b0a7e60c9404564a012ddd0
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
index 460d9b1ceda4..d960f7134858 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.9.2.tar.gz -> ruby-openid-2.9.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=351f862d451accaa35a98c0a8307a3f4
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
index 1b4cee1146cd..421711a97119 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=99f4512f8465f58d9413f86d87c1a1e8
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
index de136705a4c7..0c4b76376d92 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=01cd67de36d38daf4e54548f847ee0f1
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4
index 9469e80dfbea..22a63a7ea4b2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.4.tar.gz -> ruby-prof-1.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b54c4f0166e808cfb93c14aeec24f757
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.5 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.5
index 1a86a1fb0345..80cd57adb41a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.5
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.5.tar.gz -> ruby-prof-1.4.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ece191efad9b4107e95974cce6bbf67d
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
index a499e4162a34..a4d2fd6d65af 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.11.0.tar.gz -> ruby-progressbar-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=52caba9fce4fbd7ed30cf3cdd27f8ffd
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
index 13183a03d3f6..ea2af1a88c89 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-rc4-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d39393914baeb3bef244dfb4ce9acb61
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
index 72d0b05d1220..f3870330cb88 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4310cadf1acf259ed8f74a3950d9f1d2
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
index 5a1022d6191c..a521e30a8e75 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shadow-2.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8e48215b996f5d394c6e52e01899a8ef
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
index 51e36b201969..ace454b750dc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shadow-2.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bb2189104d2d3e98c0b57e53425f9419
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
index e796e3a27464..eb4b3394b476 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shout-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=231039d8e6d9fe43678f123536395fef
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
index 5aae898c0711..75b040018ec2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=421d25e17abd5e0b4b9ebb74212e4930
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
index e76fa6842140..9740a2211d7e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-xslt-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d8127a3ea323c224cf6321e6202ab156
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
index 6e6d1e03681f..f86db83e6087 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-yadis-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=098cd90c8ea6fd203627d73e42459724
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
index 430ad2ab826f..49a675fd95b1 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59ecc3b28b938134a878ff3b54db2750
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
index 2079d50bdd00..4682aff5d208 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=11565ac43998959c80a17907f2033f5c
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
index 0fff5da9143d..6b0b1ef6e32f 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=56637e663920ab7a21249a32a90c0614
diff --git a/metadata/md5-cache/dev-ruby/ruby_engine-2.0.0 b/metadata/md5-cache/dev-ruby/ruby_engine-2.0.0
index a60817f35ab0..d2505580b6f1 100644
--- a/metadata/md5-cache/dev-ruby/ruby_engine-2.0.0
+++ b/metadata/md5-cache/dev-ruby/ruby_engine-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby_engine-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e50925ab52e1fb08ae7e6394a577583a
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
index e8bfca62ffc6..8ed8bf3e3442 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby_gntp-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=75998a660e2b25181574deac1c94519f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
index 95017e3f7c5f..bb4600aa0ccf 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.18.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7f0c08561542bc5d5c1c8a5fb16b936b
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
index 4421ac70fd9e..7ce5a56f7963 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.19.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f56ae89143f5a1fe15c619a1e50da7d6
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2
index 1e2a9d33454b..ae50f760f240 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.19.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.19.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=af64f16cf884f32b25aeb1969819b7ba
diff --git a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0 b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
index 65bfaf23b2ea..71b9b3d5845d 100644
--- a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ruby_smb-1.1.0.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1d43308e4af2206c5cfde51f977e67a9
diff --git a/metadata/md5-cache/dev-ruby/ruby_version-1.0.2 b/metadata/md5-cache/dev-ruby/ruby_version-1.0.2
index a734f682faa2..04eecf0273b0 100644
--- a/metadata/md5-cache/dev-ruby/ruby_version-1.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby_version-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ruby_version-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9e555d9e6af5ccd9b96887822d26d1bd
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.1.6 b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
index 2143e11b261a..770e7058be40 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.1.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.1.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=603a9e68fa50a91fc3ed7c1501e7abcc
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.14 b/metadata/md5-cache/dev-ruby/rubygems-3.2.14
index 7985621f0fb8..be28f4a778a6 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.14
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.14
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.2.14.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e4c0365fe1b2c83eaa0b3df91f75ee22
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.22 b/metadata/md5-cache/dev-ruby/rubygems-3.2.22
index b8310e21ae75..f2ed8419641a 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.22
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.22
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.2.22.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3547a34003e9b9aa58c00938061e1935
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.2.33 b/metadata/md5-cache/dev-ruby/rubygems-3.2.33
index c1d380bada16..05715e6fca25 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.2.33
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.2.33
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubygems/rubygems/archive/v3.2.33.tar.gz -> rubygems-3.2.33.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e167d1b6a71482951bdcc1940656e4cf
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.3.26 b/metadata/md5-cache/dev-ruby/rubygems-3.3.26
index bff41ba68dba..ce4f4634bb2d 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.3.26
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.3.26
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubygems/rubygems/archive/v3.3.26.tar.gz -> rubygems-3.3.26.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=13fcd3b9700bfa2c741d2b1d3376b5aa
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.3.8 b/metadata/md5-cache/dev-ruby/rubygems-3.3.8
index 1a253d711ed9..f1d8ac58ef83 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.3.8
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.3.8
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubygems/rubygems/archive/v3.3.8.tar.gz -> rubygems-3.3.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6853fdde8a2ea75ad5befe1a244d17f3
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.4.1 b/metadata/md5-cache/dev-ruby/rubygems-3.4.1
index 4d0754f4258b..3fb1a3b255ba 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.4.1
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.4.1
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubygems/rubygems/archive/v3.4.1.tar.gz -> rubygems-3.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=13fcd3b9700bfa2c741d2b1d3376b5aa
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.4.3 b/metadata/md5-cache/dev-ruby/rubygems-3.4.3
index 6c03068d8216..282496ce5dbf 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.4.3
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.4.3
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubygems/rubygems/archive/v3.4.3.tar.gz -> rubygems-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=629947c0b8b40d5c05a1da273bf7e37c
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
index c1c4016b6b24..b8a0c8d008b4 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubyntlm-0.6.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e98616e2e5a68a631f24c76bbe3937b3
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.1 b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
index a9e10e015101..b8d62e313c40 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.1
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubypants-0.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=98d8da797ba2dc1296db67a6e9e6902e
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
index 849380780488..f2bbbdf91e74 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d5255bb4c95ef7f3ebe9b2139cdd9fa3
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
index 78cac7d1bb68..f11ceaeabead 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-cli-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cee6941d7353f9491c03767f9491921d
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
index 627c69977e81..c1e73de5d5df 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytter-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b8ef44e56b9886d04722d8a491e0362e
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
index 2fcc5d74b031..1903b4784d24 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.3.0.tar.gz -> rubyzip-1.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9e8792361564b2116d1877e19c57fc6d
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
index bc1f7f389bad..2598a4a01d3f 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.2.tar.gz -> rubyzip-2.3.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=acf84cd02495a023e216ed12468c08be
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
index c8841812b22b..7940719ef817 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/safe_yaml-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=abc76e97aa062fe5fd38fdf48b70bc58
diff --git a/metadata/md5-cache/dev-ruby/sanitize-6.0.0 b/metadata/md5-cache/dev-ruby/sanitize-6.0.0
index 86a62ec1ed61..ae4b181acd21 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-6.0.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/rgrove/sanitize/archive/v6.0.0.tar.gz -> sanitize-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b1b20828441bda907ff510875697ecc8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-6.0.1 b/metadata/md5-cache/dev-ruby/sanitize-6.0.1
index f338086b3332..4e3d8b224831 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-6.0.1
+++ b/metadata/md5-cache/dev-ruby/sanitize-6.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/rgrove/sanitize/archive/v6.0.1.tar.gz -> sanitize-6.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5879fd2d0028af5069d07cd0900be7d3
diff --git a/metadata/md5-cache/dev-ruby/sass-3.7.4-r1 b/metadata/md5-cache/dev-ruby/sass-3.7.4-r1
index 0f9ebf5314c3..d66f33eef68b 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.7.4-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.7.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.7
 SRC_URI=https://github.com/sass/ruby-sass/archive/3.7.4.tar.gz -> sass-3.7.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=876fe212a379ce57ae23b7f654ba0697
diff --git a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1 b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
index 935363d16794..438f4e3728ca 100644
--- a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/sass/listen/archive/v4.0.0.tar.gz -> sass-listen-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=af31c7846bb800701207fd1b4339a5c9
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
index d470b1d36f0f..d0ac2ab2107d 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.8.tar.gz -> sass-rails-5.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3af0be71d0ec15de835745925f7d61df
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0 b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
index b6b0fbfa5794..010cb81a0fe4 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=5.1
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.1.0.tar.gz -> sass-rails-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b9b8addb82a559e46d1200c849f29e53
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1 b/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
index 87191a10e4a6..5fb5d20c38e5 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=02527ecd514a20619c714d2a431b9e10
diff --git a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2 b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
index d92a0ce1b347..e8d24714c997 100644
--- a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-rails-2.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b99099be1012ced9901dbc53f2282724
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1 b/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
index 065ec1ac0783..c850a7cd71be 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/sawyer/archive/v0.8.2.tar.gz -> sawyer-0.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc98a47d777d105639d9319cf4778742
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.9.1 b/metadata/md5-cache/dev-ruby/sawyer-0.9.1
index ee192a2a0767..b6d94db866f2 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.9.1
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/sawyer/archive/v0.9.1.tar.gz -> sawyer-0.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fc98a47d777d105639d9319cf4778742
diff --git a/metadata/md5-cache/dev-ruby/sdoc-1.1.0 b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
index 99e172d72d45..bc2a3c271417 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-1.1.0
+++ b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sdoc-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=00e362d96d4025f769912c721d313e02
diff --git a/metadata/md5-cache/dev-ruby/sdoc-1.1.0-r1 b/metadata/md5-cache/dev-ruby/sdoc-1.1.0-r1
index bfdabf454476..44abc13366fa 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/sdoc-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sdoc-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0b26528fa8ffaadbcfb663934f414eee
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9-r1 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9-r1
index d04c7b261953..ae759b091801 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9-r1
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.9.tar.gz -> seed-fu-2.3.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7b4b0a2bb05b0d2af9d1a5c7a6ced2e0
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3 b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
index d82d79ea4990..65751dda4851 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-4.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e9bb51fbc01f52c78586b87a7e95ff40
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
index d43722c7f3c5..37f18c2ade68 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=43f38d329fc3025c2647143d0b01fc72
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
index 09f8e43199fe..7c6a67254739 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eb7a55d8c532c06f45b0314ea9d69f22
diff --git a/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1 b/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
index 522e75b49894..11451a1447bd 100644
--- a/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/semver2-3.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/haf/semver/archive/v3.4.2.tar.gz -> semver2-3.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7961a06e7ba336c34da1d29a6a8895db
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.2 b/metadata/md5-cache/dev-ruby/serialport-1.3.2
index 329b9dcf5566..5a7e262f6cd0 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.2
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serialport-1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fbaeb95de8de4fe23d80f4766c5d21de
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.3.0 b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
index 479225c139a3..1dd0d37161d4 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.3.0
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=437e71e9c23da6fece6441c84af7cbed
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.3.1 b/metadata/md5-cache/dev-ruby/serverengine-2.3.1
index 053921a8e005..cabd154093c8 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.3.1
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fa970455c451d526cfe77452cb8e022b
diff --git a/metadata/md5-cache/dev-ruby/set-1.0.2 b/metadata/md5-cache/dev-ruby/set-1.0.2
index c5f7ae0b7c8d..53d66d51cb7f 100644
--- a/metadata/md5-cache/dev-ruby/set-1.0.2
+++ b/metadata/md5-cache/dev-ruby/set-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/set/archive/v1.0.2.tar.gz -> set-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bf6bed9f0dd53ae076b80d6686e23340
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
index 360105bd1b35..0722370ac9f4 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/settingslogic-2.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96f29f5cd9f0c1a4a1054a263b9299ff
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
index 2aa8a9fd409f..824bf7022a27 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=66cdb177d2c42aa0a43ba270d60f5b3e
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
index 8a45a2af8f03..08c645557ff5 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=66cdb177d2c42aa0a43ba270d60f5b3e
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
index 9baff620d501..dc124530e583 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v2.11.3.tar.gz -> shoulda-2.11.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3a83e6cf55f48362e3093c6855f9b362
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2 b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
index 73dbefe66468..d0d7f29e0c14 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.6.0.tar.gz -> shoulda-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eb3723f905b160853347780fa3584039
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
index 60f4dfa20a86..6a1b966cf1ca 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/shoulda-context-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b13e429f9c1245f921ab8f34a4f3a485
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
index 141aaaab42ed..ce9823f464a9 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/shoulda-matchers-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=22b6732968c2a253eccc0d93023cd0be
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
index 65bf3c198ae5..42d3f827f64c 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.5.1.tar.gz -> shoulda-matchers-4.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=474addda306049e236ed6eacc15015e7
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
index de467b1fc043..8db8f3db56c7 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v5.0.0.tar.gz -> shoulda-matchers-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0b4ff847d63c4ac1a124390fc349a37f
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
index 8f0f571fb55d..fcbe4885ed9d 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v5.1.0.tar.gz -> shoulda-matchers-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4a63d89a82027488b4809d9a5d1fca85
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1 b/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
index 15617084c2c7..5f9404cb6e30 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigar-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=98a921a3700074a12db79124c1e4973b
diff --git a/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1 b/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
index 7e2593996c67..80a703ad211f 100644
--- a/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/sigdump-0.2.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigdump-0.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2920a2abf2022d90a2a9cf340a480606
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
index bbca84b1e51c..787436b06bb1 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/simple-rss-1.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=92cfce644765065749f66ea63b88d803
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
index 7508e9e00eac..1c31d33a6f93 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a9c178344ce9271bff73c42bf28a8f78
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.19.1 b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
index 051b60288c5d..b6ec0c5bff69 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.19.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.19.1.tar.gz -> simplecov-0.19.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=af9f88838012fdb0ce29f2339d7daa3a
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.21.2 b/metadata/md5-cache/dev-ruby/simplecov-0.21.2
index e90459b146aa..4049cb6df167 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.21.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.21.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.21.2.tar.gz -> simplecov-0.21.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=516efa8980f98f26a112da06ce808f0b
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.22.0 b/metadata/md5-cache/dev-ruby/simplecov-0.22.0
index 2ed635716cfb..7a39cd8e18f6 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.22.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.22.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.22.0.tar.gz -> simplecov-0.22.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d6c62cc6229b638933eb4c6928590108
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
index d440fdb00822..29b7a53e6ca5 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a1c4c0055173cd7aff21a8dcac647341
diff --git a/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4 b/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
index 411629c24816..e66e85bb07d1 100644
--- a/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
+++ b/metadata/md5-cache/dev-ruby/simplecov_json_formatter-0.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/simplecov_json_formatter-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=cb5c07a794a974a1791d96888eda7fe8
diff --git a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1 b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
index 7970d26102c4..8d9819521fcb 100644
--- a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mmriis/simpleidn/archive/v0.2.1.tar.gz -> simpleidn-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c2f8bc1d560e6e0385989f500bd3e5e0
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.2.3 b/metadata/md5-cache/dev-ruby/sinatra-2.2.3
index 60cf25409c16..3ae3fdda18e6 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-2.2.3
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.2.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/sinatra/sinatra/archive/v2.2.3.tar.gz -> sinatra-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b544ce0ab9d94fa8a3e20b56f363c5e8
diff --git a/metadata/md5-cache/dev-ruby/sinatra-3.0.2 b/metadata/md5-cache/dev-ruby/sinatra-3.0.2
index 222bad94859f..7bc15e31a8dc 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-3.0.2
+++ b/metadata/md5-cache/dev-ruby/sinatra-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sinatra/sinatra/archive/v3.0.2.tar.gz -> sinatra-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c6f459fd96b75f193901c0cb05b4b4c0
diff --git a/metadata/md5-cache/dev-ruby/sinatra-3.0.4 b/metadata/md5-cache/dev-ruby/sinatra-3.0.4
index c6b2301c7187..3550c7d6df80 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-3.0.4
+++ b/metadata/md5-cache/dev-ruby/sinatra-3.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sinatra/sinatra/archive/v3.0.4.tar.gz -> sinatra-3.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c6f459fd96b75f193901c0cb05b4b4c0
diff --git a/metadata/md5-cache/dev-ruby/sinatra-3.0.5 b/metadata/md5-cache/dev-ruby/sinatra-3.0.5
index 6b83e37c6cc5..c3eab8ca527c 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-3.0.5
+++ b/metadata/md5-cache/dev-ruby/sinatra-3.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sinatra/sinatra/archive/v3.0.5.tar.gz -> sinatra-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2105f38184c6ec39d9e8d58dd06483fc
diff --git a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1 b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
index 02d8e36b5b72..c285ead06484 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sinatra-partial-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d1eb0fdef0b41019aaf2e29100b81318
diff --git a/metadata/md5-cache/dev-ruby/singleton-0.1.1 b/metadata/md5-cache/dev-ruby/singleton-0.1.1
index 686160e22862..aaf473ad2599 100644
--- a/metadata/md5-cache/dev-ruby/singleton-0.1.1
+++ b/metadata/md5-cache/dev-ruby/singleton-0.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/singleton/archive/v0.1.1.tar.gz -> singleton-0.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5b8ca74e97b182be6eeb9d955c72dab8
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0-r1 b/metadata/md5-cache/dev-ruby/six-0.2.0-r1
index 929e7e6654fc..909a4441c29b 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=281eba4c482519bf9de45c54a9769631
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0-r2 b/metadata/md5-cache/dev-ruby/slim-4.1.0-r2
index 75ae35911b44..394337a8c878 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=899636e318c7db7e82539146c0de24b4
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0-r3 b/metadata/md5-cache/dev-ruby/slim-4.1.0-r3
index 0a94f7e55ea3..de8d3b8f2f0a 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0-r3
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=91036a18982546ca0b235957fb8eb9e6
diff --git a/metadata/md5-cache/dev-ruby/slop-4.10.0 b/metadata/md5-cache/dev-ruby/slop-4.10.0
index 19606099c473..1a192de94934 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.10.0
+++ b/metadata/md5-cache/dev-ruby/slop-4.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/leejarvis/slop/archive/v4.10.0.tar.gz -> slop-4.10.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8d31ec4b12ec3bdaecf66353aa33cadf
diff --git a/metadata/md5-cache/dev-ruby/slop-4.9.2 b/metadata/md5-cache/dev-ruby/slop-4.9.2
index 967ab6dcc12f..e5228eaa1291 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.9.2
+++ b/metadata/md5-cache/dev-ruby/slop-4.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.9.2.tar.gz -> slop-4.9.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2870aff192f3d411241910c5b8f0dd06
diff --git a/metadata/md5-cache/dev-ruby/slop-4.9.3 b/metadata/md5-cache/dev-ruby/slop-4.9.3
index 23f00a52dbc0..a116ec7393f4 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.9.3
+++ b/metadata/md5-cache/dev-ruby/slop-4.9.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.9.3.tar.gz -> slop-4.9.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8946a04c49755b7a04b0e6d9baba8631
diff --git a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1 b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
index a7d2e34542a7..57c2cc6c53b1 100644
--- a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/slow_enumerator_tools-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2e939f437d3f13ba7944d993d3fe07aa
diff --git a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3 b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
index 651fea2458e6..236621027ab5 100644
--- a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
+++ b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/knu/sorted_set/archive/v1.0.3.tar.gz -> sorted_set-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3380235e4ce5f9f88145df5f012c1604
diff --git a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1 b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
index e7208740b9d2..7ae19ac42299 100644
--- a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sourcemap-0.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=37f6ab541abc577546f162679daebf83
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
index 783c3b2d4cf3..3a1022d8ae21 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sparklines-0.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ce31d5fb2c235bbdb75930905f5becbc
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0 b/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
index 64644a25003c..e2c319d648b3 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.3.0.tar.gz -> spreadsheet-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=038b1cf49615233e39c253e359d300ea
diff --git a/metadata/md5-cache/dev-ruby/spring-4.0.0 b/metadata/md5-cache/dev-ruby/spring-4.0.0
index 024d1dee98ac..ede4fbf0c4da 100644
--- a/metadata/md5-cache/dev-ruby/spring-4.0.0
+++ b/metadata/md5-cache/dev-ruby/spring-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v4.0.0.tar.gz -> spring-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f0c55b58e754cc30035b3d78f0291af0
diff --git a/metadata/md5-cache/dev-ruby/spring-4.1.0 b/metadata/md5-cache/dev-ruby/spring-4.1.0
index f72087b4c220..da0be8155532 100644
--- a/metadata/md5-cache/dev-ruby/spring-4.1.0
+++ b/metadata/md5-cache/dev-ruby/spring-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v4.1.0.tar.gz -> spring-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ceac0beebffe14c15aa0d0985792bf2c
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
index 03f1b09dcf08..f288eaeb6706 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4c76576cfaaa4f21d17a12ca5974f273
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.0.2 b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
index b2cfd57402b2..d141b68e518f 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.0.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.0.2.tar.gz -> sprockets-4.0.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6046e4a518378e292889724241a933ae
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.1.0 b/metadata/md5-cache/dev-ruby/sprockets-4.1.0
index 89b5d6d22807..1c55bba9063b 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.1.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.1.0.tar.gz -> sprockets-4.1.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9efc7003dd1d9b6c8f871952e39c152f
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.1.1 b/metadata/md5-cache/dev-ruby/sprockets-4.1.1
index 7d33133a4ccb..711bcb13d088 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.1.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.1.1.tar.gz -> sprockets-4.1.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0980e51923b5cebec38d97e820f9c901
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.2.0 b/metadata/md5-cache/dev-ruby/sprockets-4.2.0
index a4d90234d158..276bd352c957 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.2.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.2.0.tar.gz -> sprockets-4.2.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=66833d5ad7dcc5c2993e4f1a5ff07614
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
index 3d695600c204..b684c34f5f7a 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.4.2.tar.gz -> sprockets-rails-3.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8a5c4f617cfb91417eb7a7e308d9ebd9
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.2 b/metadata/md5-cache/dev-ruby/spy-1.0.2
index 790d312fb594..59684dd4368f 100644
--- a/metadata/md5-cache/dev-ruby/spy-1.0.2
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spy-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a47804be799c26cb9aa18240b6a046c4
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.3 b/metadata/md5-cache/dev-ruby/spy-1.0.3
index 660ce9e53dfb..2ce273434339 100644
--- a/metadata/md5-cache/dev-ruby/spy-1.0.3
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spy-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fdf17097b1ae521b7d11b61357ecc421
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
index 5e9967dee63d..eb68722facfa 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=64b3f0d88e79231d21fc967dc1e03eac
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.4 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
index 5adbdac20088..c7f807609df9 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7caebd9ae2118329f0b75de4210c354b
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.5.3 b/metadata/md5-cache/dev-ruby/sqlite3-1.5.3
index 90b87cc8e115..9f78497ae8c8 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.5.3
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.5.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=328bfbd2be6c8284b3e222529508dafd
diff --git a/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1 b/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
index 99c27df5a945..cf3e262e7c6a 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/sshkey-2.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkey-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=71cb8b0850341534a8675c08102a21ba
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.2 b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
index e07e1cd84387..0721e84b9963 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.2
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c1537861309bdfe6f67613f6e197c73f
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.3 b/metadata/md5-cache/dev-ruby/sshkit-1.21.3
index add40d60f53f..fa0c68795a68 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.3
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5ffa81403ca26650325078cfebb74c9e
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.4 b/metadata/md5-cache/dev-ruby/sshkit-1.21.4
index 465c4cf82cb0..f282c4281728 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.4
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1eb895df07880d5d57672fd7b332b1e3
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1 b/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
index f4f59b3fef71..e530a5e21fc1 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=730aa30aa9a80230370ce788a10092f6
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
index 9aaece20691b..5e07dabb6a7b 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/state_machine-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c2091cea27413f3e7fb9e4cd3497229c
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.10 b/metadata/md5-cache/dev-ruby/stomp-1.4.10
index 2e85d637fb73..a1f092d8f33d 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.10
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=91a32526d73f4d6307f28010c6889f5c
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r2 b/metadata/md5-cache/dev-ruby/stringex-2.8.5-r2
index f6e50d1d0c6b..741f6cedc232 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r2
+++ b/metadata/md5-cache/dev-ruby/stringex-2.8.5-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stringex-2.8.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=779082a931098a0f94a4216c1fe82600
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.2 b/metadata/md5-cache/dev-ruby/stringio-3.0.2
index 7739e0a5c81a..5f710840c0fb 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.2
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.2.tar.gz -> stringio-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1d8f2db65590d8af5acef415b8ae40b5
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.4 b/metadata/md5-cache/dev-ruby/stringio-3.0.4
index 1c7f4ccef80e..bc2c88102534 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.4
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.4.tar.gz -> stringio-3.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0fa6f5c3197a2c567a3afcd296d8e6e1
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.5 b/metadata/md5-cache/dev-ruby/stringio-3.0.5
index 50281c613e19..677be3e45abb 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.5
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.5.tar.gz -> stringio-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1019720fc579e91c5f5146975610e6c2
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2 b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
index bfcc7492577c..17904ba0232a 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a608f4893eb66c42aa1a1748e4dba581
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.3 b/metadata/md5-cache/dev-ruby/strscan-3.0.3
index 3fe46dc83bdc..d76807992757 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.3
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.3.tar.gz -> strscan-3.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=101f4da8c078d2bc33c981c2e44ad596
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.4 b/metadata/md5-cache/dev-ruby/strscan-3.0.4
index ed077c0f016e..63e476359fae 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.4
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.4.tar.gz -> strscan-3.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1441e46064a42ea5858093c75ee1599c
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.5 b/metadata/md5-cache/dev-ruby/strscan-3.0.5
index daff49396846..11c993ff8a2d 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.5
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.5.tar.gz -> strscan-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1441e46064a42ea5858093c75ee1599c
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.6 b/metadata/md5-cache/dev-ruby/strscan-3.0.6
index a1816f07afcd..5970b4e9f328 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.6
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.6.tar.gz -> strscan-3.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=82f0c1c36af00c145b86fc0d2b65ac32
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
index c4e0db489939..b616cad13c8c 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ef0697c5a4a8f0d0c46d324bd882e1a
diff --git a/metadata/md5-cache/dev-ruby/sus-0.15.2 b/metadata/md5-cache/dev-ruby/sus-0.15.2
index 51618eba87ad..3c4b9b01f0dd 100644
--- a/metadata/md5-cache/dev-ruby/sus-0.15.2
+++ b/metadata/md5-cache/dev-ruby/sus-0.15.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ioquatix/sus/archive/v0.15.2.tar.gz -> sus-0.15.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d3498f05ed0096b71e6b5f61e3a64f81
diff --git a/metadata/md5-cache/dev-ruby/sus-0.16.0 b/metadata/md5-cache/dev-ruby/sus-0.16.0
index 9b04eb78c4c1..8a2d5ca4d46b 100644
--- a/metadata/md5-cache/dev-ruby/sus-0.16.0
+++ b/metadata/md5-cache/dev-ruby/sus-0.16.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ioquatix/sus/archive/v0.16.0.tar.gz -> sus-0.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bea243292a54cca139631ab2f0ea2092
diff --git a/metadata/md5-cache/dev-ruby/sus-0.18.0 b/metadata/md5-cache/dev-ruby/sus-0.18.0
index d74d02a36816..6ccee7c5a057 100644
--- a/metadata/md5-cache/dev-ruby/sus-0.18.0
+++ b/metadata/md5-cache/dev-ruby/sus-0.18.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ioquatix/sus/archive/v0.18.0.tar.gz -> sus-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bea243292a54cca139631ab2f0ea2092
diff --git a/metadata/md5-cache/dev-ruby/sync-0.5.0 b/metadata/md5-cache/dev-ruby/sync-0.5.0
index eeb24d71b1fd..1cbf8d3f52ee 100644
--- a/metadata/md5-cache/dev-ruby/sync-0.5.0
+++ b/metadata/md5-cache/dev-ruby/sync-0.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/sync/archive/v0.5.0.tar.gz -> sync-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4ce39a74dc4d2a1e61ce4557abafde1e
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index afaa168c6436..bc3902f834e3 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6cda2e34ea8422a2456d067420942cd7
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
index 9f0c7e5d3f09..bba09408cbea 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/sys-uname-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=27b5ab33eb03148b1d7827e8cd433142
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1 b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
index 348eb92168a0..99338d9a3398 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/syslogger-1.6.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e6034720a827764567678dc56b961767
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1 b/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
index 487dcccf5b1c..0e1a9ea027ef 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/systemu-2.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ae3d35d3f812c4ea0d3336ad09a34351
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1 b/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
index da923870039a..dd8c187c45ab 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tdiff-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=592dff91fa0ec4e28a4d22d34ad8fb0c
diff --git a/metadata/md5-cache/dev-ruby/temple-0.10.0 b/metadata/md5-cache/dev-ruby/temple-0.10.0
index cb0f4728d827..5ff6589c8d61 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.10.0
+++ b/metadata/md5-cache/dev-ruby/temple-0.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7aa06a675688a12ba6f290ea62cbbe0b
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.2-r1 b/metadata/md5-cache/dev-ruby/temple-0.8.2-r1
index 61824b276e72..0aed42c4dec5 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c97f5cea3f8b158facb0f87c67af5898
diff --git a/metadata/md5-cache/dev-ruby/temple-0.9.1 b/metadata/md5-cache/dev-ruby/temple-0.9.1
index fd6c8370c865..56c544fffbcb 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.9.1
+++ b/metadata/md5-cache/dev-ruby/temple-0.9.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=998655c03da13004b1db8866d0553c31
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
index 4c7c69c75f75..80f2a8206e72 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=63113c7b89c2e0e98e232c918ddbb571
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2 b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
index cb624a8e4487..8c82c779a203 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tj/terminal-table/archive/v1.8.0.tar.gz -> terminal-table-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=967020fd52f63c91fab6adf880be79cd
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0 b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
index e0a663d11d7c..4ef8422ecf48 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
+++ b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tj/terminal-table/archive/v2.0.0.tar.gz -> terminal-table-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=df19108bb9cfd3246c492cb78fec85ca
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-3.0.2 b/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
index d201d4678a08..ecd0bd7f6995 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
+++ b/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/tj/terminal-table/archive/v3.0.2.tar.gz -> terminal-table-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96c60fca89653bea385fc21bca372134
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.9 b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
index c8897dae5a66..c5d31e3250cc 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.3.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c52cb18c4b20059ea869806fc14d1acc
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.9 b/metadata/md5-cache/dev-ruby/test-unit-3.4.9
index 1a94e8404da1..9312ef5aa108 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.4.9.tar.gz -> test-unit-3.4.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8fbad472e0f6ae6d9e52de208771b865
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.5.3 b/metadata/md5-cache/dev-ruby/test-unit-3.5.3
index 609c7b78dbf1..1fd6e10969a5 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.5.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.5.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.5.3.tar.gz -> test-unit-3.5.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=04885b53d0f6b5768a7ea315549f6e3d
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.5.5 b/metadata/md5-cache/dev-ruby/test-unit-3.5.5
index 379e87846c5d..1280e4312eb5 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.5.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.5.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.5.5.tar.gz -> test-unit-3.5.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a277e2669b7bfd3a1528bc27c9357320
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.5.7 b/metadata/md5-cache/dev-ruby/test-unit-3.5.7
index 3ba81ed6ecaa..ecf266c718bf 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.5.7
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.5.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.5.7.tar.gz -> test-unit-3.5.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a277e2669b7bfd3a1528bc27c9357320
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
index d8d1f004e028..97c7ea069af5 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test-unit-rr-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4becfc97cbd046538e5b047b737942de
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
index b05ee610b17e..2ac84906b257 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test_construct-2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=20d43467d43ac7817588bc7fa12d0ffe
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
index 23bf865b3d9c..4f7428c76d44 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/archive/v0.0.6 -> test_declarative-0.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=821855c266d37275689ef664319049ce
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1-r1 b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
index b61641542cc3..742c5d5300ce 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ea49b63bb5383062d831bd09079748c9
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
index 7162fb3c76e4..c17d44b27c63 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-hyphen-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8e92aba23ce886771ad8a01a4a285360
diff --git a/metadata/md5-cache/dev-ruby/thor-1.1.0 b/metadata/md5-cache/dev-ruby/thor-1.1.0
index 32e9f2e52fa1..5e5e97297435 100644
--- a/metadata/md5-cache/dev-ruby/thor-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thor-1.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/erikhuda/thor/archive/v1.1.0.tar.gz -> thor-git-1.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3800a0f895972940fa80e51fb6c091c4
diff --git a/metadata/md5-cache/dev-ruby/thor-1.2.1 b/metadata/md5-cache/dev-ruby/thor-1.2.1
index a449247a0c19..a8ee463b08dc 100644
--- a/metadata/md5-cache/dev-ruby/thor-1.2.1
+++ b/metadata/md5-cache/dev-ruby/thor-1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/erikhuda/thor/archive/v1.2.1.tar.gz -> thor-git-1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0e6d7d08e0d77d39178bad867a8a3bea
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.1 b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
index e87779d23ad6..8cd57d070b01 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.1
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_order-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=91b45c842260318ff536ae57fdd0885b
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
index c629f01b4a62..23a6c01cdc1d 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_safe-0.3.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fde4e861d96e48f7d3cea8462a14008a
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
index fa072b65b5f1..b1950e781d6a 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy-ext-0.1.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e1c2a84a9c8aa5243a35f6ad0319d34e
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
index cb80a334253b..44fd8072a182 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy_table-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8c0fbac2699626562e95fa7448ccc314
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.11 b/metadata/md5-cache/dev-ruby/tilt-2.0.11
index c2b3187f3f7b..d2b0a03b1fb5 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.11
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rtomayko/tilt/archive/v2.0.11.tar.gz -> tilt-2.0.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=282dbd84acd3cef585df535e62e77604
diff --git a/metadata/md5-cache/dev-ruby/time-0.2.0 b/metadata/md5-cache/dev-ruby/time-0.2.0
index 3e333c78e62b..2009cddb18ce 100644
--- a/metadata/md5-cache/dev-ruby/time-0.2.0
+++ b/metadata/md5-cache/dev-ruby/time-0.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/time/archive/v0.2.0.tar.gz -> time-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2d1072ec543bb9444a6b33cd918b17e1
diff --git a/metadata/md5-cache/dev-ruby/time-0.2.1 b/metadata/md5-cache/dev-ruby/time-0.2.1
index 59519eb29b02..7f168425fed7 100644
--- a/metadata/md5-cache/dev-ruby/time-0.2.1
+++ b/metadata/md5-cache/dev-ruby/time-0.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/time/archive/v0.2.1.tar.gz -> time-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=784ff3faac61b55d8e6a1e65584b61fb
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.4 b/metadata/md5-cache/dev-ruby/timecop-0.9.4
index 31cff997c1bf..14e34b8527d8 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.4
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5f967273baea411cfa319650336fcb55
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.5 b/metadata/md5-cache/dev-ruby/timecop-0.9.5
index 0747305e4b27..2a5b3632f551 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.5
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a355f4f1e1156550910978e45bbe8e2b
diff --git a/metadata/md5-cache/dev-ruby/timeout-0.2.0 b/metadata/md5-cache/dev-ruby/timeout-0.2.0
index fa5cea60e429..9024c948f5c5 100644
--- a/metadata/md5-cache/dev-ruby/timeout-0.2.0
+++ b/metadata/md5-cache/dev-ruby/timeout-0.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/timeout/archive/v0.2.0.tar.gz -> timeout-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9cbb51954608fdca4d174b23e9582cb5
diff --git a/metadata/md5-cache/dev-ruby/timeout-0.3.0 b/metadata/md5-cache/dev-ruby/timeout-0.3.0
index a8aaa2fa9f24..e0eac9a0c4af 100644
--- a/metadata/md5-cache/dev-ruby/timeout-0.3.0
+++ b/metadata/md5-cache/dev-ruby/timeout-0.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/timeout/archive/v0.3.0.tar.gz -> timeout-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9cbb51954608fdca4d174b23e9582cb5
diff --git a/metadata/md5-cache/dev-ruby/timeout-0.3.1 b/metadata/md5-cache/dev-ruby/timeout-0.3.1
index 90c9a628171e..67d05337d15c 100644
--- a/metadata/md5-cache/dev-ruby/timeout-0.3.1
+++ b/metadata/md5-cache/dev-ruby/timeout-0.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/timeout/archive/v0.3.1.tar.gz -> timeout-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=86ae440826da99a772720e3f35b3de3e
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.3 b/metadata/md5-cache/dev-ruby/timers-4.3.3
index 79ee5d579456..e78c68234a5a 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.3
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/tarcieri/timers/archive/v4.3.3.tar.gz -> timers-4.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1e9a992050eaf95e937db9e12e2e545e
diff --git a/metadata/md5-cache/dev-ruby/tins-1.29.1 b/metadata/md5-cache/dev-ruby/tins-1.29.1
index 4f3ad5d97be1..95926783f12f 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.29.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.29.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( 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	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=42bee8576a84d661391f61b01732c892
diff --git a/metadata/md5-cache/dev-ruby/tins-1.31.0 b/metadata/md5-cache/dev-ruby/tins-1.31.0
index b28c688993ab..43b769b58389 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.31.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.31.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.31.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=032479715ff4b0f66569a53e044eeb3a
diff --git a/metadata/md5-cache/dev-ruby/tins-1.31.1 b/metadata/md5-cache/dev-ruby/tins-1.31.1
index e7d36c5faa6f..89091e4719fa 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.31.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.31.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.31.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fed3277e752bb40acb048b8fdf01cc90
diff --git a/metadata/md5-cache/dev-ruby/tins-1.32.0 b/metadata/md5-cache/dev-ruby/tins-1.32.0
index f51798a3146e..1dd67172fd03 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.32.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.32.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.32.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c2dabe1d0038cc514e4c26ed8301d7c2
diff --git a/metadata/md5-cache/dev-ruby/tins-1.32.1 b/metadata/md5-cache/dev-ruby/tins-1.32.1
index 16c190208139..f671bf2f5f40 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.32.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.32.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.32.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c2dabe1d0038cc514e4c26ed8301d7c2
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
index e6169c40bfc5..7ddb2a06427f 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tokyocabinet-1.32.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=87ca921baa7b2ad955b971fb21a5fb9c
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
index 3a59b6881195..b2ac1e62dcda 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.1.tar.gz -> tomlrb-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9f2a2244ff97bb5c21bd1edbf33efcd4
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.2 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
index 8a3775964b5a..a4018603eb4e 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.2.tar.gz -> tomlrb-2.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e5ccd9755a41895097655b82beacaaac
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.3 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
index 94deae8096c7..0d1bed541fbf 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.3.tar.gz -> tomlrb-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e5ccd9755a41895097655b82beacaaac
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
index bcafd4fffc62..ffb79427b7ac 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/totoridipjp-0.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d77c92d54095a9c929f4781527181dd7
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
index 9c43f9c010cb..3ff84cf2fdbd 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/transaction-simple-1.4.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=aa7e1014d0c955e527244d7196b19fc6
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1 b/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
index 6577a098c7ed..1a1373ed57bf 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cjheath/treetop/archive/v1.6.11.tar.gz -> treetop-1.6.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=75039da57b1301ae382d9af90e9f083e
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.12 b/metadata/md5-cache/dev-ruby/treetop-1.6.12
index bf4a7b26604a..03b5bc682148 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.12
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.12
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cjheath/treetop/archive/v1.6.12.tar.gz -> treetop-1.6.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=788823db1318fb89065315259845df27
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.9.10 b/metadata/md5-cache/dev-ruby/trollop-2.9.10
index 358d2f3cff28..f03368d74c62 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.9.10
+++ b/metadata/md5-cache/dev-ruby/trollop-2.9.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/trollop-2.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=aa758c581fc93d6f8b51e97346506657
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
index 3a2cebf788b2..a7c81bc4fa9b 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.7
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.7.0.tar.gz -> ttfunk-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=280ce6a55ab08d2829d567ae1132168c
diff --git a/metadata/md5-cache/dev-ruby/tty-color-0.6.0 b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
index 00ffb56d3ae0..a8e9446c7fca 100644
--- a/metadata/md5-cache/dev-ruby/tty-color-0.6.0
+++ b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-color/archive/v0.6.0.tar.gz -> tty-color-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e477882501b76ba658ef29b86fd49d22
diff --git a/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1 b/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
index bde055826084..89341426eaf6 100644
--- a/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
+++ b/metadata/md5-cache/dev-ruby/tty-command-0.10.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-command/archive/v0.10.1.tar.gz -> tty-command-0.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=755475d2b8544a09f827dac40e9b8a68
diff --git a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1 b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
index b81676a527bd..ddab45af59dc 100644
--- a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
+++ b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-cursor/archive/v0.7.1.tar.gz -> tty-cursor-0.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9a2dd9a86db04f8d85673e2b3d2f11f7
diff --git a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0 b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
index be126595445c..db87a795d719 100644
--- a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
+++ b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-editor/archive/v0.7.0.tar.gz -> tty-editor-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=28496ada86598a446251eddadd30e849
diff --git a/metadata/md5-cache/dev-ruby/tty-file-0.10.0 b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
index ea12dfc3d07c..b93e2f29a19a 100644
--- a/metadata/md5-cache/dev-ruby/tty-file-0.10.0
+++ b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-file/archive/v0.10.0.tar.gz -> tty-file-0.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1663651ec999554b1191c820aac7aaba
diff --git a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1 b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
index aacc35f3e360..8ef0e672d15c 100644
--- a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-platform/archive/v0.3.0.tar.gz -> tty-platform-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=de92ec18f4a663c7c4ede2c3ed5ccb12
diff --git a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1 b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
index 8e7128642014..66f09ee264ba 100644
--- a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+++ b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-prompt/archive/v0.23.1.tar.gz -> tty-prompt-0.23.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=65a7d2dfe8201c1563f9f66c89619f57
diff --git a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0 b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
index 3d73990cbb28..290e8622f332 100644
--- a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
+++ b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-reader/archive/v0.9.0.tar.gz -> tty-reader-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2ffae03a3262dd7fea1f7cc51aeea9fb
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
index 8449f2d04dbf..9e0d70243554 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.8.1.tar.gz -> tty-screen-0.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6021da17b4d87ecaa3e8c01d142ab331
diff --git a/metadata/md5-cache/dev-ruby/tty-which-0.5.0 b/metadata/md5-cache/dev-ruby/tty-which-0.5.0
index 74ce5c374901..25e51a74d174 100644
--- a/metadata/md5-cache/dev-ruby/tty-which-0.5.0
+++ b/metadata/md5-cache/dev-ruby/tty-which-0.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-which/archive/v0.5.0.tar.gz -> tty-which-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6f263e8b0f01d9bc59e2b46ef31e0f07
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1 b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
index 54a68d4af80e..27fae9c8b0f5 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/turbolinks-5.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d4d796c4be21bdd6e0e0b866c7212e67
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1 b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
index a4358163f4f6..6411a7a7ab08 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/turbolinks-source-5.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9aab6841a5dcb5b79ae1bad4025d7720
diff --git a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r2 b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r2
index a95666ac93d4..f110c81b95d5 100644
--- a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/sferik/twitter/archive/v7.0.0.tar.gz -> twitter-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d2ccb3c8206b105e7c2451a68f84646f
diff --git a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r3 b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r3
index dd3efbc102e4..a5c862627606 100644
--- a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/sferik/twitter/archive/v7.0.0.tar.gz -> twitter-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e79d0400bd85fd473fdaf771d48fe234
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1 b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
index 22461789b885..476a9258ba68 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.1
 SRC_URI=https://rubygems.org/gems/twitter-text-3.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b5b719ac9c49b91f00ccf52697d77b08
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
index a388a229429c..baef5d91fd19 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/typed-array-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=56fef631f87b7943bb5c5972d4950e40
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.15.2 b/metadata/md5-cache/dev-ruby/typeprof-0.15.2
index 512b887a4e2b..1cefad6c0bca 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.15.2
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.15.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.15.2.tar.gz -> typeprof-0.15.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d8459b0ece1c748a49f6810b66606571
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.2 b/metadata/md5-cache/dev-ruby/typeprof-0.21.2
index 0ce7adb0f9f9..7d56accb863a 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.21.2
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.21.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.2.tar.gz -> typeprof-0.21.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c0d7460c0fd043543cf3b05c20526844
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.3 b/metadata/md5-cache/dev-ruby/typeprof-0.21.3
index 16ead25d017c..1fe6d4280881 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.21.3
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.21.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.3.tar.gz -> typeprof-0.21.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=782a5f5972c48f6c0f3c855e450f0c92
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.4 b/metadata/md5-cache/dev-ruby/typeprof-0.21.4
index 694caf5d5353..9780f934f655 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.21.4
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.21.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.4.tar.gz -> typeprof-0.21.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6c02029f01bd0a026eef59c7f65b3902
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r2 b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r2
index a7d1abf1b3c5..f10ab0310f90 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/typhoeus-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=543165885e2d26126a954caa0bafbbaf
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.10 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.10
index ac6b295c12c7..f6ee1b58c6d7 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.10
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8dbc4b80fabe3aca4f9a12869837d7f4
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.11 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.11
index 1806a423ac0f..3ef98567fd52 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.11
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=86c3fc0cdc6dd1645bf9bcadae49c2df
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.9 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
index bd2727749f69..ffd638a2a0aa 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0a7046099d2eab0643e904d72fa4c5ef
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
index 4d57a2bc385a..044574576cbb 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.4.tar.gz -> tzinfo-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e6cef082e47dd8498e4a127f3db66aae
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.5 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.5
index c45f67f2d8a8..f4f4f26da666 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.5
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.5.tar.gz -> tzinfo-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c85a04e9dfefad6037869a7975f57254
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.6 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.6
index 3d5e29003a8d..a294c4c31dbc 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.6
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.6.tar.gz -> tzinfo-2.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=281bd62490cdf846477a1c17b80eb7f1
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
index 513201d11370..7da905a06f1a 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r3
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bd4a6c2aabcdea787ff5bbebb03b4943
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1 b/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
index 54fe9dbce4a9..7b31b408034b 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/lautis/uglifier/archive/v4.2.0.tar.gz -> uglifier-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b041b87cbfd6d440bf68a3f4eb71fff4
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4-r1 b/metadata/md5-cache/dev-ruby/unf-0.1.4-r1
index e84615ace30a..127039bdcde4 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f9ca18f3dd91f281f75d569daba92562
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
index 79d069637dc7..2f609949d2a4 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.7.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1fd8143c194299377bc513a925f974e6
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
index 14d11f40ca2f..3f7a9a0f7f0c 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=246f2a2a6c802f5f3321af75e5ef110e
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
index 1a06eaa2cec2..b7b331eb3b7e 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5cb48255f6f1641dbe8660485d241ce6
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
index 0101826080aa..20489355abe2 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=af0f6bc41d438cb979db3bcfb34f0283
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
index 2016767eb57a..a8c270c0dc5c 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v1.7.0.tar.gz -> unicode-display_width-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bd0f8835d1237a31a494a86f575fad14
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
index 6ef5e354722e..fbb7a1f5feab 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.1.0.tar.gz -> unicode-display_width-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=639151bf30300a42f77ea02fb5ddadfd
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
index 0a46c03d1614..473650160b03 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.2.0.tar.gz -> unicode-display_width-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=639151bf30300a42f77ea02fb5ddadfd
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.3.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.3.0
index 9c7aefae43aa..89b0f4e0e633 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.3.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.3.0.tar.gz -> unicode-display_width-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2d5dab02ad791b4eb20cede26ac36222
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
index 67cad2688875..71415ebfd731 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.4.2.tar.gz -> unicode-display_width-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=703e98353ae5932915ea6a81af9b00cd
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0-r1 b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
index 2a261366065c..b9624b1f6aed 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0-r1
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a45b8704b2505e0c9e27a4f7ecc4e12c
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0 b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
index afec656a4ff7..ecce87cf9831 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/uuidtools-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=195b422f090988a98347254498f324a5
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
index 424fc3b066cf..b4a9e477e6da 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.5.tar.gz -> vagrant_cloud-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=bb21b082fd8856430f9a5d761d874db1
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1 b/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
index ef0fc83901d0..ab85c14210bf 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/vcard-0.3.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vcard-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f8d683e56e49e36dc57da1a10df1f88d
diff --git a/metadata/md5-cache/dev-ruby/vcr-5.1.0 b/metadata/md5-cache/dev-ruby/vcr-5.1.0
index 165090e5987d..1f1b6f71cd1e 100644
--- a/metadata/md5-cache/dev-ruby/vcr-5.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-5.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/vcr/vcr/archive/v5.1.0.tar.gz -> vcr-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5088062c0b741964002c1c5492edede1
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.0.0 b/metadata/md5-cache/dev-ruby/vcr-6.0.0
index 9e973364900c..b243155ab97a 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.0.0.tar.gz -> vcr-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9572943ed7ba3f6efe85bdc919d20dd1
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.1.0 b/metadata/md5-cache/dev-ruby/vcr-6.1.0
index b60b11212847..fbbbc6048d67 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.1.0.tar.gz -> vcr-6.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3557c702076d8e987f9d2a90adb150b9
diff --git a/metadata/md5-cache/dev-ruby/virtus-2.0.0 b/metadata/md5-cache/dev-ruby/virtus-2.0.0
index a8ec71aa1fd4..95973e894575 100644
--- a/metadata/md5-cache/dev-ruby/virtus-2.0.0
+++ b/metadata/md5-cache/dev-ruby/virtus-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/virtus-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d3cb7f1e8387f001e6e3c789ecdb8b26
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.7.1 b/metadata/md5-cache/dev-ruby/vlad-2.7.1
index 116c442fe2a1..7ca757723e47 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.7.1
+++ b/metadata/md5-cache/dev-ruby/vlad-2.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vlad-2.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=190200078f4be99d7a483e5be0637830
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.9-r1 b/metadata/md5-cache/dev-ruby/warden-1.2.9-r1
index a7bc9c4dc1bf..ea3bb5f198f2 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wardencommunity/warden/archive/v1.2.9.tar.gz -> warden-1.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=130b30421f771c98528faad5e94d1fab
diff --git a/metadata/md5-cache/dev-ruby/web-console-4.2.0 b/metadata/md5-cache/dev-ruby/web-console-4.2.0
index 5b4b023a54fc..caf273e1dd09 100644
--- a/metadata/md5-cache/dev-ruby/web-console-4.2.0
+++ b/metadata/md5-cache/dev-ruby/web-console-4.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/web-console/archive/v4.2.0.tar.gz -> web-console-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=498142a8a0c9c38e2a172b5c6ca1c093
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.14.0 b/metadata/md5-cache/dev-ruby/webmock-3.14.0
index bede3fc59155..e0c4b318fe29 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.14.0
+++ b/metadata/md5-cache/dev-ruby/webmock-3.14.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f883469a0e19dfa4fe07a4a2cdea870f
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.14.0-r1 b/metadata/md5-cache/dev-ruby/webmock-3.14.0-r1
index 615e8740a544..3761086ce7f2 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/webmock-3.14.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=71b4334cca5d34f3603da99572c23a6f
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.15.0 b/metadata/md5-cache/dev-ruby/webmock-3.15.0
index 24e0c72bfc63..e707565eaa31 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.15.0
+++ b/metadata/md5-cache/dev-ruby/webmock-3.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5feed6c8f79d141321e3300e3b8e6da4
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.17.1 b/metadata/md5-cache/dev-ruby/webmock-3.17.1
index 08b95bd6ce3b..c2fce537022d 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.17.1
+++ b/metadata/md5-cache/dev-ruby/webmock-3.17.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.17.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5feed6c8f79d141321e3300e3b8e6da4
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.18.1 b/metadata/md5-cache/dev-ruby/webmock-3.18.1
index 0c348fb158fa..50e32e9373fa 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.18.1
+++ b/metadata/md5-cache/dev-ruby/webmock-3.18.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.18.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5feed6c8f79d141321e3300e3b8e6da4
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.7.0 b/metadata/md5-cache/dev-ruby/webrick-1.7.0
index 8da0653243c1..ed8484b0c8f7 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.7.0
+++ b/metadata/md5-cache/dev-ruby/webrick-1.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.7.0.tar.gz -> webrick-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=68796ef1304857b9e62648cadaa7a965
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1 b/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
index cc8a31266c51..ee732197e324 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.7.0.tar.gz -> webrick-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c397fabfe773a51141ddb0066614bbcd
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.8.0 b/metadata/md5-cache/dev-ruby/webrick-1.8.0
index 2c1f71dabbc2..159146f42a1e 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.8.0
+++ b/metadata/md5-cache/dev-ruby/webrick-1.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.8.0.tar.gz -> webrick-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ed5868f39a3e09a708b402511f46f6e
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.8.1 b/metadata/md5-cache/dev-ruby/webrick-1.8.1
index 354ad4fb0f52..c0611d19ca50 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.8.1
+++ b/metadata/md5-cache/dev-ruby/webrick-1.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.8.1.tar.gz -> webrick-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ed5868f39a3e09a708b402511f46f6e
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
index 0372a618bb27..bb052561ffdf 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webrobots-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a8b7cc20c15d53056e433af2bc6fdd87
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1 b/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
index 9502807b887e..b78aeddb668a 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/websocket-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f44d965cf5927ee374ca464673bbf0b3
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
index 2796bea18a63..c88e707918b8 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.5.tar.gz -> websocket-driver-0.6.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8c91f1c3a4a6480a69c09ac38ab2988b
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
index 01391d997059..08de5484c977 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.7.5.tar.gz -> websocket-driver-0.7.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0c7f5e00916ee3aff74bb98f6aa281e6
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
index 6ec651d4b55f..33feb3706b75 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5-r1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=89c305127c4b435dbd576e979bca5a46
diff --git a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1 b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
index d5c227cb0e17..d725638b62fe 100644
--- a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/whole_history_rating-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=05e35806ffae53e006783e11576c5f3d
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.3.1 b/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
index 2332cd23b21a..0dd3b8cf1859 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/will_paginate-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=be356e38c4e15cab3a8c3fcb12679190
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.3 b/metadata/md5-cache/dev-ruby/windows_error-0.1.3
index 9587167146a3..da476c3d45c4 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.3
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.1
 SRC_URI=https://rubygems.org/gems/windows_error-0.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=93d69409880ed85ac4e88a3dad8eacde
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.4 b/metadata/md5-cache/dev-ruby/windows_error-0.1.4
index bdb3d1efc7d5..82c44ab557d8 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.4
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.1
 SRC_URI=https://rubygems.org/gems/windows_error-0.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dd693a33c99ed3f2858a36f7de6cac81
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.5 b/metadata/md5-cache/dev-ruby/windows_error-0.1.5
index 5b1af0d65f13..1fbb04cb4292 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.5
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.1
 SRC_URI=https://rubygems.org/gems/windows_error-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=83d3533546a9754b4da35257e9749bfd
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
index 348182fe9b4d..31ed04d2fc09 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wirble-0.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d869bcf2133f969562e27c8fb3079e48
diff --git a/metadata/md5-cache/dev-ruby/wisper-2.0.1 b/metadata/md5-cache/dev-ruby/wisper-2.0.1
index 0b8ff875fd0f..862966aabe51 100644
--- a/metadata/md5-cache/dev-ruby/wisper-2.0.1
+++ b/metadata/md5-cache/dev-ruby/wisper-2.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wisper-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0b983566be43a96646bdc851a678bb14
diff --git a/metadata/md5-cache/dev-ruby/x25519-1.0.10 b/metadata/md5-cache/dev-ruby/x25519-1.0.10
index 001ac48aa061..a4d9c854dddb 100644
--- a/metadata/md5-cache/dev-ruby/x25519-1.0.10
+++ b/metadata/md5-cache/dev-ruby/x25519-1.0.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/x25519/archive/v1.0.10.tar.gz -> x25519-1.0.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=83f1cfb495e65bde1bd0dee3981cbcd9
diff --git a/metadata/md5-cache/dev-ruby/x25519-1.0.9 b/metadata/md5-cache/dev-ruby/x25519-1.0.9
index 0ec809d59bc9..418a0360c345 100644
--- a/metadata/md5-cache/dev-ruby/x25519-1.0.9
+++ b/metadata/md5-cache/dev-ruby/x25519-1.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/x25519/archive/v1.0.9.tar.gz -> x25519-1.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5d31d7adc720217aeaace0407dcae2c8
diff --git a/metadata/md5-cache/dev-ruby/xdr-3.0.3 b/metadata/md5-cache/dev-ruby/xdr-3.0.3
index c28ea5cd10e1..add24e6d5320 100644
--- a/metadata/md5-cache/dev-ruby/xdr-3.0.3
+++ b/metadata/md5-cache/dev-ruby/xdr-3.0.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/astroband/ruby-xdr/archive/v3.0.3.tar.gz -> xdr-3.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dc9a7548c75a8bd2becb6c2bdf05cdc0
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.9 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.9
index 83fe7d64e02e..182caaaf9fc3 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.9
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/7b8bdf7b33ab872bb4d1fb8eeecba5c5e1a4a421.tar.gz -> xml-simple-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=945f20e0b86ffa2bb961064d2cf5a413
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
index 2f2c9fc383d5..8ff9aebbc5ac 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.2.tar.gz -> xmlrpc-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8b2e5312e6ec815781ffbb7ab08a16d0
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1 b/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
index 0784c431bb60..2d03ce35d9c9 100644
--- a/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/xpath-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ec973fb08ac94083ea67d624bfde7553
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
index 46dbbba05bfe..35f513b1d458 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=752b4aa8d0f1200c006aeb18a3776438
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
index dfafad73d0fe..72b08d697949 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=507ee67647eeef082e747c35851403d5
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.26 b/metadata/md5-cache/dev-ruby/yard-0.9.26
index c6fa1cf65fa1..55eec86486dd 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.26
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.26
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.26.tar.gz -> yard-0.9.26-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=16f7b76acd160ae011f97273b2e8af15
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.27 b/metadata/md5-cache/dev-ruby/yard-0.9.27
index 69529d32f234..2ad9682117da 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.27
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.27
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.27.tar.gz -> yard-0.9.27-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=08b3625ccef67ad5796ea1618fc70096
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.28 b/metadata/md5-cache/dev-ruby/yard-0.9.28
index 260854e7a60e..e89572681625 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.28
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.28
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.28.tar.gz -> yard-0.9.28-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=484aaf43a34f038ee21f144316f73b50
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2 b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
index 48ee44b3152e..f4f20b1e680c 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.4.2.tar.gz -> zeitwerk-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f3489ff427fdf5bfd7530ef12e032364
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4 b/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
index a47715908bec..c37b887e53c8 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.5.4.tar.gz -> zeitwerk-2.5.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a16601a851098b74e7c7d46a82a98a60
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
index 2e586e45650c..c5d4d8e80b58 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.0.tar.gz -> zeitwerk-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=76f7a0f2ae977a548fe315840d29057a
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.1 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.1
index ed519e0c8ac5..02b361a874a6 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.1
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.1.tar.gz -> zeitwerk-2.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ebdf00811bb9f7012c02d90f5b7f7693
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.3 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.3
index 791ebb6ead29..db1591505023 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.3
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.3.tar.gz -> zeitwerk-2.6.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ebdf00811bb9f7012c02d90f5b7f7693
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6
index b9a5edad9bda..ad968a4b1a6d 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.6.tar.gz -> zeitwerk-2.6.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ebdf00811bb9f7012c02d90f5b7f7693
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.12.1 b/metadata/md5-cache/dev-ruby/zentest-4.12.1
index 799ba37c93e4..1bf1dda34bb7 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.12.1
+++ b/metadata/md5-cache/dev-ruby/zentest-4.12.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ZenTest-4.12.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eefa1dcf6319cca906dc79d89cc31d5f
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 782909a2e8d1..34d0f6db9302 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
new file mode 100644
index 000000000000..eb9ed2c5c0a2
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
@@ -0,0 +1,17 @@
+BDEPEND=python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) vorbis? ( media-libs/libvorbis )
+DESCRIPTION=The Snack Sound Toolkit (Tcl)
+EAPI=8
+HOMEPAGE=http://www.speech.kth.se/snack/
+INHERIT=distutils-r1 flag-o-matic toolchain-funcs virtualx
+IUSE=alsa examples python vorbis python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=427bb4ad24047209d64a158472d3af90
diff --git a/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2 b/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
new file mode 100644
index 000000000000..a06a82f38ec0
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-lang/tcl:0=
+DESCRIPTION=Python package for Tcl
+EAPI=8
+HOMEPAGE=http://jfontain.free.fr/tclpython.htm
+INHERIT=python-single-r1 toolchain-funcs
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-lang/tcl:0=
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/amykyta3/tclpython/archive/5.0.tar.gz -> tclpython-5.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=367b5d045c61eac279a2bf3ee9ca27c1
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 6de29191af42..03a3e2035d28 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/rubber-1.5.1-r1 b/metadata/md5-cache/dev-tex/rubber-1.5.1-r1
index 37128fdf48c6..8670b8727c58 100644
--- a/metadata/md5-cache/dev-tex/rubber-1.5.1-r1
+++ b/metadata/md5-cache/dev-tex/rubber-1.5.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/latex-base virtual/texi2dvi python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=virtual/latex-base virtual/texi2dvi python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=A LaTeX wrapper for automatically building documents
 EAPI=7
 HOMEPAGE=https://launchpad.net/rubber/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
-RDEPEND=virtual/latex-base python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=virtual/latex-base python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://launchpad.net/rubber/trunk/1.5.1/+download/rubber-1.5.1.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=730275f9287b719aa817075ae9187ab3
+_md5_=1f5e4646b01837a15b98a9a42cd637a3
diff --git a/metadata/md5-cache/dev-tex/rubber-1.6.0-r1 b/metadata/md5-cache/dev-tex/rubber-1.6.0-r1
index 0c0b98d51169..7e1c91ba95ae 100644
--- a/metadata/md5-cache/dev-tex/rubber-1.6.0-r1
+++ b/metadata/md5-cache/dev-tex/rubber-1.6.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=virtual/latex-base virtual/texi2dvi test? ( app-text/ghostscript-gpl app-text/texlive-core dev-tex/biber dev-tex/biblatex dev-tex/glossaries dev-tex/latex-beamer python_targets_python3_9? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-texlive/texlive-latexextra dev-texlive/texlive-pstricks media-gfx/asymptote ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+BDEPEND=virtual/latex-base virtual/texi2dvi test? ( app-text/ghostscript-gpl app-text/texlive-core dev-tex/biber dev-tex/biblatex dev-tex/glossaries dev-tex/latex-beamer python_targets_python3_9? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-texlive/texlive-latexextra dev-texlive/texlive-pstricks media-gfx/asymptote ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=A LaTeX wrapper for automatically building documents
 EAPI=7
 HOMEPAGE=https://gitlab.com/latex-rubber/rubber
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~ppc ~riscv ~x86
 LICENSE=GPL-3+
-RDEPEND=virtual/latex-base python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=virtual/latex-base python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/latex-rubber/rubber/-/archive/1.6.0/rubber-1.6.0.tar.bz2
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bce695dfeb6e9e11a7de3d69d2e3fea9
+_md5_=276c0880409ef3c603c7fda149fb9f5f
diff --git a/metadata/md5-cache/dev-tex/rubber-9999 b/metadata/md5-cache/dev-tex/rubber-9999
index 910763070c61..46a0cbc5ded9 100644
--- a/metadata/md5-cache/dev-tex/rubber-9999
+++ b/metadata/md5-cache/dev-tex/rubber-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/latex-base virtual/texi2dvi test? ( app-text/ghostscript-gpl app-text/texlive-core dev-tex/biber dev-tex/biblatex dev-tex/glossaries dev-tex/latex-beamer python_targets_python3_9? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-texlive/texlive-latexextra dev-texlive/texlive-pstricks media-gfx/asymptote ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/latex-base virtual/texi2dvi test? ( app-text/ghostscript-gpl app-text/texlive-core dev-tex/biber dev-tex/biblatex dev-tex/glossaries dev-tex/latex-beamer python_targets_python3_9? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-tex/pythontex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-texlive/texlive-latexextra dev-texlive/texlive-pstricks media-gfx/asymptote ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=A LaTeX wrapper for automatically building documents
 EAPI=7
 HOMEPAGE=https://gitlab.com/latex-rubber/rubber
 INHERIT=distutils-r1 git-r3
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=virtual/latex-base python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=virtual/latex-base python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ed98e2df74d97adcbe5f2b8f78c9e5af
+_md5_=ee592bcc0470f0ecb806ec55c98c4dcb
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 20a034a76f5a..123adabdc2b1 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/android-studio-2022.1.1.21 b/metadata/md5-cache/dev-util/android-studio-2022.1.1.21
new file mode 100644
index 000000000000..721f7bc814c8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-2022.1.1.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postrm
+DESCRIPTION=Android development environment based on IntelliJ IDEA
+EAPI=8
+HOMEPAGE=https://developer.android.com/studio
+INHERIT=desktop wrapper
+IUSE=selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 android BSD BSD-2 CDDL-1.1 CPL-0.5 EPL-1.0 GPL-2 GPL-2+ JDOM IJG LGPL-2.1 MIT MPL-1.1 MPL-2.0 NPL-1.1 OFL ZLIB
+RDEPEND=selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.8-r4 >=dev-libs/expat-2.5.0 >=dev-libs/libffi-3.4.4 >=media-libs/fontconfig-2.14.0-r1 >=media-libs/freetype-2.12.1-r1 >=media-libs/libpng-1.6.39 >=media-libs/mesa-22.2.5[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.13-r1 >=x11-libs/libX11-1.8.1 >=x11-libs/libXau-1.0.11 >=x11-libs/libXdamage-1.1.6 >=x11-libs/libXdmcp-1.1.4-r2 >=x11-libs/libXext-1.3.5 >=x11-libs/libXfixes-6.0.0 >=x11-libs/libXrender-0.9.11 >=x11-libs/libXxf86vm-1.1.5 >=x11-libs/libdrm-2.4.114 >=x11-libs/libxcb-1.15-r1 >=x11-libs/libxshmfence-1.3.2 virtual/libcrypt:=
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.1.1.21/android-studio-2022.1.1.21-linux.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=5c626ad5a3ab4faf22a2cf212eb8c8d6
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
index 61465521a58d..43bbfda1f16e 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aruba-0.6.2.gem
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=19cad316a0b504cba01ad67a0a3e032e
diff --git a/metadata/md5-cache/dev-util/aruba-2.0.0 b/metadata/md5-cache/dev-util/aruba-2.0.0
index 7f1530434191..c6baaeb607ab 100644
--- a/metadata/md5-cache/dev-util/aruba-2.0.0
+++ b/metadata/md5-cache/dev-util/aruba-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/aruba/archive/v2.0.0.tar.gz -> aruba-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=132bf0a23dddc1ba7e4fcc50ebcd1f0f
diff --git a/metadata/md5-cache/dev-util/aruba-2.1.0 b/metadata/md5-cache/dev-util/aruba-2.1.0
index 326ab9e7fbf6..d85dc9fcc2db 100644
--- a/metadata/md5-cache/dev-util/aruba-2.1.0
+++ b/metadata/md5-cache/dev-util/aruba-2.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/aruba/archive/v2.1.0.tar.gz -> aruba-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2d9b1821bc8a4a43af1bf9c1fb38be43
diff --git a/metadata/md5-cache/dev-util/cargo-tarpaulin-0.25.1 b/metadata/md5-cache/dev-util/cargo-tarpaulin-0.25.1
new file mode 100644
index 000000000000..fa7c6b679be3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-tarpaulin-0.25.1
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Cargo-Tarpaulin is a tool to determine code coverage achieved via tests
+EAPI=8
+HOMEPAGE=https://github.com/xd009642/tarpaulin
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://github.com/xd009642/tarpaulin/archive/refs/tags/0.25.1.tar.gz -> cargo-tarpaulin-0.25.1.gh.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/android_system_properties/0.1.4/download -> android_system_properties-0.1.4.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.65/download -> anyhow-1.0.65.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/camino/1.1.1/download -> camino-1.1.1.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.3/download -> cargo_metadata-0.15.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/coveralls-api/0.5.0/download -> coveralls-api-0.5.0.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/curl/0.4.44/download -> curl-0.4.44.crate https://crates.io/api/v1/crates/curl-sys/0.4.56+curl-7.83.1/download -> curl-sys-0.4.56+curl-7.83.1.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/gimli/0.27.2/download -> gimli-0.27.2.crate https://crates.io/api/v1/crates/git2/0.16.1/download -> git2-0.16.1.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/gzip-header/0.3.0/download -> gzip-header-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.46/download -> iana-time-zone-0.1.46.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.8.2/download -> indexmap-1.8.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.3/download -> io-lifetimes-1.0.3.crate https://crates.io/api/v1/crates/itoa/1.0.3/download -> itoa-1.0.3.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/js-sys/0.3.59/download -> js-sys-0.3.59.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lcov/0.8.1/download -> lcov-0.8.1.crate https://crates.io/api/v1/crates/leb128/0.2.5/download -> leb128-0.2.5.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libgit2-sys/0.14.2+1.5.1/download -> libgit2-sys-0.14.2+1.5.1.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.23/download -> libssh2-sys-0.2.23.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.3/download -> linux-raw-sys-0.1.3.crate https://crates.io/api/v1/crates/llvm_profparser/0.3.1/download -> llvm_profparser-0.3.1.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/matchers/0.0.1/download -> matchers-0.0.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md5/0.7.0/download -> md5-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/object/0.26.2/download -> object-0.26.2.crate https://crates.io/api/v1/crates/object/0.30.3/download -> object-0.30.3.crate https://crates.io/api/v1/crates/once_cell/1.13.1/download -> once_cell-1.13.1.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.25.0+1.1.1t/download -> openssl-src-111.25.0+1.1.1t.crate https://crates.io/api/v1/crates/openssl-sys/0.9.75/download -> openssl-sys-0.9.75.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/procfs/0.15.1/download -> procfs-0.15.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-xml/0.27.1/download -> quick-xml-0.27.1.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.4/download -> rustix-0.36.4.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/semver/1.0.13/download -> semver-1.0.13.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.108/download -> syn-1.0.108.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.32/download -> thiserror-1.0.32.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.32/download -> thiserror-impl-1.0.32.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.2.25/download -> tracing-subscriber-0.2.25.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.82/download -> wasm-bindgen-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.82/download -> wasm-bindgen-backend-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.82/download -> wasm-bindgen-macro-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.82/download -> wasm-bindgen-macro-support-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.82/download -> wasm-bindgen-shared-0.2.82.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate
+_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=18de373445d9f46710dd7f26eb14f41e
diff --git a/metadata/md5-cache/dev-util/cmake-3.25.2 b/metadata/md5-cache/dev-util/cmake-3.25.2
index 9081b2f0b1df..ef80d545fcda 100644
--- a/metadata/md5-cache/dev-util/cmake-3.25.2
+++ b/metadata/md5-cache/dev-util/cmake-3.25.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
 IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.25/cmake-3.25.2.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.25.2-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-SHA-256.txt.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=250730f7bb1002bdc3d166a19d774283
+_md5_=c4cb6ee4c402067b6b1d359b7e144d4a
diff --git a/metadata/md5-cache/dev-util/cproto-4.7v b/metadata/md5-cache/dev-util/cproto-4.7v
new file mode 100644
index 000000000000..7b29db1eed71
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cproto-4.7v
@@ -0,0 +1,14 @@
+BDEPEND=app-alternatives/lex app-alternatives/yacc dev-util/gperf verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=unpack
+DEPEND=app-alternatives/lex
+DESCRIPTION=Generate C function prototypes from C source code
+EAPI=8
+HOMEPAGE=https://invisible-island.net/cproto/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/cproto/cproto-4.7v.tgz verify-sig? ( https://invisible-island.net/archives/cproto/cproto-4.7v.tgz.asc )
+_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=416973bc368ac310142d71f38794c6e8
diff --git a/metadata/md5-cache/dev-util/cscope-15.9-r1 b/metadata/md5-cache/dev-util/cscope-15.9-r1
index e5f0afb92f38..d2628748d66d 100644
--- a/metadata/md5-cache/dev-util/cscope-15.9-r1
+++ b/metadata/md5-cache/dev-util/cscope-15.9-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://cscope.sourceforge.net/
 INHERIT=autotools elisp-common toolchain-funcs
 IUSE=emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.9.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a7cb03d462c9e8bbc9144207300dd9ce
+_md5_=12fa11d2e75fff53c43eb9ecc2f7b3ec
diff --git a/metadata/md5-cache/dev-util/cucumber-7.1.0 b/metadata/md5-cache/dev-util/cucumber-7.1.0
index 6520f74ef4a4..30fa887ea8fa 100644
--- a/metadata/md5-cache/dev-util/cucumber-7.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-7.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v7.1.0.tar.gz -> cucumber-7.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=eb5290a225bc6beaf9c38cd8e74b966b
diff --git a/metadata/md5-cache/dev-util/cucumber-8.0.0 b/metadata/md5-cache/dev-util/cucumber-8.0.0
index cc85ae60f510..5569fc26c773 100644
--- a/metadata/md5-cache/dev-util/cucumber-8.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-8.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v8.0.0.tar.gz -> cucumber-8.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=174dbe89c97376f1e94b8d9e8fa957ee
diff --git a/metadata/md5-cache/dev-util/cucumber-ci-environment-9.0.4 b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.0.4
index c6e16280913f..11fa76644131 100644
--- a/metadata/md5-cache/dev-util/cucumber-ci-environment-9.0.4
+++ b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.0.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9
 SRC_URI=https://rubygems.org/gems/cucumber-ci-environment-9.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dca3f8f04d010c312e65658864d18810
diff --git a/metadata/md5-cache/dev-util/cucumber-ci-environment-9.1.0 b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.1.0
index b56e2c4ba347..a4b1862a92bc 100644
--- a/metadata/md5-cache/dev-util/cucumber-ci-environment-9.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9
 SRC_URI=https://rubygems.org/gems/cucumber-ci-environment-9.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=c3ef56837f7bebfbc9318fdb87893e34
diff --git a/metadata/md5-cache/dev-util/cucumber-compatibility-kit-9.2.1-r1 b/metadata/md5-cache/dev-util/cucumber-compatibility-kit-9.2.1-r1
index c6cdb409a7ec..0a773295e745 100644
--- a/metadata/md5-cache/dev-util/cucumber-compatibility-kit-9.2.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-compatibility-kit-9.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9
 SRC_URI=https://rubygems.org/gems/cucumber-compatibility-kit-9.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ea48fc4fe49ca94acc4e3201bbe8b4cb
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.1.1 b/metadata/md5-cache/dev-util/cucumber-core-10.1.1
index 63a08cde9ec6..143217417742 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-10.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.1.1.tar.gz -> cucumber-core-10.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=77d5915fac029b7a25c94b7bb2a9d526
diff --git a/metadata/md5-cache/dev-util/cucumber-core-11.0.0 b/metadata/md5-cache/dev-util/cucumber-core-11.0.0
index 67476adf60ea..dcb21e322a95 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-11.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-11.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=11
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v11.0.0.tar.gz -> cucumber-core-11.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1989201ab916a5c7fcce6559d2274b28
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2 b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
index f607e0bf4dfe..5d6416b75e67 100644
--- a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-create-meta-6.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3f1b9ffd931b3cc443898f0afd85d5a1
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
index 568f695d91d9..6313234d5da7 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=892000a753933205a96d9d6e3213aeaa
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
index 834b63c640d8..59e2cdf6cdf2 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-14.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9fff3ceed4a012b76f389a76e86254e3
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
index 089c767b4dd2..8d76848cc8a0 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-15.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=918e1f5134d3ad333ab1529f35b2407e
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.2.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.2.0
index cd9d12e88ec8..334142031e78 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-15.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-15.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=918e1f5134d3ad333ab1529f35b2407e
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0 b/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
index d3f2f29ff979..f6e2b5ac319e 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=22
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v22.0.0.tar.gz -> cucumber-gherkin-22.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b9560d384258346407155d2fda15716d
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
index deec29216547..745d722a1ee1 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-23.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=23
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v23.0.1.tar.gz -> cucumber-gherkin-23.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3e2a8081fbe909e52c61606bd552b777
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0 b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
index 6f5468fb3515..4ad9353aa933 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-17.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=943d5ee2d4d8e309d1f8a77cb6b0cc8c
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0-r1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0-r1
index ccb52b2d69e6..daf78f33be9c 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0-r1
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-17.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=849fe8fc5a9828049a0360d7e68fd7ab
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0 b/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0
index 9736b3975ed2..54e7536dad7d 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-19.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=19
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-19.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=45f02846ff23af81e41c3d1c4fc3d581
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.1.1 b/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
index 39b1f64bc16f..d8afe4e8b31c 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d766ae5ce9f1a92cd1bb7cec9aaecdd6
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-18.0.0 b/metadata/md5-cache/dev-util/cucumber-messages-18.0.0
index 115e0ca18c79..dbe64f018175 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-18.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-messages-18.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=18
 SRC_URI=https://rubygems.org/gems/cucumber-messages-18.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=74cdc91cc4cc0de0bca9cc2a2c4e41a2
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.5.1 b/metadata/md5-cache/dev-util/cucumber-rails-2.5.1
index ca03c141100c..ed6084248f88 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.5.1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.5.1.tar.gz -> cucumber-rails-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b031c283f7fd6efb565956f305bac80d
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.6.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.6.0
index a0ba4207453a..19c34fc3142d 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.6.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.6.0.tar.gz -> cucumber-rails-2.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=581f3f957d05ff4f9a7bf09839118ffc
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.6.1 b/metadata/md5-cache/dev-util/cucumber-rails-2.6.1
index 546b19796ebc..8fdf6be35d04 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.6.1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.6.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.6.1.tar.gz -> cucumber-rails-2.6.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2dfdaf5c82964587d523fdc51715166e
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
index c95b53afdeba..970c8dafb483 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=e7276891297d79b1f999459eb7111e6f
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.2.1 b/metadata/md5-cache/dev-util/cucumber-wire-6.2.1
index b443d78bf93a..e69400042f83 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-6.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-6.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-wire-6.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b88de256fcd16d1dcc232e53d117c2d5
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0.9999 b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
index 4ba7ca8eed67..eb564980bef2 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
+_md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_rc2 b/metadata/md5-cache/dev-util/lldb-16.0.0_rc2
deleted file mode 100644
index 5b5e6a27d103..000000000000
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-16.0.0_rc2[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-16.0.0_rc2[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.0_rc2[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0_rc2 ~sys-devel/llvm-16.0.0_rc2 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0_rc2 ~sys-devel/llvm-16.0.0_rc2 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0/16
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3 b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
index e2ab6ccfec43..f8711a87e01d 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
@@ -6,6 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org python-single-r1
 IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~loong
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0_rc3 ~sys-devel/llvm-16.0.0_rc3 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
+_md5_=2a25e20ef8aaa790f1ec2991e9b25c7f
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0.9999 b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
index f2cc623fe2ad..4a7acaaee1f9 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
+_md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230211 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230211
deleted file mode 100644
index 87e94b3e1501..000000000000
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-17.0.0_pre20230211[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-17.0.0_pre20230211[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.0_pre20230211[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230211 ~sys-devel/llvm-17.0.0_pre20230211 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230211 ~sys-devel/llvm-17.0.0_pre20230211 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0/17.0.0_pre20230211
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230218 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230218
deleted file mode 100644
index 23115be6dd27..000000000000
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-17.0.0_pre20230218[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-17.0.0_pre20230218[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.0_pre20230218[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230218 ~sys-devel/llvm-17.0.0_pre20230218 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230218 ~sys-devel/llvm-17.0.0_pre20230218 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0/17.0.0_pre20230218
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
index bea3bff80cb5..f5ef4590a802 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
+_md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/maturin-1.0.0_beta3 b/metadata/md5-cache/dev-util/maturin-1.0.0_beta3
deleted file mode 100644
index df2e6702859a..000000000000
--- a/metadata/md5-cache/dev-util/maturin-1.0.0_beta3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/boltons[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ssl? ( dev-libs/openssl:= )
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=8
-HOMEPAGE=https://www.maturin.rs/
-INHERIT=bash-completion-r1 cargo distutils-r1 edo flag-o-matic toolchain-funcs
-IUSE=doc +ssl test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )
-RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-libs/openssl:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v1.0.0-beta.3.tar.gz -> maturin-1.0.0_beta3.gh.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/async-broadcast/0.5.1/download -> async-broadcast-0.5.1.crate https://crates.io/api/v1/crates/async-executor/1.5.0/download -> async-executor-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.12.0/download -> async-io-1.12.0.crate https://crates.io/api/v1/crates/async-lock/2.6.0/download -> async-lock-2.6.0.crate https://crates.io/api/v1/crates/async-recursion/1.0.2/download -> async-recursion-1.0.2.crate https://crates.io/api/v1/crates/async-task/4.3.0/download -> async-task-4.3.0.crate https://crates.io/api/v1/crates/async-trait/0.1.64/download -> async-trait-0.1.64.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/block-modes/0.8.1/download -> block-modes-0.8.1.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/1.3.0/download -> bstr-1.3.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/bytesize/1.2.0/download -> bytesize-1.2.0.crate https://crates.io/api/v1/crates/bzip2/0.4.4/download -> bzip2-0.4.4.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.crate https://crates.io/api/v1/crates/camino/1.1.3/download -> camino-1.1.3.crate https://crates.io/api/v1/crates/cargo-config2/0.1.5/download -> cargo-config2-0.1.5.crate https://crates.io/api/v1/crates/cargo-options/0.6.0/download -> cargo-options-0.6.0.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.14.0/download -> cargo-xwin-0.14.0.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.16.1/download -> cargo-zigbuild-0.16.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.3/download -> cargo_metadata-0.15.3.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.3.crate https://crates.io/api/v1/crates/cfg-expr/0.14.0/download -> cfg-expr-0.14.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chumsky/0.8.0/download -> chumsky-0.8.0.crate https://crates.io/api/v1/crates/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_complete/4.0.7/download -> clap_complete-4.0.7.crate https://crates.io/api/v1/crates/clap_complete_command/0.4.0/download -> clap_complete_command-0.4.0.crate https://crates.io/api/v1/crates/clap_complete_fig/4.0.2/download -> clap_complete_fig-4.0.2.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/concolor/0.0.11/download -> concolor-0.0.11.crate https://crates.io/api/v1/crates/concolor-query/0.1.0/download -> concolor-query-0.1.0.crate https://crates.io/api/v1/crates/concurrent-queue/2.1.0/download -> concurrent-queue-2.1.0.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.5/download -> console-0.15.5.crate https://crates.io/api/v1/crates/const-random/0.1.15/download -> const-random-0.1.15.crate https://crates.io/api/v1/crates/const-random-macro/0.1.15/download -> const-random-macro-0.1.15.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/data-encoding/2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.3/download -> dialoguer-0.10.3.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.3/download -> dunce-1.0.3.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/enumflags2/0.7.5/download -> enumflags2-0.7.5.crate https://crates.io/api/v1/crates/enumflags2_derive/0.7.4/download -> enumflags2_derive-0.7.4.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.3/download -> event-listener-2.5.3.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.6/download -> fat-macho-0.4.6.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs-err/2.9.0/download -> fs-err-2.9.0.crate https://crates.io/api/v1/crates/futures-core/0.3.26/download -> futures-core-0.3.26.crate https://crates.io/api/v1/crates/futures-io/0.3.26/download -> futures-io-0.3.26.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.26/download -> futures-macro-0.3.26.crate https://crates.io/api/v1/crates/futures-sink/0.3.26/download -> futures-sink-0.3.26.crate https://crates.io/api/v1/crates/futures-task/0.3.26/download -> futures-task-0.3.26.crate https://crates.io/api/v1/crates/futures-util/0.3.26/download -> futures-util-0.3.26.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/goblin/0.6.0/download -> goblin-0.6.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/hkdf/0.12.3/download -> hkdf-0.12.3.crate https://crates.io/api/v1/crates/hmac/0.12.1/download -> hmac-0.12.1.crate https://crates.io/api/v1/crates/home/0.5.4/download -> home-0.5.4.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.20/download -> ignore-0.4.20.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/indicatif/0.17.3/download -> indicatif-0.17.3.crate https://crates.io/api/v1/crates/indoc/2.0.0/download -> indoc-2.0.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/keyring/2.0.1/download -> keyring-2.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.3.2/download -> lddtree-0.3.2.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/linux-keyutils/0.2.2/download -> linux-keyutils-0.2.2.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.30.4/download -> minijinja-0.30.4.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nix/0.25.1/download -> nix-0.25.1.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/normpath/1.0.1/download -> normpath-1.0.1.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.3/download -> num-complex-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.45/download -> openssl-0.10.45.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.25.0+1.1.1t/download -> openssl-src-111.25.0+1.1.1t.crate https://crates.io/api/v1/crates/openssl-sys/0.9.80/download -> openssl-sys-0.9.80.crate https://crates.io/api/v1/crates/ordered-stream/0.1.4/download -> ordered-stream-0.1.4.crate https://crates.io/api/v1/crates/os_pipe/1.1.2/download -> os_pipe-1.1.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.6/download -> parking_lot_core-0.9.6.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pep440/0.2.0/download -> pep440-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/1.0.2/download -> platform-info-1.0.2.crate https://crates.io/api/v1/crates/polling/2.5.2/download -> polling-2.5.2.crate https://crates.io/api/v1/crates/portable-atomic/0.3.19/download -> portable-atomic-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.3/download -> pyproject-toml-0.3.3.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.5/download -> python-pkginfo-0.5.5.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/quoted_printable/0.4.7/download -> quoted_printable-0.4.7.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.2.1/download -> rfc2047-decoder-0.2.1.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.7/download -> rustix-0.36.7.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/rustls-pemfile/1.0.1/download -> rustls-pemfile-1.0.1.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.21/download -> schannel-0.1.21.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/3.0.1/download -> secret-service-3.0.1.crate https://crates.io/api/v1/crates/security-framework/2.8.2/download -> security-framework-2.8.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.8.0/download -> security-framework-sys-2.8.0.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/serde_repr/0.1.10/download -> serde_repr-0.1.10.crate https://crates.io/api/v1/crates/serde_spanned/0.6.1/download -> serde_spanned-0.6.1.crate https://crates.io/api/v1/crates/sha1/0.10.5/download -> sha1-0.10.5.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/slab/0.4.8/download -> slab-0.4.8.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snapbox/0.4.4/download -> snapbox-0.4.4.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.1/download -> snapbox-macros-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.6/download -> target-lexicon-0.12.6.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread_local/1.1.7/download -> thread_local-1.1.7.crate https://crates.io/api/v1/crates/time/0.3.20/download -> time-0.3.20.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.8/download -> time-macros-0.2.8.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/toml/0.7.2/download -> toml-0.7.2.crate https://crates.io/api/v1/crates/toml_datetime/0.6.1/download -> toml_datetime-0.6.1.crate https://crates.io/api/v1/crates/toml_edit/0.19.4/download -> toml_edit-0.19.4.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.16/download -> tracing-subscriber-0.3.16.crate https://crates.io/api/v1/crates/trycmd/0.14.11/download -> trycmd-0.14.11.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/uds_windows/1.0.2/download -> uds_windows-1.0.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.3.0/download -> uuid-1.3.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/versions/4.1.0/download -> versions-4.1.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/winnow/0.3.0/download -> winnow-0.3.0.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.10/download -> xwin-0.2.10.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zbus/3.9.0/download -> zbus-3.9.0.crate https://crates.io/api/v1/crates/zbus_macros/3.9.0/download -> zbus_macros-3.9.0.crate https://crates.io/api/v1/crates/zbus_names/2.5.0/download -> zbus_names-2.5.0.crate https://crates.io/api/v1/crates/zeroize/1.5.7/download -> zeroize-1.5.7.crate https://crates.io/api/v1/crates/zip/0.6.4/download -> zip-0.6.4.crate https://crates.io/api/v1/crates/zvariant/3.11.0/download -> zvariant-3.11.0.crate https://crates.io/api/v1/crates/zvariant_derive/3.11.0/download -> zvariant_derive-3.11.0.crate test? ( https://crates.io/api/v1/crates/askama/0.11.1/download -> askama-0.11.1.crate https://crates.io/api/v1/crates/askama_derive/0.11.2/download -> askama_derive-0.11.2.crate https://crates.io/api/v1/crates/askama_escape/0.10.3/download -> askama_escape-0.10.3.crate https://crates.io/api/v1/crates/askama_shared/0.12.2/download -> askama_shared-0.12.2.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/camino/1.1.2/download -> camino-1.1.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cc/1.0.74/download -> cc-1.0.74.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/libc/0.2.134/download -> libc-0.2.134.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.6/download -> python3-dll-a-0.2.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/uniffi/0.23.0/download -> uniffi-0.23.0.crate https://crates.io/api/v1/crates/uniffi_bindgen/0.23.0/download -> uniffi_bindgen-0.23.0.crate https://crates.io/api/v1/crates/uniffi_build/0.23.0/download -> uniffi_build-0.23.0.crate https://crates.io/api/v1/crates/uniffi_checksum_derive/0.23.0/download -> uniffi_checksum_derive-0.23.0.crate https://crates.io/api/v1/crates/uniffi_core/0.23.0/download -> uniffi_core-0.23.0.crate https://crates.io/api/v1/crates/uniffi_macros/0.23.0/download -> uniffi_macros-0.23.0.crate https://crates.io/api/v1/crates/uniffi_meta/0.23.0/download -> uniffi_meta-0.23.0.crate https://crates.io/api/v1/crates/uniffi_testing/0.23.0/download -> uniffi_testing-0.23.0.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/weedle2/4.0.0/download -> weedle2-4.0.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=10ad5c92eff852d884d0b2602a1775bb
diff --git a/metadata/md5-cache/dev-util/maturin-1.0.0_beta4 b/metadata/md5-cache/dev-util/maturin-1.0.0_beta4
new file mode 100644
index 000000000000..9c69ef066650
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-1.0.0_beta4
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/boltons[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=ssl? ( dev-libs/openssl:= )
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=8
+HOMEPAGE=https://www.maturin.rs/
+INHERIT=bash-completion-r1 cargo distutils-r1 edo flag-o-matic toolchain-funcs
+IUSE=doc +ssl test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 doc? ( CC-BY-4.0 OFL-1.1 )
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-libs/openssl:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v1.0.0-beta.4.tar.gz -> maturin-1.0.0_beta4.gh.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/bstr/1.3.0/download -> bstr-1.3.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/bytesize/1.2.0/download -> bytesize-1.2.0.crate https://crates.io/api/v1/crates/bzip2/0.4.4/download -> bzip2-0.4.4.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.crate https://crates.io/api/v1/crates/camino/1.1.3/download -> camino-1.1.3.crate https://crates.io/api/v1/crates/cargo-config2/0.1.5/download -> cargo-config2-0.1.5.crate https://crates.io/api/v1/crates/cargo-options/0.6.0/download -> cargo-options-0.6.0.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.14.0/download -> cargo-xwin-0.14.0.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.16.1/download -> cargo-zigbuild-0.16.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.3/download -> cargo_metadata-0.15.3.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.3.crate https://crates.io/api/v1/crates/cfg-expr/0.14.0/download -> cfg-expr-0.14.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chumsky/0.8.0/download -> chumsky-0.8.0.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_complete/4.0.7/download -> clap_complete-4.0.7.crate https://crates.io/api/v1/crates/clap_complete_command/0.4.0/download -> clap_complete_command-0.4.0.crate https://crates.io/api/v1/crates/clap_complete_fig/4.0.2/download -> clap_complete_fig-4.0.2.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/concolor/0.0.11/download -> concolor-0.0.11.crate https://crates.io/api/v1/crates/concolor-query/0.1.0/download -> concolor-query-0.1.0.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.5/download -> console-0.15.5.crate https://crates.io/api/v1/crates/const-random/0.1.15/download -> const-random-0.1.15.crate https://crates.io/api/v1/crates/const-random-macro/0.1.15/download -> const-random-macro-0.1.15.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/data-encoding/2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/dialoguer/0.10.3/download -> dialoguer-0.10.3.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.3/download -> dunce-1.0.3.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.6/download -> fat-macho-0.4.6.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs-err/2.9.0/download -> fs-err-2.9.0.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/goblin/0.6.0/download -> goblin-0.6.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/home/0.5.4/download -> home-0.5.4.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.20/download -> ignore-0.4.20.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/indicatif/0.17.3/download -> indicatif-0.17.3.crate https://crates.io/api/v1/crates/indoc/2.0.0/download -> indoc-2.0.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/keyring/2.0.1/download -> keyring-2.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.3.2/download -> lddtree-0.3.2.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/linux-keyutils/0.2.3/download -> linux-keyutils-0.2.3.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.30.4/download -> minijinja-0.30.4.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/normpath/1.0.1/download -> normpath-1.0.1.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/openssl/0.10.45/download -> openssl-0.10.45.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.25.0+1.1.1t/download -> openssl-src-111.25.0+1.1.1t.crate https://crates.io/api/v1/crates/openssl-sys/0.9.80/download -> openssl-sys-0.9.80.crate https://crates.io/api/v1/crates/os_pipe/1.1.2/download -> os_pipe-1.1.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.6/download -> parking_lot_core-0.9.6.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pep440/0.2.0/download -> pep440-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/1.0.2/download -> platform-info-1.0.2.crate https://crates.io/api/v1/crates/portable-atomic/0.3.19/download -> portable-atomic-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.3/download -> pyproject-toml-0.3.3.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.5/download -> python-pkginfo-0.5.5.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/quoted_printable/0.4.7/download -> quoted_printable-0.4.7.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.2.1/download -> rfc2047-decoder-0.2.1.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.7/download -> rustix-0.36.7.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/rustls-pemfile/1.0.1/download -> rustls-pemfile-1.0.1.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.21/download -> schannel-0.1.21.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/security-framework/2.8.2/download -> security-framework-2.8.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.8.0/download -> security-framework-sys-2.8.0.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/serde_spanned/0.6.1/download -> serde_spanned-0.6.1.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snapbox/0.4.4/download -> snapbox-0.4.4.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.1/download -> snapbox-macros-0.3.1.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.6/download -> target-lexicon-0.12.6.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread_local/1.1.7/download -> thread_local-1.1.7.crate https://crates.io/api/v1/crates/time/0.3.20/download -> time-0.3.20.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.8/download -> time-macros-0.2.8.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/toml/0.7.2/download -> toml-0.7.2.crate https://crates.io/api/v1/crates/toml_datetime/0.6.1/download -> toml_datetime-0.6.1.crate https://crates.io/api/v1/crates/toml_edit/0.19.4/download -> toml_edit-0.19.4.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.16/download -> tracing-subscriber-0.3.16.crate https://crates.io/api/v1/crates/trycmd/0.14.11/download -> trycmd-0.14.11.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.3.0/download -> uuid-1.3.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/versions/4.1.0/download -> versions-4.1.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/winnow/0.3.3/download -> winnow-0.3.3.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.10/download -> xwin-0.2.10.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zeroize/1.5.7/download -> zeroize-1.5.7.crate https://crates.io/api/v1/crates/zip/0.6.4/download -> zip-0.6.4.crate test? ( https://crates.io/api/v1/crates/askama/0.11.1/download -> askama-0.11.1.crate https://crates.io/api/v1/crates/askama_derive/0.11.2/download -> askama_derive-0.11.2.crate https://crates.io/api/v1/crates/askama_escape/0.10.3/download -> askama_escape-0.10.3.crate https://crates.io/api/v1/crates/askama_shared/0.12.2/download -> askama_shared-0.12.2.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/camino/1.1.2/download -> camino-1.1.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cc/1.0.74/download -> cc-1.0.74.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/libc/0.2.134/download -> libc-0.2.134.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.6/download -> python3-dll-a-0.2.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/uniffi/0.23.0/download -> uniffi-0.23.0.crate https://crates.io/api/v1/crates/uniffi_bindgen/0.23.0/download -> uniffi_bindgen-0.23.0.crate https://crates.io/api/v1/crates/uniffi_build/0.23.0/download -> uniffi_build-0.23.0.crate https://crates.io/api/v1/crates/uniffi_checksum_derive/0.23.0/download -> uniffi_checksum_derive-0.23.0.crate https://crates.io/api/v1/crates/uniffi_core/0.23.0/download -> uniffi_core-0.23.0.crate https://crates.io/api/v1/crates/uniffi_macros/0.23.0/download -> uniffi_macros-0.23.0.crate https://crates.io/api/v1/crates/uniffi_meta/0.23.0/download -> uniffi_meta-0.23.0.crate https://crates.io/api/v1/crates/uniffi_testing/0.23.0/download -> uniffi_testing-0.23.0.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/weedle2/4.0.0/download -> weedle2-4.0.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=74e1698d50c8346b42a39af46f577239
diff --git a/metadata/md5-cache/dev-util/perf-6.1.11 b/metadata/md5-cache/dev-util/perf-6.1.11
deleted file mode 100644
index cdd7ee65cbf9..000000000000
--- a/metadata/md5-cache/dev-util/perf-6.1.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchutils sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-DEFINED_PHASES=compile install prepare pretend setup test unpack
-DEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt? ( virtual/libcrypt:= ) clang? ( sys-devel/clang:= sys-devel/llvm:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-libs/elfutils sys-libs/binutils-libs:= >=sys-kernel/linux-headers-5.10 java? ( virtual/jdk ) !!sys-devel/llvm:0
-DESCRIPTION=Userland tools for Linux Performance Counters
-EAPI=7
-HOMEPAGE=https://perf.wiki.kernel.org/
-INHERIT=bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
-IUSE=audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt? ( virtual/libcrypt:= ) clang? ( sys-devel/clang:= sys-devel/llvm:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-libs/elfutils sys-libs/binutils-libs:=
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.11.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a91c8107d89c4b0038b88aea05d206df
diff --git a/metadata/md5-cache/dev-util/perf-6.2 b/metadata/md5-cache/dev-util/perf-6.2
new file mode 100644
index 000000000000..db2990e14581
--- /dev/null
+++ b/metadata/md5-cache/dev-util/perf-6.2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common app-text/xmlto sys-process/time ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+DEFINED_PHASES=compile install prepare pretend setup test unpack
+DEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt? ( virtual/libcrypt:= ) clang? ( sys-devel/clang:= sys-devel/llvm:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-libs/elfutils sys-libs/binutils-libs:= >=sys-kernel/linux-headers-5.10 java? ( virtual/jdk ) !!sys-devel/llvm:0
+DESCRIPTION=Userland tools for Linux Performance Counters
+EAPI=7
+HOMEPAGE=https://perf.wiki.kernel.org/
+INHERIT=bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+IUSE=audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt? ( virtual/libcrypt:= ) clang? ( sys-devel/clang:= sys-devel/llvm:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-libs/elfutils sys-libs/binutils-libs:=
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a91c8107d89c4b0038b88aea05d206df
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1 b/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
index cae141063bde..2029a8f324c8 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
+++ b/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://gitea.treehouse.systems/ariadne/pkgconf
 INHERIT=multilib multilib-minimal
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=!dev-util/pkgconfig
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.8.0.tar.xz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2a2fe6a5e0c95e8281329824c77076da
+_md5_=473ffc520ef905900b5edf0f76ccb522
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.8.1 b/metadata/md5-cache/dev-util/pkgconf-1.8.1
index 05eafa584815..6766b60ff806 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.8.1
+++ b/metadata/md5-cache/dev-util/pkgconf-1.8.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitea.treehouse.systems/ariadne/pkgconf
 INHERIT=multilib multilib-minimal
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=!dev-util/pkgconfig
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.8.1.tar.xz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5258943c0ab362987b7898a4243b8781
+_md5_=e5486822d09a0d16a7503bd2d4de8c03
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.9.4 b/metadata/md5-cache/dev-util/pkgconf-1.9.4
index f44cd072255f..25891be05b7b 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.9.4
+++ b/metadata/md5-cache/dev-util/pkgconf-1.9.4
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.9.4.tar.xz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cef7df86bed7c722fc562d67dbe7a73b
+_md5_=79eff6f07e4acac1f1e1baf82e69177c
diff --git a/metadata/md5-cache/dev-util/pkgconf-9999 b/metadata/md5-cache/dev-util/pkgconf-9999
index 4aba3c161d83..fa9e09546663 100644
--- a/metadata/md5-cache/dev-util/pkgconf-9999
+++ b/metadata/md5-cache/dev-util/pkgconf-9999
@@ -11,4 +11,4 @@ RDEPEND=!dev-util/pkgconfig
 RESTRICT=!test? ( test )
 SLOT=0/4
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cef7df86bed7c722fc562d67dbe7a73b
+_md5_=79eff6f07e4acac1f1e1baf82e69177c
diff --git a/metadata/md5-cache/dev-util/ruff-0.0.247 b/metadata/md5-cache/dev-util/ruff-0.0.247
deleted file mode 100644
index 4098d1820c3f..000000000000
--- a/metadata/md5-cache/dev-util/ruff-0.0.247
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/maturin-0.14.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=An extremely fast Python linter, written in Rust
-EAPI=8
-HOMEPAGE=https://github.com/charliermarsh/ruff
-INHERIT=distutils-r1 cargo
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 Unlicense WTFPL-2 ZLIB
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/alloc-no-stdlib/2.0.4/download -> alloc-no-stdlib-2.0.4.crate https://crates.io/api/v1/crates/alloc-stdlib/0.2.2/download -> alloc-stdlib-0.2.2.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anes/0.1.6/download -> anes-0.1.6.crate https://crates.io/api/v1/crates/annotate-snippets/0.6.1/download -> annotate-snippets-0.6.1.crate https://crates.io/api/v1/crates/annotate-snippets/0.9.1/download -> annotate-snippets-0.9.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/ascii/1.1.0/download -> ascii-1.1.0.crate https://crates.io/api/v1/crates/ascii-canvas/3.0.0/download -> ascii-canvas-3.0.0.crate https://crates.io/api/v1/crates/assert_cmd/2.0.8/download -> assert_cmd-2.0.8.crate https://crates.io/api/v1/crates/async-compression/0.3.15/download -> async-compression-0.3.15.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/base64/0.20.0/download -> base64-0.20.0.crate https://crates.io/api/v1/crates/base64/0.21.0/download -> base64-0.21.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bisection/0.1.0/download -> bisection-0.1.0.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/brotli/3.3.4/download -> brotli-3.3.4.crate https://crates.io/api/v1/crates/brotli-decompressor/2.3.4/download -> brotli-decompressor-2.3.4.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bstr/1.2.0/download -> bstr-1.2.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/bytemuck/1.13.0/download -> bytemuck-1.13.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/cachedir/0.3.0/download -> cachedir-0.3.0.crate https://crates.io/api/v1/crates/cast/0.3.0/download -> cast-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chic/1.2.2/download -> chic-1.2.2.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/ciborium/0.2.0/download -> ciborium-0.2.0.crate https://crates.io/api/v1/crates/ciborium-io/0.2.0/download -> ciborium-io-0.2.0.crate https://crates.io/api/v1/crates/ciborium-ll/0.2.0/download -> ciborium-ll-0.2.0.crate https://crates.io/api/v1/crates/clap/3.2.23/download -> clap-3.2.23.crate https://crates.io/api/v1/crates/clap/4.1.6/download -> clap-4.1.6.crate https://crates.io/api/v1/crates/clap_complete/4.1.1/download -> clap_complete-4.1.1.crate https://crates.io/api/v1/crates/clap_complete_command/0.4.0/download -> clap_complete_command-0.4.0.crate https://crates.io/api/v1/crates/clap_complete_fig/4.1.0/download -> clap_complete_fig-4.1.0.crate https://crates.io/api/v1/crates/clap_derive/4.1.0/download -> clap_derive-4.1.0.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/clap_lex/0.3.1/download -> clap_lex-0.3.1.crate https://crates.io/api/v1/crates/clearscreen/2.0.0/download -> clearscreen-2.0.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/colored/2.0.0/download -> colored-2.0.0.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.5/download -> console-0.15.5.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.7/download -> console_error_panic_hook-0.1.7.crate https://crates.io/api/v1/crates/console_log/0.2.0/download -> console_log-0.2.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/criterion/0.4.0/download -> criterion-0.4.0.crate https://crates.io/api/v1/crates/criterion-plot/0.5.0/download -> criterion-plot-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/cxx/1.0.90/download -> cxx-1.0.90.crate https://crates.io/api/v1/crates/cxx-build/1.0.90/download -> cxx-build-1.0.90.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.90/download -> cxxbridge-flags-1.0.90.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.90/download -> cxxbridge-macro-1.0.90.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/drop_bomb/0.1.5/download -> drop_bomb-0.1.5.crate https://crates.io/api/v1/crates/dyn-clone/1.0.10/download -> dyn-clone-1.0.10.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/ena/0.14.0/download -> ena-0.14.0.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/env_proxy/0.4.1/download -> env_proxy-0.4.1.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/exr/1.5.3/download -> exr-1.5.3.crate https://crates.io/api/v1/crates/fancy-regex/0.7.1/download -> fancy-regex-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fern/0.6.1/download -> fern-0.6.1.crate https://crates.io/api/v1/crates/filetime/0.2.20/download -> filetime-0.2.20.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/flume/0.10.14/download -> flume-0.10.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.26/download -> futures-channel-0.3.26.crate https://crates.io/api/v1/crates/futures-core/0.3.26/download -> futures-core-0.3.26.crate https://crates.io/api/v1/crates/futures-io/0.3.26/download -> futures-io-0.3.26.crate https://crates.io/api/v1/crates/futures-sink/0.3.26/download -> futures-sink-0.3.26.crate https://crates.io/api/v1/crates/futures-task/0.3.26/download -> futures-task-0.3.26.crate https://crates.io/api/v1/crates/futures-util/0.3.26/download -> futures-util-0.3.26.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/gethostname/0.4.1/download -> gethostname-0.4.1.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gif/0.11.4/download -> gif-0.11.4.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/h2/0.3.15/download -> h2-0.3.15.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/half/2.2.1/download -> half-2.2.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hermit-abi/0.3.1/download -> hermit-abi-0.3.1.crate https://crates.io/api/v1/crates/hexf-parse/0.2.1/download -> hexf-parse-0.2.1.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/hyper/0.14.24/download -> hyper-0.14.24.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.20/download -> ignore-0.4.20.crate https://crates.io/api/v1/crates/image/0.24.5/download -> image-0.24.5.crate https://crates.io/api/v1/crates/imperative/1.0.4/download -> imperative-1.0.4.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/insta/1.26.0/download -> insta-1.26.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.5/download -> io-lifetimes-1.0.5.crate https://crates.io/api/v1/crates/ipnet/2.7.1/download -> ipnet-2.7.1.crate https://crates.io/api/v1/crates/is-terminal/0.4.3/download -> is-terminal-0.4.3.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/joinery/2.1.0/download -> joinery-2.1.0.crate https://crates.io/api/v1/crates/jpeg-decoder/0.3.0/download -> jpeg-decoder-0.3.0.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/kqueue/1.0.7/download -> kqueue-1.0.7.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.crate https://crates.io/api/v1/crates/lalrpop/0.19.8/download -> lalrpop-0.19.8.crate https://crates.io/api/v1/crates/lalrpop-util/0.19.8/download -> lalrpop-util-0.19.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lebe/0.5.2/download -> lebe-0.5.2.crate https://crates.io/api/v1/crates/lexical-parse-float/0.8.5/download -> lexical-parse-float-0.8.5.crate https://crates.io/api/v1/crates/lexical-parse-integer/0.8.6/download -> lexical-parse-integer-0.8.6.crate https://crates.io/api/v1/crates/lexical-util/0.8.5/download -> lexical-util-0.8.5.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.30/download -> libmimalloc-sys-0.1.30.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lz4_flex/0.9.5/download -> lz4_flex-0.9.5.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.10/download -> matches-0.1.10.crate https://crates.io/api/v1/crates/mdcat/1.0.0/download -> mdcat-1.0.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/mimalloc/0.1.34/download -> mimalloc-0.1.34.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nextest-workspace-hack/0.1.0/download -> nextest-workspace-hack-0.1.0.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/nohash-hasher/0.2.0/download -> nohash-hasher-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/nom8/0.2.0/download -> nom8-0.2.0.crate https://crates.io/api/v1/crates/notify/5.1.0/download -> notify-5.1.0.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.3/download -> num-complex-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/num_enum/0.5.9/download -> num_enum-0.5.9.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.9/download -> num_enum_derive-0.5.9.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/path-absolutize/3.0.14/download -> path-absolutize-3.0.14.crate https://crates.io/api/v1/crates/path-dedot/3.0.18/download -> path-dedot-3.0.18.crate https://crates.io/api/v1/crates/peg/0.8.1/download -> peg-0.8.1.crate https://crates.io/api/v1/crates/peg-macros/0.8.1/download -> peg-macros-0.8.1.crate https://crates.io/api/v1/crates/peg-runtime/0.8.1/download -> peg-runtime-0.8.1.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pest/2.5.5/download -> pest-2.5.5.crate https://crates.io/api/v1/crates/pest_derive/2.5.5/download -> pest_derive-2.5.5.crate https://crates.io/api/v1/crates/pest_generator/2.5.5/download -> pest_generator-2.5.5.crate https://crates.io/api/v1/crates/pest_meta/2.5.5/download -> pest_meta-2.5.5.crate https://crates.io/api/v1/crates/petgraph/0.6.3/download -> petgraph-0.6.3.crate https://crates.io/api/v1/crates/phf/0.11.1/download -> phf-0.11.1.crate https://crates.io/api/v1/crates/phf_codegen/0.11.1/download -> phf_codegen-0.11.1.crate https://crates.io/api/v1/crates/phf_generator/0.11.1/download -> phf_generator-0.11.1.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.11.1/download -> phf_shared-0.11.1.crate https://crates.io/api/v1/crates/pico-args/0.4.2/download -> pico-args-0.4.2.crate https://crates.io/api/v1/crates/pin-project/1.0.12/download -> pin-project-1.0.12.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.12/download -> pin-project-internal-1.0.12.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/plotters/0.3.4/download -> plotters-0.3.4.crate https://crates.io/api/v1/crates/plotters-backend/0.3.4/download -> plotters-backend-0.3.4.crate https://crates.io/api/v1/crates/plotters-svg/0.3.3/download -> plotters-svg-0.3.3.crate https://crates.io/api/v1/crates/png/0.17.7/download -> png-0.17.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.1.5/download -> predicates-2.1.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.5/download -> predicates-core-1.0.5.crate https://crates.io/api/v1/crates/predicates-tree/1.0.7/download -> predicates-tree-1.0.7.crate https://crates.io/api/v1/crates/proc-macro-crate/1.3.0/download -> proc-macro-crate-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pulldown-cmark/0.9.2/download -> pulldown-cmark-0.9.2.crate https://crates.io/api/v1/crates/quick-junit/0.3.2/download -> quick-junit-0.3.2.crate https://crates.io/api/v1/crates/quick-xml/0.26.0/download -> quick-xml-0.26.0.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/radium/0.7.0/download -> radium-0.7.0.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.14/download -> reqwest-0.11.14.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rust-stemmers/1.2.0/download -> rust-stemmers-1.2.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustix/0.36.8/download -> rustix-0.36.8.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schemars/0.8.11/download -> schemars-0.8.11.crate https://crates.io/api/v1/crates/schemars_derive/0.8.11/download -> schemars_derive-0.8.11.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde-wasm-bindgen/0.4.5/download -> serde-wasm-bindgen-0.4.5.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_derive_internals/0.26.0/download -> serde_derive_internals-0.26.0.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/serde_spanned/0.6.1/download -> serde_spanned-0.6.1.crate https://crates.io/api/v1/crates/serde_test/1.0.152/download -> serde_test-1.0.152.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shellexpand/3.0.0/download -> shellexpand-3.0.0.crate https://crates.io/api/v1/crates/simd-adler32/0.3.4/download -> simd-adler32-0.3.4.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/spin/0.9.5/download -> spin-0.9.5.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/string_cache/0.8.4/download -> string_cache-0.8.4.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.24.1/download -> strum-0.24.1.crate https://crates.io/api/v1/crates/strum_macros/0.24.3/download -> strum_macros-0.24.3.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/syntect/5.0.0/download -> syntect-5.0.0.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/terminfo/0.7.5/download -> terminfo-0.7.5.crate https://crates.io/api/v1/crates/termtree/0.4.0/download -> termtree-0.4.0.crate https://crates.io/api/v1/crates/test-case/2.2.2/download -> test-case-2.2.2.crate https://crates.io/api/v1/crates/test-case-macros/2.2.2/download -> test-case-macros-2.2.2.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread_local/1.1.7/download -> thread_local-1.1.7.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/tiff/0.8.1/download -> tiff-0.8.1.crate https://crates.io/api/v1/crates/tikv-jemalloc-sys/0.5.3+5.3.0-patched/download -> tikv-jemalloc-sys-0.5.3+5.3.0-patched.crate https://crates.io/api/v1/crates/tikv-jemallocator/0.5.0/download -> tikv-jemallocator-0.5.0.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/titlecase/2.2.1/download -> titlecase-2.2.1.crate https://crates.io/api/v1/crates/tokio/1.25.0/download -> tokio-1.25.0.crate https://crates.io/api/v1/crates/tokio-util/0.7.7/download -> tokio-util-0.7.7.crate https://crates.io/api/v1/crates/toml/0.6.0/download -> toml-0.6.0.crate https://crates.io/api/v1/crates/toml_datetime/0.5.1/download -> toml_datetime-0.5.1.crate https://crates.io/api/v1/crates/toml_edit/0.18.1/download -> toml_edit-0.18.1.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.16/download -> tracing-subscriber-0.3.16.crate https://crates.io/api/v1/crates/try-lock/0.2.4/download -> try-lock-0.2.4.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.5/download -> ucd-trie-0.1.5.crate https://crates.io/api/v1/crates/unic-char-property/0.9.0/download -> unic-char-property-0.9.0.crate https://crates.io/api/v1/crates/unic-char-range/0.9.0/download -> unic-char-range-0.9.0.crate https://crates.io/api/v1/crates/unic-common/0.9.0/download -> unic-common-0.9.0.crate https://crates.io/api/v1/crates/unic-emoji-char/0.9.0/download -> unic-emoji-char-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-category/0.9.0/download -> unic-ucd-category-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-ident/0.9.0/download -> unic-ucd-ident-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-version/0.9.0/download -> unic-ucd-version-0.9.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/unicode_names2/0.5.1/download -> unicode_names2-0.5.1.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.3.0/download -> uuid-1.3.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/volatile/0.3.0/download -> volatile-0.3.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.34/download -> wasm-bindgen-futures-0.4.34.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-test/0.3.34/download -> wasm-bindgen-test-0.3.34.crate https://crates.io/api/v1/crates/wasm-bindgen-test-macro/0.3.34/download -> wasm-bindgen-test-macro-0.3.34.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/widestring/0.5.1/download -> widestring-0.5.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.43.0/download -> windows-0.43.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/yansi-term/0.1.2/download -> yansi-term-0.1.2.crate https://crates.io/api/v1/crates/zune-inflate/0.2.50/download -> zune-inflate-0.2.50.crate https://github.com/charliermarsh/LibCST/archive/f2f0b7a487a8725d161fe8b3ed73a6758b21e177.tar.gz -> LibCST-f2f0b7a487a8725d161fe8b3ed73a6758b21e177.gh.tar.gz https://github.com/RustPython/RustPython/archive/61b48f108982d865524f86624a9d5bc2ae3bccef.tar.gz -> RustPython-61b48f108982d865524f86624a9d5bc2ae3bccef.gh.tar.gz https://github.com/charliermarsh/LibCST/archive/f2f0b7a487a8725d161fe8b3ed73a6758b21e177.tar.gz -> LibCST-f2f0b7a487a8725d161fe8b3ed73a6758b21e177.gh.tar.gz https://github.com/RustPython/RustPython/archive/61b48f108982d865524f86624a9d5bc2ae3bccef.tar.gz -> RustPython-61b48f108982d865524f86624a9d5bc2ae3bccef.gh.tar.gz https://github.com/RustPython/RustPython/archive/61b48f108982d865524f86624a9d5bc2ae3bccef.tar.gz -> RustPython-61b48f108982d865524f86624a9d5bc2ae3bccef.gh.tar.gz https://github.com/RustPython/RustPython/archive/61b48f108982d865524f86624a9d5bc2ae3bccef.tar.gz -> RustPython-61b48f108982d865524f86624a9d5bc2ae3bccef.gh.tar.gz https://github.com/charliermarsh/ruff/archive/refs/tags/v0.0.247.tar.gz -> ruff-0.0.247.gh.tar.gz
-_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d2aee73d24caa177404986cfded20fe5
diff --git a/metadata/md5-cache/dev-util/ruff-0.0.253 b/metadata/md5-cache/dev-util/ruff-0.0.253
new file mode 100644
index 000000000000..eeeb45e5f4f3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ruff-0.0.253
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/maturin-0.14.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=An extremely fast Python linter, written in Rust
+EAPI=8
+HOMEPAGE=https://github.com/charliermarsh/ruff
+INHERIT=distutils-r1 cargo
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016 Unlicense WTFPL-2 ZLIB
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anes/0.1.6/download -> anes-0.1.6.crate https://crates.io/api/v1/crates/annotate-snippets/0.6.1/download -> annotate-snippets-0.6.1.crate https://crates.io/api/v1/crates/annotate-snippets/0.9.1/download -> annotate-snippets-0.9.1.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/ascii/1.1.0/download -> ascii-1.1.0.crate https://crates.io/api/v1/crates/ascii-canvas/3.0.0/download -> ascii-canvas-3.0.0.crate https://crates.io/api/v1/crates/assert_cmd/2.0.8/download -> assert_cmd-2.0.8.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bisection/0.1.0/download -> bisection-0.1.0.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bstr/1.3.0/download -> bstr-1.3.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/cachedir/0.3.0/download -> cachedir-0.3.0.crate https://crates.io/api/v1/crates/cast/0.3.0/download -> cast-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chic/1.2.2/download -> chic-1.2.2.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/ciborium/0.2.0/download -> ciborium-0.2.0.crate https://crates.io/api/v1/crates/ciborium-io/0.2.0/download -> ciborium-io-0.2.0.crate https://crates.io/api/v1/crates/ciborium-ll/0.2.0/download -> ciborium-ll-0.2.0.crate https://crates.io/api/v1/crates/clap/3.2.23/download -> clap-3.2.23.crate https://crates.io/api/v1/crates/clap/4.1.6/download -> clap-4.1.6.crate https://crates.io/api/v1/crates/clap_complete/4.1.2/download -> clap_complete-4.1.2.crate https://crates.io/api/v1/crates/clap_complete_command/0.4.0/download -> clap_complete_command-0.4.0.crate https://crates.io/api/v1/crates/clap_complete_fig/4.1.1/download -> clap_complete_fig-4.1.1.crate https://crates.io/api/v1/crates/clap_derive/4.1.0/download -> clap_derive-4.1.0.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/clap_lex/0.3.1/download -> clap_lex-0.3.1.crate https://crates.io/api/v1/crates/clearscreen/2.0.0/download -> clearscreen-2.0.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/colored/2.0.0/download -> colored-2.0.0.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.5/download -> console-0.15.5.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.7/download -> console_error_panic_hook-0.1.7.crate https://crates.io/api/v1/crates/console_log/0.2.0/download -> console_log-0.2.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/criterion/0.4.0/download -> criterion-0.4.0.crate https://crates.io/api/v1/crates/criterion-plot/0.5.0/download -> criterion-plot-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/cxx/1.0.91/download -> cxx-1.0.91.crate https://crates.io/api/v1/crates/cxx-build/1.0.91/download -> cxx-build-1.0.91.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.91/download -> cxxbridge-flags-1.0.91.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.91/download -> cxxbridge-macro-1.0.91.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/drop_bomb/0.1.5/download -> drop_bomb-0.1.5.crate https://crates.io/api/v1/crates/dyn-clone/1.0.10/download -> dyn-clone-1.0.10.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/ena/0.14.0/download -> ena-0.14.0.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fern/0.6.1/download -> fern-0.6.1.crate https://crates.io/api/v1/crates/filetime/0.2.20/download -> filetime-0.2.20.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hermit-abi/0.3.1/download -> hermit-abi-0.3.1.crate https://crates.io/api/v1/crates/hexf-parse/0.2.1/download -> hexf-parse-0.2.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.20/download -> ignore-0.4.20.crate https://crates.io/api/v1/crates/imperative/1.0.4/download -> imperative-1.0.4.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/insta/1.28.0/download -> insta-1.28.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.5/download -> io-lifetimes-1.0.5.crate https://crates.io/api/v1/crates/is-macro/0.2.2/download -> is-macro-0.2.2.crate https://crates.io/api/v1/crates/is-terminal/0.4.4/download -> is-terminal-0.4.4.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/joinery/2.1.0/download -> joinery-2.1.0.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/kqueue/1.0.7/download -> kqueue-1.0.7.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.crate https://crates.io/api/v1/crates/lalrpop/0.19.8/download -> lalrpop-0.19.8.crate https://crates.io/api/v1/crates/lalrpop-util/0.19.8/download -> lalrpop-util-0.19.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lexical-parse-float/0.8.5/download -> lexical-parse-float-0.8.5.crate https://crates.io/api/v1/crates/lexical-parse-integer/0.8.6/download -> lexical-parse-integer-0.8.6.crate https://crates.io/api/v1/crates/lexical-util/0.8.5/download -> lexical-util-0.8.5.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.30/download -> libmimalloc-sys-0.1.30.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lz4_flex/0.9.5/download -> lz4_flex-0.9.5.crate https://crates.io/api/v1/crates/matches/0.1.10/download -> matches-0.1.10.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/mimalloc/0.1.34/download -> mimalloc-0.1.34.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.6/download -> mio-0.8.6.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nextest-workspace-hack/0.1.0/download -> nextest-workspace-hack-0.1.0.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/nohash-hasher/0.2.0/download -> nohash-hasher-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/nom8/0.2.0/download -> nom8-0.2.0.crate https://crates.io/api/v1/crates/notify/5.1.0/download -> notify-5.1.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.3/download -> num-complex-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/num_enum/0.5.10/download -> num_enum-0.5.10.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.10/download -> num_enum_derive-0.5.10.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/path-absolutize/3.0.14/download -> path-absolutize-3.0.14.crate https://crates.io/api/v1/crates/path-dedot/3.0.18/download -> path-dedot-3.0.18.crate https://crates.io/api/v1/crates/peg/0.8.1/download -> peg-0.8.1.crate https://crates.io/api/v1/crates/peg-macros/0.8.1/download -> peg-macros-0.8.1.crate https://crates.io/api/v1/crates/peg-runtime/0.8.1/download -> peg-runtime-0.8.1.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pest/2.5.5/download -> pest-2.5.5.crate https://crates.io/api/v1/crates/pest_derive/2.5.5/download -> pest_derive-2.5.5.crate https://crates.io/api/v1/crates/pest_generator/2.5.5/download -> pest_generator-2.5.5.crate https://crates.io/api/v1/crates/pest_meta/2.5.5/download -> pest_meta-2.5.5.crate https://crates.io/api/v1/crates/petgraph/0.6.3/download -> petgraph-0.6.3.crate https://crates.io/api/v1/crates/phf/0.11.1/download -> phf-0.11.1.crate https://crates.io/api/v1/crates/phf_codegen/0.11.1/download -> phf_codegen-0.11.1.crate https://crates.io/api/v1/crates/phf_generator/0.11.1/download -> phf_generator-0.11.1.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.11.1/download -> phf_shared-0.11.1.crate https://crates.io/api/v1/crates/pico-args/0.4.2/download -> pico-args-0.4.2.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/plotters/0.3.4/download -> plotters-0.3.4.crate https://crates.io/api/v1/crates/plotters-backend/0.3.4/download -> plotters-backend-0.3.4.crate https://crates.io/api/v1/crates/plotters-svg/0.3.3/download -> plotters-svg-0.3.3.crate https://crates.io/api/v1/crates/pmutil/0.5.3/download -> pmutil-0.5.3.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.1.5/download -> predicates-2.1.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.5/download -> predicates-core-1.0.5.crate https://crates.io/api/v1/crates/predicates-tree/1.0.7/download -> predicates-tree-1.0.7.crate https://crates.io/api/v1/crates/proc-macro-crate/1.3.0/download -> proc-macro-crate-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/quick-junit/0.3.2/download -> quick-junit-0.3.2.crate https://crates.io/api/v1/crates/quick-xml/0.26.0/download -> quick-xml-0.26.0.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/radium/0.7.0/download -> radium-0.7.0.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/result-like/0.4.6/download -> result-like-0.4.6.crate https://crates.io/api/v1/crates/result-like-derive/0.4.6/download -> result-like-derive-0.4.6.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rust-stemmers/1.2.0/download -> rust-stemmers-1.2.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustix/0.36.8/download -> rustix-0.36.8.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schemars/0.8.11/download -> schemars-0.8.11.crate https://crates.io/api/v1/crates/schemars_derive/0.8.11/download -> schemars_derive-0.8.11.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde-wasm-bindgen/0.4.5/download -> serde-wasm-bindgen-0.4.5.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_derive_internals/0.26.0/download -> serde_derive_internals-0.26.0.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/serde_spanned/0.6.1/download -> serde_spanned-0.6.1.crate https://crates.io/api/v1/crates/serde_test/1.0.152/download -> serde_test-1.0.152.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/shellexpand/3.0.0/download -> shellexpand-3.0.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/string_cache/0.8.4/download -> string_cache-0.8.4.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.24.1/download -> strum-0.24.1.crate https://crates.io/api/v1/crates/strum_macros/0.24.3/download -> strum_macros-0.24.3.crate https://crates.io/api/v1/crates/syn/1.0.108/download -> syn-1.0.108.crate https://crates.io/api/v1/crates/syn-ext/0.4.0/download -> syn-ext-0.4.0.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminfo/0.7.5/download -> terminfo-0.7.5.crate https://crates.io/api/v1/crates/termtree/0.4.0/download -> termtree-0.4.0.crate https://crates.io/api/v1/crates/test-case/2.2.2/download -> test-case-2.2.2.crate https://crates.io/api/v1/crates/test-case-macros/2.2.2/download -> test-case-macros-2.2.2.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread_local/1.1.7/download -> thread_local-1.1.7.crate https://crates.io/api/v1/crates/tikv-jemalloc-sys/0.5.3+5.3.0-patched/download -> tikv-jemalloc-sys-0.5.3+5.3.0-patched.crate https://crates.io/api/v1/crates/tikv-jemallocator/0.5.0/download -> tikv-jemallocator-0.5.0.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/titlecase/2.2.1/download -> titlecase-2.2.1.crate https://crates.io/api/v1/crates/toml/0.6.0/download -> toml-0.6.0.crate https://crates.io/api/v1/crates/toml_datetime/0.5.1/download -> toml_datetime-0.5.1.crate https://crates.io/api/v1/crates/toml_edit/0.18.1/download -> toml_edit-0.18.1.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.5/download -> ucd-trie-0.1.5.crate https://crates.io/api/v1/crates/unic-char-property/0.9.0/download -> unic-char-property-0.9.0.crate https://crates.io/api/v1/crates/unic-char-range/0.9.0/download -> unic-char-range-0.9.0.crate https://crates.io/api/v1/crates/unic-common/0.9.0/download -> unic-common-0.9.0.crate https://crates.io/api/v1/crates/unic-emoji-char/0.9.0/download -> unic-emoji-char-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-category/0.9.0/download -> unic-ucd-category-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-ident/0.9.0/download -> unic-ucd-ident-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-version/0.9.0/download -> unic-ucd-version-0.9.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/unicode_names2/0.5.1/download -> unicode_names2-0.5.1.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.3.0/download -> uuid-1.3.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/volatile/0.3.0/download -> volatile-0.3.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.34/download -> wasm-bindgen-futures-0.4.34.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-test/0.3.34/download -> wasm-bindgen-test-0.3.34.crate https://crates.io/api/v1/crates/wasm-bindgen-test-macro/0.3.34/download -> wasm-bindgen-test-macro-0.3.34.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/widestring/0.5.1/download -> widestring-0.5.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/yansi-term/0.1.2/download -> yansi-term-0.1.2.crate https://github.com/charliermarsh/LibCST/archive/80e4c1399f95e5beb532fdd1e209ad2dbb470438.tar.gz -> LibCST-80e4c1399f95e5beb532fdd1e209ad2dbb470438.gh.tar.gz https://github.com/RustPython/RustPython/archive/c4b67896662b16b5699a779c0e52aa0ca2587fec.tar.gz -> RustPython-c4b67896662b16b5699a779c0e52aa0ca2587fec.gh.tar.gz https://github.com/charliermarsh/LibCST/archive/80e4c1399f95e5beb532fdd1e209ad2dbb470438.tar.gz -> LibCST-80e4c1399f95e5beb532fdd1e209ad2dbb470438.gh.tar.gz https://github.com/RustPython/RustPython/archive/c4b67896662b16b5699a779c0e52aa0ca2587fec.tar.gz -> RustPython-c4b67896662b16b5699a779c0e52aa0ca2587fec.gh.tar.gz https://github.com/RustPython/RustPython/archive/c4b67896662b16b5699a779c0e52aa0ca2587fec.tar.gz -> RustPython-c4b67896662b16b5699a779c0e52aa0ca2587fec.gh.tar.gz https://github.com/RustPython/RustPython/archive/c4b67896662b16b5699a779c0e52aa0ca2587fec.tar.gz -> RustPython-c4b67896662b16b5699a779c0e52aa0ca2587fec.gh.tar.gz https://github.com/charliermarsh/ruff/archive/refs/tags/v0.0.253.tar.gz -> ruff-0.0.253.gh.tar.gz
+_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0579669d4c5f83a4eed3399cd2ed195d
diff --git a/metadata/md5-cache/dev-util/src-cli-4.0.0 b/metadata/md5-cache/dev-util/src-cli-4.0.0
deleted file mode 100644
index 90a0253a7060..000000000000
--- a/metadata/md5-cache/dev-util/src-cli-4.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=command line interface for the Sourcegraph code search tool
-EAPI=8
-HOMEPAGE=https://sourcegraph.com https://docs.sourcegraph.com/cli
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/sourcegraph/src-cli/archive/4.0.0.tar.gz -> src-cli-4.0.0.tar.gz https://dev.gentoo.org/~williamh/dist/src-cli-4.0.0-deps.tar.xz
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=919c202256865d4dd0d25f671b2e1fb2
diff --git a/metadata/md5-cache/dev-util/src-cli-4.3.0 b/metadata/md5-cache/dev-util/src-cli-4.3.0
index 3cb08a8c8582..c04002f4bcf7 100644
--- a/metadata/md5-cache/dev-util/src-cli-4.3.0
+++ b/metadata/md5-cache/dev-util/src-cli-4.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=command line interface for the Sourcegraph code search tool
 EAPI=8
 HOMEPAGE=https://sourcegraph.com https://docs.sourcegraph.com/cli
 INHERIT=go-module
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/sourcegraph/src-cli/archive/4.3.0.tar.gz -> src-cli-4.3.0.tar.gz https://dev.gentoo.org/~williamh/dist/src-cli-4.3.0-deps.tar.xz
 _eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=6fb1211ec58b0e6a5869615c640fc6ef
+_md5_=daecd82d3f6dc42e375ac1835958a307
diff --git a/metadata/md5-cache/dev-util/src-cli-4.4.0 b/metadata/md5-cache/dev-util/src-cli-4.4.0
index 053603190cd1..79f3f74d05dd 100644
--- a/metadata/md5-cache/dev-util/src-cli-4.4.0
+++ b/metadata/md5-cache/dev-util/src-cli-4.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=command line interface for the Sourcegraph code search tool
 EAPI=8
 HOMEPAGE=https://sourcegraph.com https://docs.sourcegraph.com/cli
 INHERIT=go-module
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/sourcegraph/src-cli/archive/4.4.0.tar.gz -> src-cli-4.4.0.tar.gz https://dev.gentoo.org/~williamh/dist/src-cli-4.4.0-deps.tar.xz
 _eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=6fb1211ec58b0e6a5869615c640fc6ef
+_md5_=daecd82d3f6dc42e375ac1835958a307
diff --git a/metadata/md5-cache/dev-util/src-cli-4.5.0 b/metadata/md5-cache/dev-util/src-cli-4.5.0
new file mode 100644
index 000000000000..20839bb689e5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/src-cli-4.5.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=command line interface for the Sourcegraph code search tool
+EAPI=8
+HOMEPAGE=https://sourcegraph.com https://docs.sourcegraph.com/cli
+INHERIT=go-module
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/sourcegraph/src-cli/archive/4.5.0.tar.gz -> src-cli-4.5.0.tar.gz https://dev.gentoo.org/~williamh/dist/src-cli-4.5.0-deps.tar.xz
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=daecd82d3f6dc42e375ac1835958a307
diff --git a/metadata/md5-cache/dev-util/strace-6.2 b/metadata/md5-cache/dev-util/strace-6.2
new file mode 100644
index 000000000000..1e21ca327b56
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-6.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) selinux? ( sys-libs/libselinux[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=8
+HOMEPAGE=https://strace.io/
+INHERIT=autotools edo flag-o-matic toolchain-funcs
+IUSE=aio perl selinux static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v6.2/strace-6.2.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bf90332189df65c8c934f665fe30ef3b
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index cc981878f073..41a1119cdc53 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.39.2 b/metadata/md5-cache/dev-vcs/git-2.39.2
index 8c5991b02140..5677dd724453 100644
--- a/metadata/md5-cache/dev-vcs/git-2.39.2
+++ b/metadata/md5-cache/dev-vcs/git-2.39.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.git-scm.com/
 INHERIT=toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
 IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~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 ~loong ~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=dev-libs/openssl:= sys-libs/zlib curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) iconv? ( virtual/libiconv ) pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) 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_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) selinux? ( sec-policy/selinux-git )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) subversion? ( perl ) webdav? ( curl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.39.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.39.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.39.2.tar.xz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b5b586eb23ef79d6669689bd55452418
+_md5_=03879c3137cbbb492ae8c4c6f4e239df
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1 b/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
index 8f9995d6ff7c..170a2e6edf00 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	416d1c5005c5f4594e79812fb7323f0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	416d1c5005c5f4594e79812fb7323f0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=769002047fee6edf31d5fa06cba1381c
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 3f26fbc86702..4045868c5d5d 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/kobodeluxe-0.5.1-r4 b/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r4
index 7b1c71ad787b..c80d8593cab9 100644
--- a/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r4
+++ b/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r4
@@ -1,14 +1,15 @@
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
 DEPEND=media-libs/libsdl[joystick] media-libs/sdl-image[png] opengl? ( virtual/opengl )
 DESCRIPTION=An SDL port of xkobo, a addictive space shoot-em-up
 EAPI=8
 HOMEPAGE=http://www.olofson.net/kobodl/
-INHERIT=desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop xdg
 IUSE=opengl
 KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick] media-libs/sdl-image[png] opengl? ( virtual/opengl ) acct-group/gamestat
 SLOT=0
 SRC_URI=http://www.olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d
-_md5_=61beba3ce61768cf7f736b24db6dddb9
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2c9a398573d42900211bb4d1470f148b
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 0b147a13e1d3..15cc0a94b0e0 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/bsnes-jg-1.1.0 b/metadata/md5-cache/games-emulation/bsnes-jg-1.1.0
deleted file mode 100644
index 9d2423e2c152..000000000000
--- a/metadata/md5-cache/games-emulation/bsnes-jg-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=media-libs/jg:1= media-libs/libsamplerate
-DESCRIPTION=Jolly Good Fork of bsnes
-EAPI=8
-HOMEPAGE=https://gitlab.com/jgemu/bsnes
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64
-LICENSE=ISC GPL-3+ LGPL-2.1+ MIT ZLIB
-RDEPEND=media-libs/jg:1= media-libs/libsamplerate games-emulation/jgrf
-SLOT=1
-SRC_URI=https://gitlab.com/jgemu/bsnes/-/archive/1.1.0/bsnes-1.1.0.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aba392acd8942cbb628fa320aa3c2773
diff --git a/metadata/md5-cache/games-emulation/bsnes-jg-1.1.1 b/metadata/md5-cache/games-emulation/bsnes-jg-1.1.1
new file mode 100644
index 000000000000..f27934414569
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/bsnes-jg-1.1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=media-libs/jg:1= media-libs/libsamplerate
+DESCRIPTION=Jolly Good Fork of bsnes
+EAPI=8
+HOMEPAGE=https://gitlab.com/jgemu/bsnes
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64
+LICENSE=ISC GPL-3+ LGPL-2.1+ MIT ZLIB
+RDEPEND=media-libs/jg:1= media-libs/libsamplerate games-emulation/jgrf
+SLOT=1
+SRC_URI=https://gitlab.com/jgemu/bsnes/-/archive/1.1.1/bsnes-1.1.1.tar.bz2
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d2dce5dc173ee40bc36f7fc30fefac3c
diff --git a/metadata/md5-cache/games-emulation/bsnes-jg-9999 b/metadata/md5-cache/games-emulation/bsnes-jg-9999
index 9024741b25b1..dcf85d18f2f9 100644
--- a/metadata/md5-cache/games-emulation/bsnes-jg-9999
+++ b/metadata/md5-cache/games-emulation/bsnes-jg-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=media-libs/jg:1= media-libs/libsamplerate games-emulation/jgrf
 SLOT=1
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aba392acd8942cbb628fa320aa3c2773
+_md5_=d2dce5dc173ee40bc36f7fc30fefac3c
diff --git a/metadata/md5-cache/games-emulation/jgrf-1.0.0 b/metadata/md5-cache/games-emulation/jgrf-1.0.0
deleted file mode 100644
index c3ceb45ebf21..000000000000
--- a/metadata/md5-cache/games-emulation/jgrf-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst
-DEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
-DESCRIPTION=The Jolly Good Reference Frontend
-EAPI=8
-HOMEPAGE=https://jgemu.gitlab.io/jgrf.html
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=toolchain-funcs xdg
-KEYWORDS=~amd64
-LICENSE=BSD CC0-1.0 MIT ZLIB
-RDEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
-SLOT=1
-SRC_URI=https://gitlab.com/jgemu/jgrf/-/archive/1.0.0/jgrf-1.0.0.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=83dbd45b51eb5c0777e46eec9043fa71
diff --git a/metadata/md5-cache/games-emulation/jgrf-1.0.1 b/metadata/md5-cache/games-emulation/jgrf-1.0.1
new file mode 100644
index 000000000000..f323e5a20901
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/jgrf-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
+DESCRIPTION=The Jolly Good Reference Frontend
+EAPI=8
+HOMEPAGE=https://jgemu.gitlab.io/jgrf.html
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=toolchain-funcs xdg
+KEYWORDS=~amd64
+LICENSE=BSD CC0-1.0 MIT ZLIB
+RDEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
+SLOT=1
+SRC_URI=https://gitlab.com/jgemu/jgrf/-/archive/1.0.1/jgrf-1.0.1.tar.bz2
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=cecc51a726de6dc905797d354d93560e
diff --git a/metadata/md5-cache/games-emulation/jgrf-9999 b/metadata/md5-cache/games-emulation/jgrf-9999
index f32955cd1fe6..480b835b5267 100644
--- a/metadata/md5-cache/games-emulation/jgrf-9999
+++ b/metadata/md5-cache/games-emulation/jgrf-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/miniz dev-libs/openssl:0=[-bindist(-)] media-libs/jg:1= media-libs/libepoxy[egl] media-libs/libsdl2[opengl,sound,video] media-libs/speexdsp
 SLOT=1
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=83dbd45b51eb5c0777e46eec9043fa71
+_md5_=cecc51a726de6dc905797d354d93560e
diff --git a/metadata/md5-cache/games-emulation/prosystem-jg-1.5.1 b/metadata/md5-cache/games-emulation/prosystem-jg-1.5.1
deleted file mode 100644
index 8acbc2d3cfd0..000000000000
--- a/metadata/md5-cache/games-emulation/prosystem-jg-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=media-libs/jg:1=
-DESCRIPTION=Jolly Good Fork of ProSystem
-EAPI=8
-HOMEPAGE=https://gitlab.com/jgemu/prosystem
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64
-LICENSE=BSD GPL-2+
-RDEPEND=media-libs/jg:1= games-emulation/jgrf
-SLOT=1
-SRC_URI=https://gitlab.com/jgemu/prosystem/-/archive/1.5.1/prosystem-1.5.1.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8e933ea3f477c8cdd4d61ba37114dbcb
diff --git a/metadata/md5-cache/games-emulation/prosystem-jg-1.5.2 b/metadata/md5-cache/games-emulation/prosystem-jg-1.5.2
new file mode 100644
index 000000000000..188be28dffc3
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/prosystem-jg-1.5.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=media-libs/jg:1=
+DESCRIPTION=Jolly Good Fork of ProSystem
+EAPI=8
+HOMEPAGE=https://gitlab.com/jgemu/prosystem
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64
+LICENSE=BSD GPL-2+
+RDEPEND=media-libs/jg:1= games-emulation/jgrf
+SLOT=1
+SRC_URI=https://gitlab.com/jgemu/prosystem/-/archive/1.5.2/prosystem-1.5.2.tar.bz2
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5aba019ab3d390b78ec46c10650c3b99
diff --git a/metadata/md5-cache/games-emulation/prosystem-jg-9999 b/metadata/md5-cache/games-emulation/prosystem-jg-9999
index 050f9003038e..b02a52821d66 100644
--- a/metadata/md5-cache/games-emulation/prosystem-jg-9999
+++ b/metadata/md5-cache/games-emulation/prosystem-jg-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=media-libs/jg:1= games-emulation/jgrf
 SLOT=1
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8e933ea3f477c8cdd4d61ba37114dbcb
+_md5_=5aba019ab3d390b78ec46c10650c3b99
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index cab7e7f59829..09b5afb8d73d 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/lolcat-100.0.1-r1 b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
index 4878bf21b2c7..de0656d5762f 100644
--- a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
+++ b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lolcat-100.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d3b9a92bafec8c1612689e627ba16e64
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 30efe12f43ce..b10c1e837dfa 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/adonthell-0.3.8 b/metadata/md5-cache/games-rpg/adonthell-0.3.8
deleted file mode 100644
index becb6a0f948f..000000000000
--- a/metadata/md5-cache/games-rpg/adonthell-0.3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) media-libs/freetype media-libs/libogg media-libs/libsdl2[X,video,sound] media-libs/libvorbis media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib nls? ( virtual/libintl ) dev-lang/swig
-DESCRIPTION=Roleplaying game engine
-EAPI=7
-HOMEPAGE=http://adonthell.nongnu.org/
-INHERIT=autotools python-single-r1
-IUSE=doc nls python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) media-libs/freetype media-libs/libogg media-libs/libsdl2[X,video,sound] media-libs/libvorbis media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.8.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6f5ffaa413c0ad2325a9eef6635e6f36
diff --git a/metadata/md5-cache/games-rpg/wastesedge-0.3.8 b/metadata/md5-cache/games-rpg/wastesedge-0.3.8
deleted file mode 100644
index 3ded57c74497..000000000000
--- a/metadata/md5-cache/games-rpg/wastesedge-0.3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure postinst postrm preinst prepare setup
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Role playing game to showcase the adonthell engine
-EAPI=7
-HOMEPAGE=http://adonthell.nongnu.org/download/
-INHERIT=autotools python-single-r1 xdg
-IUSE=nls python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=games-rpg/adonthell-0.3.8[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.8.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f36f991a5e85089038acb7b63981f8a1
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index d0dd075f3156..dbc8b81eae20 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.63.01 b/metadata/md5-cache/games-server/bedrock-server-1.19.63.01
new file mode 100644
index 000000000000..35da64cebcd0
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.63.01
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=8
+HOMEPAGE=https://www.minecraft.net/
+INHERIT=systemd
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.63.01.zip
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=34254df59a3f1889f04a560cc6a5b31d
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index b8c7bde6fbed..c07af41cb4f4 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-48 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-48
new file mode 100644
index 000000000000..98e94e01c794
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-48
@@ -0,0 +1,13 @@
+BDEPEND=app-misc/jq >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DESCRIPTION=Support legacy, AppIndicators and KStatusNotifierItems in Gnome
+EAPI=8
+HOMEPAGE=https://github.com/ubuntu/gnome-shell-extension-appindicator
+INHERIT=gnome2-utils meson
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.34
+SLOT=0
+SRC_URI=https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v48.tar.gz -> gnome-shell-extension-appindicator-48.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a5698567faa8fee7d524919ca47abac2
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.30.0-r2 b/metadata/md5-cache/gnome-extra/nm-applet-1.30.0-r2
new file mode 100644
index 000000000000..7e1f59422379
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.30.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.10.4-r2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libayatana-appindicator >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
+DESCRIPTION=NetworkManager connection editor and applet
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=appindicator modemmanager selinux teamd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.10.4-r2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libayatana-appindicator >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.30/network-manager-applet-1.30.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b160efd38939a39d88ede991ae7ec24a
diff --git a/metadata/md5-cache/gnome-extra/pch-session-42.0 b/metadata/md5-cache/gnome-extra/pch-session-42.0
deleted file mode 100644
index d6db95670371..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=8
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-INHERIT=gnome2-utils
-IUSE=bluetooth qt5 webp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-42 >=gnome-extra/gnome-shell-extensions-42 >=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0 >=gnome-extra/gnome-shell-extension-appindicator-42 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15 >=gnome-extra/gnome-shell-extension-bing-wallpaper-40 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323 >=gnome-extra/gnome-shell-extension-dash-to-panel-47 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0 >=gnome-extra/gnome-shell-extension-gsconnect-50 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1 >=gnome-extra/gnome-tweaks-40.10 gnome-extra/gnome-clocks gnome-extra/seahorse-nautilus >=media-fonts/fonts-meta-2 bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/42.0/pch-session-42.0.tar.bz2
-_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0f5d3d78dd054303a35fdda4b5492b57
diff --git a/metadata/md5-cache/gnome-extra/pch-session-42.0-r1 b/metadata/md5-cache/gnome-extra/pch-session-42.0-r1
new file mode 100644
index 000000000000..88dbfbacfc27
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/pch-session-42.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Unofficial gnome based session with different default settings and extensions
+EAPI=8
+HOMEPAGE=https://gitlab.com/pachoramos/pch-session
+INHERIT=gnome2-utils
+IUSE=bluetooth qt5 webp
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/gnome-shell-42 >=gnome-extra/gnome-shell-extensions-42 >=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0 >=gnome-extra/gnome-shell-extension-appindicator-42 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15 >=gnome-extra/gnome-shell-extension-bing-wallpaper-40 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323 >=gnome-extra/gnome-shell-extension-dash-to-panel-47 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0 >=gnome-extra/gnome-shell-extension-gsconnect-50 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1 >=gnome-extra/gnome-tweaks-40.10 gnome-extra/gnome-clocks >=media-fonts/fonts-meta-2 bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
+SLOT=0
+SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/42.0/pch-session-42.0.tar.bz2
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=75a72e6ba0201d12291e2e493eb61881
diff --git a/metadata/md5-cache/gnome-extra/pch-session-43.1 b/metadata/md5-cache/gnome-extra/pch-session-43.1
deleted file mode 100644
index 230667ba6cde..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-43.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=8
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-INHERIT=gnome2-utils
-IUSE=bluetooth qt5 webp
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-43 >=gnome-extra/gnome-shell-extensions-43 >=gnome-extra/gnome-shell-extension-alphabetical-grid-26.0 >=gnome-extra/gnome-shell-extension-appindicator-46 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16 >=gnome-extra/gnome-shell-extension-bing-wallpaper-43 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323-r1 >=gnome-extra/gnome-shell-extension-dash-to-panel-52 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-47 >=gnome-extra/gnome-shell-extension-gsconnect-54 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024 >=gnome-extra/gnome-tweaks-40.10 >=gnome-extra/gnome-clocks-43.0 >=gnome-extra/seahorse-nautilus-3.11.92_p20220906 >=media-fonts/fonts-meta-2 x11-themes/papirus-icon-theme bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/43.1/pch-session-43.1.tar.bz2
-_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3b82c485ea52898fb75d8a623c9231fe
diff --git a/metadata/md5-cache/gnome-extra/pch-session-43.2 b/metadata/md5-cache/gnome-extra/pch-session-43.2
deleted file mode 100644
index b27cd56833c3..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-43.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=8
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-INHERIT=gnome2-utils
-IUSE=bluetooth qt5 webp
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-43 >=gnome-extra/gnome-shell-extensions-43 >=gnome-extra/gnome-shell-extension-alphabetical-grid-26.0 >=gnome-extra/gnome-shell-extension-appindicator-46 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16 >=gnome-extra/gnome-shell-extension-bing-wallpaper-44 >=gnome-extra/gnome-shell-extension-dash-to-panel-52 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-47 >=gnome-extra/gnome-shell-extension-gsconnect-54 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024 >=gnome-extra/gnome-tweaks-40.10 >=gnome-extra/gnome-clocks-43.0 >=gnome-extra/seahorse-nautilus-3.11.92_p20220906 >=media-fonts/fonts-meta-2 x11-themes/papirus-icon-theme bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/43.2/pch-session-43.2.tar.bz2
-_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e5c599f74c80d538c2c063178112634b
diff --git a/metadata/md5-cache/gnome-extra/pch-session-43.2-r1 b/metadata/md5-cache/gnome-extra/pch-session-43.2-r1
new file mode 100644
index 000000000000..713d4d5efac4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/pch-session-43.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Unofficial gnome based session with different default settings and extensions
+EAPI=8
+HOMEPAGE=https://gitlab.com/pachoramos/pch-session
+INHERIT=gnome2-utils
+IUSE=bluetooth qt5 webp
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/gnome-shell-43 >=gnome-extra/gnome-shell-extensions-43 >=gnome-extra/gnome-shell-extension-alphabetical-grid-26.0 >=gnome-extra/gnome-shell-extension-appindicator-46 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16 >=gnome-extra/gnome-shell-extension-bing-wallpaper-44 >=gnome-extra/gnome-shell-extension-dash-to-panel-52 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-47 >=gnome-extra/gnome-shell-extension-gsconnect-54 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024 >=gnome-extra/gnome-tweaks-40.10 >=gnome-extra/gnome-clocks-43.0 >=media-fonts/fonts-meta-2 x11-themes/papirus-icon-theme bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
+SLOT=0
+SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/43.2/pch-session-43.2.tar.bz2
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e868735931bbec27dd283727926f2ed7
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.99.4-r1 b/metadata/md5-cache/gnome-extra/synapse-0.2.99.4-r1
deleted file mode 100644
index 7ea7275e81c1..000000000000
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.99.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.0:3 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme appindicator? ( dev-libs/libappindicator:3 ) nls? ( virtual/libintl ) plugins? ( >=net-libs/rest-0.7:0.7 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A program launcher in the style of GNOME Do
-EAPI=7
-HOMEPAGE=https://launchpad.net/synapse-project/
-INHERIT=vala xdg
-IUSE=appindicator nls plugins
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.0:3 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme appindicator? ( dev-libs/libappindicator:3 ) nls? ( virtual/libintl ) plugins? ( >=net-libs/rest-0.7:0.7 )
-SLOT=0
-SRC_URI=https://launchpad.net/synapse-project/0.3/0.2.99.4/+download/synapse-0.2.99.4.tar.xz
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=50daa13e5b72867d80d561456906254f
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 84fa4818472e..2e38ed0a2778 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/grim-1.4.0-r3 b/metadata/md5-cache/gui-apps/grim-1.4.0-r3
index d8809cac4342..ff88b7bc4348 100644
--- a/metadata/md5-cache/gui-apps/grim-1.4.0-r3
+++ b/metadata/md5-cache/gui-apps/grim-1.4.0-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/emersion/grim
 INHERIT=bash-completion-r1 meson
 IUSE=+man jpeg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo )
 SLOT=0
 SRC_URI=https://github.com/emersion/grim/archive/v1.4.0.tar.gz -> grim-1.4.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=881f9cedd55e98386be18f64d9146d12
+_md5_=0f0820bc4abac29544518675aa9900c8
diff --git a/metadata/md5-cache/gui-apps/grim-9999 b/metadata/md5-cache/gui-apps/grim-9999
index 92cee2a75440..3dc882f83e74 100644
--- a/metadata/md5-cache/gui-apps/grim-9999
+++ b/metadata/md5-cache/gui-apps/grim-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=881f9cedd55e98386be18f64d9146d12
+_md5_=0f0820bc4abac29544518675aa9900c8
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.6-r1 b/metadata/md5-cache/gui-apps/swaylock-1.6-r1
deleted file mode 100644
index 1c4202b2b7f6..000000000000
--- a/metadata/md5-cache/gui-apps/swaylock-1.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.25 >=dev-util/wayland-scanner-1.15 virtual/pkgconfig man? ( app-text/scdoc ) filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam )
-DESCRIPTION=Screen locker for Wayland
-EAPI=7
-HOMEPAGE=https://github.com/swaywm/swaylock
-INHERIT=fcaps meson
-IUSE=+gdk-pixbuf +man +pam +filecaps
-KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://github.com/swaywm/swaylock/archive/1.6.tar.gz -> swaylock-1.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	da0130200e07aaecee121b85f4b9ea17	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a248ff1de426fd115b289f8809742b42
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index a48b0b28771f..92f01002a677 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/kross-interpreters-22.08.3 b/metadata/md5-cache/kde-apps/kross-interpreters-22.08.3
index 708a61f44119..0946c0e66f50 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-22.08.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-22.08.3
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.96.0:5 || ( dev-lang/ruby:2.7 ) virtual/rubygems || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.08.3/src/kross-interpreters-22.08.3.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5337fb46ca17eb9a884b95bcbc93a1b8
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-22.12.2 b/metadata/md5-cache/kde-apps/kross-interpreters-22.12.2
index 12f54b8c2abc..7a0ebc9b00c0 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-22.12.2
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-22.12.2
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kross-5.101.0:5 || ( dev-lang/ruby:2.7 ) virtual/rubygems || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.12.2/src/kross-interpreters-22.12.2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a09877ad8f37994b278efdb67a9cb221
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 418c75f1df72..d6bdf52cfcf9 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/kidletime-5.102.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.102.0
deleted file mode 100644
index 4b259a64317c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.102.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=wayland? ( >=dev-qt/qtwaylandscanner-5.15.5:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.5:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.5:5=[wayland] >=dev-qt/qtwayland-5.15.5:5 ) X? ( >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.5:5 x11-libs/libXScrnSaver ) wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 >=dev-libs/wayland-protocols-1.27:0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=wayland X xscreensaver debug doc
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.5:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.5:5=[wayland] >=dev-qt/qtwayland-5.15.5:5 ) X? ( >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.5: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.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/kidletime-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=82b5c14e9afc740ae7d5fa032ba8c9d9
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index d8c8491c15f7..3b2d7162eaa2 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.27.1 b/metadata/md5-cache/kde-plasma/bluedevil-5.27.1
deleted file mode 100644
index 268ce844ceaf..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/plasma-5.102.0:5 dev-qt/qtcore:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/bluedevil
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/plasma-5.102.0:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/bluedevil-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=542cf3ceb41b84e147aeac6ce1d95d8e
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.27.2 b/metadata/md5-cache/kde-plasma/bluedevil-5.27.2
new file mode 100644
index 000000000000..21ac7c8f394d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/plasma-5.102.0:5 dev-qt/qtcore:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/bluedevil
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/plasma-5.102.0:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/bluedevil-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=542cf3ceb41b84e147aeac6ce1d95d8e
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.27.1 b/metadata/md5-cache/kde-plasma/breeze-5.27.1
deleted file mode 100644
index 05b7233c47b9..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.1:5 dev-qt/qtcore:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/breeze
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.1:5
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.1: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.27.1/breeze-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=acf71e0a4634796f1192bd0dc08de59f
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.27.2 b/metadata/md5-cache/kde-plasma/breeze-5.27.2
new file mode 100644
index 000000000000..deb9f9b61cde
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.2:5 dev-qt/qtcore:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.2:5
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.2: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.27.2/breeze-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=acf71e0a4634796f1192bd0dc08de59f
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.27.1 b/metadata/md5-cache/kde-plasma/breeze-grub-5.27.1
deleted file mode 100644
index 64ce36d68bea..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.27.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare unpack
-DESCRIPTION=Breeze theme for GRUB
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=plasma.kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.1/breeze-grub-5.27.1.tar.xz
-_eclasses_=kde.org	5dd311d12cdba33b446368fad288784d	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8
-_md5_=86067bc5685c6cf278eb02edfc7c9439
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.27.2 b/metadata/md5-cache/kde-plasma/breeze-grub-5.27.2
new file mode 100644
index 000000000000..afaa5762ffc7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.27.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch prepare unpack
+DESCRIPTION=Breeze theme for GRUB
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=plasma.kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.2/breeze-grub-5.27.2.tar.xz
+_eclasses_=kde.org	5dd311d12cdba33b446368fad288784d	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8
+_md5_=86067bc5685c6cf278eb02edfc7c9439
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.27.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.27.1
deleted file mode 100644
index 7677eb8222bc..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/sassc || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pycairo[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ) >=kde-plasma/breeze-5.27.1:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org python-any-r1
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~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.27.1/breeze-gtk-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fc6605239839e47d93260bf5d617c702
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.27.2 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.27.2
new file mode 100644
index 000000000000..2bfcf897e912
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/sassc || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pycairo[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ) >=kde-plasma/breeze-5.27.2:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org python-any-r1
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~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.27.2/breeze-gtk-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fc6605239839e47d93260bf5d617c702
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.27.1 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.27.1
deleted file mode 100644
index 982eb3163e0c..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=sys-boot/plymouth
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=cmake plasma.kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.1/breeze-plymouth-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9a04cd94a72bd896f5b9d7d733b1de0d
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.27.2 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.27.2
new file mode 100644
index 000000000000..aa48d241ab3b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.27.2
@@ -0,0 +1,14 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=sys-boot/plymouth
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=cmake plasma.kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.2/breeze-plymouth-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9a04cd94a72bd896f5b9d7d733b1de0d
diff --git a/metadata/md5-cache/kde-plasma/discover-5.27.1 b/metadata/md5-cache/kde-plasma/discover-5.27.1
deleted file mode 100644
index 073d25057cf9..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/appstream-0.15.3:= >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) webengine? ( >=dev-qt/qtwebview-5.15.7:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/Discover
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=+firmware flatpak telemetry webengine test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/appstream-0.15.3:= >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) webengine? ( >=dev-qt/qtwebview-5.15.7:5 ) >=dev-qt/qtquickcontrols2-5.15.7: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.27.1/discover-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ef1a04b270185d380442544747d575aa
diff --git a/metadata/md5-cache/kde-plasma/discover-5.27.2 b/metadata/md5-cache/kde-plasma/discover-5.27.2
new file mode 100644
index 000000000000..051d3583e744
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/appstream-0.15.3:= >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) webengine? ( >=dev-qt/qtwebview-5.15.7:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/Discover
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=+firmware flatpak telemetry webengine test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/appstream-0.15.3:= >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) webengine? ( >=dev-qt/qtwebview-5.15.7:5 ) >=dev-qt/qtquickcontrols2-5.15.7: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.27.2/discover-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ef1a04b270185d380442544747d575aa
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.27.1 b/metadata/md5-cache/kde-plasma/drkonqi-5.27.1
deleted file mode 100644
index 31739bb2b617..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/syntax-highlighting-5.102.0:5 >=dev-qt/qtconcurrent-5.15.7:5 dev-qt/qtcore:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/syntax-highlighting-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] || ( 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.27.1/drkonqi-5.27.1.tar.xz https://dev.gentoo.org/~asturm/distfiles/drkonqi-5.27.1-revert-add-sentry-support.patch.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c7e7a22021211075a2d637c8281fcd4f
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.27.2 b/metadata/md5-cache/kde-plasma/drkonqi-5.27.2
new file mode 100644
index 000000000000..2a9a30ed5a66
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/syntax-highlighting-5.102.0:5 >=dev-qt/qtconcurrent-5.15.7:5 dev-qt/qtcore:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/syntax-highlighting-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] || ( 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.27.2/drkonqi-5.27.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/drkonqi-5.27.1-revert-add-sentry-support.patch.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2a3225c709944ca8dbccdcd6a4b725a4
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.27.1 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.27.1
deleted file mode 100644
index 7afd3e6c10b7..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsql-5.15.7:5[sqlite] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 dev-libs/boost dev-qt/qtcore:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsql-5.15.7:5[sqlite] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.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.27.1/kactivitymanagerd-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23e71d97cb0013debd2c426f30c072c7
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.27.2 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.27.2
new file mode 100644
index 000000000000..628d9986a32a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsql-5.15.7:5[sqlite] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 dev-libs/boost dev-qt/qtcore:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsql-5.15.7:5[sqlite] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.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.27.2/kactivitymanagerd-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=23e71d97cb0013debd2c426f30c072c7
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.27.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.27.1
deleted file mode 100644
index 5180e5ef2401..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.27.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/libkworkspace-5.27.1:5 kdesu? ( >=kde-frameworks/kdesu-5.102.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/libkworkspace-5.27.1:5 kdesu? ( >=kde-frameworks/kdesu-5.102.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.7: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 )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.1/kde-cli-tools-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c7716265d71549df022037be5cda9f2a
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.27.2 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.27.2
new file mode 100644
index 000000000000..4e2ec982fefd
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.27.2
@@ -0,0 +1,18 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/libkworkspace-5.27.2:5 kdesu? ( >=kde-frameworks/kdesu-5.102.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/libkworkspace-5.27.2:5 kdesu? ( >=kde-frameworks/kdesu-5.102.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.7: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 )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.2/kde-cli-tools-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c7716265d71549df022037be5cda9f2a
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.27.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.27.1
deleted file mode 100644
index 0296fdbc0c54..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/sassc >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.1:5 x11-libs/gtk+:3 dev-qt/qtcore:5
-DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.1:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/kde-gtk-config-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c4d7ef982c8be8bf61cc97449efc2022
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.27.2 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.27.2
new file mode 100644
index 000000000000..2ba905119be4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/sassc >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.2:5 x11-libs/gtk+:3 dev-qt/qtcore:5
+DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-plasma/kdecoration-5.27.2:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/kde-gtk-config-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c4d7ef982c8be8bf61cc97449efc2022
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.27.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.27.1
deleted file mode 100644
index 356cae5cbfa2..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.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.27.1/kdecoration-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d514a84cc648b3cf868979b045f20d99
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.27.2 b/metadata/md5-cache/kde-plasma/kdecoration-5.27.2
new file mode 100644
index 000000000000..7278237a3f74
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.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.27.2/kdecoration-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d514a84cc648b3cf868979b045f20d99
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.27.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.27.1
deleted file mode 100644
index 1cc450151180..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kholidays-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 alternate-calendar? ( dev-libs/icu:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) share? ( >=kde-frameworks/purpose-5.102.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.7:5 ) dev-qt/qtcore:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=+alternate-calendar networkmanager share webengine test debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kholidays-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 alternate-calendar? ( dev-libs/icu:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) share? ( >=kde-frameworks/purpose-5.102.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.7:5 ) >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-plasma/plasma-workspace-5.27.1: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.27.1/kdeplasma-addons-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=57678b022663261562d07d2f241d06ac
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.27.2 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.27.2
new file mode 100644
index 000000000000..7a200b0cb6c7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kholidays-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 alternate-calendar? ( dev-libs/icu:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) share? ( >=kde-frameworks/purpose-5.102.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.7:5 ) dev-qt/qtcore:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org optfeature
+IUSE=+alternate-calendar networkmanager share webengine test debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kholidays-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 alternate-calendar? ( dev-libs/icu:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) share? ( >=kde-frameworks/purpose-5.102.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.7:5 ) >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-plasma/plasma-workspace-5.27.2: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.27.2/kdeplasma-addons-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=57678b022663261562d07d2f241d06ac
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.27.1 b/metadata/md5-cache/kde-plasma/kgamma-5.27.1
deleted file mode 100644
index f2ef8714ecff..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-qt/qtcore:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.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.27.1/kgamma5-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=02b0eda6b679bb2f9a2e3cf7a0ff7644
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.27.2 b/metadata/md5-cache/kde-plasma/kgamma-5.27.2
new file mode 100644
index 000000000000..cc99e98f11e4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-qt/qtcore:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.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.27.2/kgamma5-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=02b0eda6b679bb2f9a2e3cf7a0ff7644
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.27.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.27.1
deleted file mode 100644
index 84c4d04131ac..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5[X] >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5[X] >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/khotkeys-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9923e49789246242d50843e598ad24a7
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.27.2 b/metadata/md5-cache/kde-plasma/khotkeys-5.27.2
new file mode 100644
index 000000000000..73d5ab12c80f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5[X] >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.2:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5[X] >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.2:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/khotkeys-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9923e49789246242d50843e598ad24a7
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.27.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.27.1
deleted file mode 100644
index 98b0cb3e2b7a..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5[gles2-only=] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) dev-qt/qtcore:5
-DESCRIPTION=Utility providing information about the computer hardware
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/KInfoCenter
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=gles2-only usb debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5[gles2-only=] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) dev-qt/qdbus:* >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.1:5 >=kde-plasma/systemsettings-5.27.1: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.27.1/kinfocenter-5.27.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d93e0f527e0c9345aad9d854be1f5367
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.27.2 b/metadata/md5-cache/kde-plasma/kinfocenter-5.27.2
new file mode 100644
index 000000000000..50f35e139242
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5[gles2-only=] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) dev-qt/qtcore:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/KInfoCenter
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org optfeature
+IUSE=gles2-only usb debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5[gles2-only=] >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) dev-qt/qdbus:* >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.2:5 >=kde-plasma/systemsettings-5.27.2: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.27.2/kinfocenter-5.27.2.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d93e0f527e0c9345aad9d854be1f5367
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.27.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.27.1
deleted file mode 100644
index f3188f86d89c..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/sonnet-5.102.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.27.1/kmenuedit-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=982eb06fcbda74b1f7edd30667c2c786
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.27.2 b/metadata/md5-cache/kde-plasma/kmenuedit-5.27.2
new file mode 100644
index 000000000000..4b64e88b8f44
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/sonnet-5.102.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.27.2/kmenuedit-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=982eb06fcbda74b1f7edd30667c2c786
diff --git a/metadata/md5-cache/kde-plasma/kpipewire-5.27.1 b/metadata/md5-cache/kde-plasma/kpipewire-5.27.1
deleted file mode 100644
index df396795f9c1..000000000000
--- a/metadata/md5-cache/kde-plasma/kpipewire-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 media-libs/libepoxy media-libs/libglvnd media-video/ffmpeg:= >=media-video/pipewire-0.3:= x11-libs/libdrm dev-libs/plasma-wayland-protocols test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Components relating to Flatpak pipewire use in Plasma
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 media-libs/libepoxy media-libs/libglvnd media-video/ffmpeg:= >=media-video/pipewire-0.3:= x11-libs/libdrm >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 x11-themes/sound-theme-freedesktop || ( 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.27.1/kpipewire-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ea375a50635c64b624d686123f3fbb79
diff --git a/metadata/md5-cache/kde-plasma/kpipewire-5.27.2 b/metadata/md5-cache/kde-plasma/kpipewire-5.27.2
new file mode 100644
index 000000000000..353231cb1a16
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kpipewire-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 media-libs/libepoxy media-libs/libglvnd media-video/ffmpeg:= >=media-video/pipewire-0.3:= x11-libs/libdrm dev-libs/plasma-wayland-protocols test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Components relating to Flatpak pipewire use in Plasma
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 media-libs/libepoxy media-libs/libglvnd media-video/ffmpeg:= >=media-video/pipewire-0.3:= x11-libs/libdrm >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 x11-themes/sound-theme-freedesktop || ( 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.27.2/kpipewire-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ea375a50635c64b624d686123f3fbb79
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.27.1.1 b/metadata/md5-cache/kde-plasma/kscreen-5.27.1.1
deleted file mode 100644
index 4a1ee629ce0b..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.27.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsensors-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.1:5 >=kde-plasma/libkscreen-5.27.1:5 x11-libs/libX11 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kscreen
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsensors-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.1:5 >=kde-plasma/libkscreen-5.27.1:5 x11-libs/libX11 >=dev-qt/qtgraphicaleffects-5.15.7:5 >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/kscreen-5.27.1.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1eadcbd49a3bb80a0742583ce86b57ed
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.27.2 b/metadata/md5-cache/kde-plasma/kscreen-5.27.2
new file mode 100644
index 000000000000..50127799414e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsensors-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.2:5 >=kde-plasma/libkscreen-5.27.2:5 x11-libs/libX11 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kscreen
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsensors-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.2:5 >=kde-plasma/libkscreen-5.27.2:5 x11-libs/libX11 >=dev-qt/qtgraphicaleffects-5.15.7:5 >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/kscreen-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1eadcbd49a3bb80a0742583ce86b57ed
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.27.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.27.1
deleted file mode 100644
index 60a09dcf58d5..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.27.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/wayland-scanner >=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.1:5 >=kde-plasma/libkscreen-5.27.1:5 sys-libs/pam x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org pam
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.27.1:5
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.1:5 >=kde-plasma/libkscreen-5.27.1:5 sys-libs/pam x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/plasma-5.102.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/plasma/5.27.1/kscreenlocker-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pam	01b77091d5b6560b0aeafa7fbb1bd818	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1da9cea71514e3759c404d14be5cd3e1
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.27.2 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.27.2
new file mode 100644
index 000000000000..eed3a988a06a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.27.2
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/wayland-scanner >=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.2:5 >=kde-plasma/libkscreen-5.27.2:5 sys-libs/pam x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org pam
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.27.2:5
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.2:5 >=kde-plasma/libkscreen-5.27.2:5 sys-libs/pam x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/plasma-5.102.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/plasma/5.27.2/kscreenlocker-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pam	01b77091d5b6560b0aeafa7fbb1bd818	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1da9cea71514e3759c404d14be5cd3e1
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.27.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.27.1
deleted file mode 100644
index 47d79a4dcd79..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 dev-qt/qtcore:5
-DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.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.27.1/ksshaskpass-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=36245753b68337c508a3ceb7f19ae8ee
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.27.2 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.27.2
new file mode 100644
index 000000000000..52a8c6038e2d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 dev-qt/qtcore:5
+DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.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.27.2/ksshaskpass-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=36245753b68337c508a3ceb7f19ae8ee
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.27.1 b/metadata/md5-cache/kde-plasma/ksystemstats-5.27.1
deleted file mode 100644
index 3ee935a4fe00..000000000000
--- a/metadata/md5-cache/kde-plasma/ksystemstats-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libksysguard-5.27.1:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin-based system monitoring daemon
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=networkmanager test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libksysguard-5.27.1:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) !<kde-plasma/ksysguard-5.21.90: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.27.1/ksystemstats-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c205ec33a6562f9580d9ea33d89e2d2e
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.27.2 b/metadata/md5-cache/kde-plasma/ksystemstats-5.27.2
new file mode 100644
index 000000000000..c608e2a52dca
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksystemstats-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libksysguard-5.27.2:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin-based system monitoring daemon
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=networkmanager test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libksysguard-5.27.2:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) !<kde-plasma/ksysguard-5.21.90: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.27.2/ksystemstats-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c205ec33a6562f9580d9ea33d89e2d2e
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.27.1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.27.1
deleted file mode 100644
index 282e939f5f55..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.102.0:5 sys-libs/pam dev-qt/qtcore:5
-DESCRIPTION=PAM module to not enter KWallet password again after login
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.102.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.27.1/kwallet-pam-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2d06bcf7331638ae97ffec1ef8f5f62b
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.27.2 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.27.2
new file mode 100644
index 000000000000..3f48f7ba9592
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.102.0:5 sys-libs/pam dev-qt/qtcore:5
+DESCRIPTION=PAM module to not enter KWallet password again after login
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.102.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.27.2/kwallet-pam-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2d06bcf7331638ae97ffec1ef8f5f62b
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.27.1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.27.1
deleted file mode 100644
index b2454b576ca9..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtgui-5.15.7:5= || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5= x11-libs/libxkbcommon dev-qt/qtcore:5
-DESCRIPTION=Provides KWindowSystem integration plugin for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtgui-5.15.7:5= || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5= x11-libs/libxkbcommon || ( 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.27.1/kwayland-integration-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=707c3b1b9780e78cb05c10c20ae3435a
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.27.2 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.27.2
new file mode 100644
index 000000000000..dc3b861ef8a6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtgui-5.15.7:5= || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5= x11-libs/libxkbcommon dev-qt/qtcore:5
+DESCRIPTION=Provides KWindowSystem integration plugin for Wayland
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtgui-5.15.7:5= || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5= x11-libs/libxkbcommon || ( 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.27.2/kwayland-integration-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=928512e80d1cb534e7fd637a956d0a47
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.27.1 b/metadata/md5-cache/kde-plasma/kwin-5.27.1
deleted file mode 100644
index cda32deedcfc..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.27.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner >=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.21.0 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5=[X] >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5= >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5=[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/breeze-5.27.1:5 >=kde-plasma/kdecoration-5.27.1:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-1.5.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] ) lock? ( >=kde-plasma/kscreenlocker-5.27.1:5 ) plasma? ( >=kde-frameworks/krunner-5.102.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-libs/plasma-wayland-protocols-1.9 >=dev-libs/wayland-protocols-1.31 >=dev-qt/designer-5.15.7:5 >=dev-qt/qtconcurrent-5.15.7:5 x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=accessibility caps gles2-only lock multimedia plasma screencast test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.27.1:5
-RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.21.0 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5=[X] >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5= >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5=[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/breeze-5.27.1:5 >=kde-plasma/kdecoration-5.27.1:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-1.5.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] ) lock? ( >=kde-plasma/kscreenlocker-5.27.1:5 ) plasma? ( >=kde-frameworks/krunner-5.102.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) !kde-plasma/kwayland-server >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtvirtualkeyboard-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.7:5[gstreamer,qml] ) || ( 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/plasma/5.27.1/kwin-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3fc5d7a33e1fb18cf7701d6782889af4
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.27.2 b/metadata/md5-cache/kde-plasma/kwin-5.27.2
new file mode 100644
index 000000000000..b43a51a8e068
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.27.2
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner >=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.21.0 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5=[X] >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5= >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5=[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/breeze-5.27.2:5 >=kde-plasma/kdecoration-5.27.2:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-1.5.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] ) lock? ( >=kde-plasma/kscreenlocker-5.27.2:5 ) plasma? ( >=kde-frameworks/krunner-5.102.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-libs/plasma-wayland-protocols-1.9 >=dev-libs/wayland-protocols-1.31 >=dev-qt/designer-5.15.7:5 >=dev-qt/qtconcurrent-5.15.7:5 x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org optfeature
+IUSE=accessibility caps gles2-only lock multimedia plasma screencast test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.27.2:5
+RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.21.0 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5=[X] >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5= >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5=[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/breeze-5.27.2:5 >=kde-plasma/kdecoration-5.27.2:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-1.5.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] ) lock? ( >=kde-plasma/kscreenlocker-5.27.2:5 ) plasma? ( >=kde-frameworks/krunner-5.102.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) !kde-plasma/kwayland-server >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtvirtualkeyboard-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.7:5[gstreamer,qml] ) || ( 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/plasma/5.27.2/kwin-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3fc5d7a33e1fb18cf7701d6782889af4
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.27.1 b/metadata/md5-cache/kde-plasma/kwrited-5.27.1
deleted file mode 100644
index 431deb756fdc..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpty-5.102.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpty-5.102.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.27.1/kwrited-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=665967d90e2d74e0665242b251960c29
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.27.2 b/metadata/md5-cache/kde-plasma/kwrited-5.27.2
new file mode 100644
index 000000000000..8a3f67348542
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpty-5.102.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpty-5.102.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.27.2/kwrited-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=665967d90e2d74e0665242b251960c29
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.27.1 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.27.1
deleted file mode 100644
index e3374a4ec054..000000000000
--- a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwayland-5.15.7:5= x11-libs/libxkbcommon dev-libs/wayland-protocols dev-qt/qtcore:5
-DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwayland-5.15.7:5= x11-libs/libxkbcommon || ( 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.27.1/layer-shell-qt-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c7c6718e51de5fb78d754fda62ddf5e7
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.27.2 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.27.2
new file mode 100644
index 000000000000..4f6c2e2064ed
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwayland-5.15.7:5= x11-libs/libxkbcommon dev-libs/wayland-protocols dev-qt/qtcore:5
+DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtwayland-5.15.7:5= x11-libs/libxkbcommon || ( 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.27.2/layer-shell-qt-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c7c6718e51de5fb78d754fda62ddf5e7
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.27.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.27.1
deleted file mode 100644
index 59fef94c525d..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.7:5 >=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.10.0 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kwayland-5.102.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/8
-SRC_URI=mirror://kde/stable/plasma/5.27.1/libkscreen-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9008449da3ef028e5ea08d672ad6354b
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.27.2 b/metadata/md5-cache/kde-plasma/libkscreen-5.27.2
new file mode 100644
index 000000000000..5a672205b090
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-qt/linguist-tools-5.15.7:5 >=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.10.0 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma screen management library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kwayland-5.102.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/8
+SRC_URI=mirror://kde/stable/plasma/5.27.2/libkscreen-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9008449da3ef028e5ea08d672ad6354b
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.27.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.27.1
deleted file mode 100644
index 7e79294c2d3d..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib x11-libs/libX11 x11-libs/libXres webengine? ( >=dev-qt/qtwebchannel-5.15.7:5 >=dev-qt/qtwebengine-5.15.7:5 ) >=kde-frameworks/kiconthemes-5.102.0:5 x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=webengine test debug designer test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib x11-libs/libX11 x11-libs/libXres webengine? ( >=dev-qt/qtwebchannel-5.15.7:5 >=dev-qt/qtwebengine-5.15.7:5 ) !<kde-plasma/ksysguard-5.21.90: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/9
-SRC_URI=mirror://kde/stable/plasma/5.27.1/libksysguard-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=94b8dc8cdb6d1e2a5db700d6a41466fb
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.27.2 b/metadata/md5-cache/kde-plasma/libksysguard-5.27.2
new file mode 100644
index 000000000000..97e5f47b012f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib x11-libs/libX11 x11-libs/libXres webengine? ( >=dev-qt/qtwebchannel-5.15.7:5 >=dev-qt/qtwebengine-5.15.7:5 ) >=kde-frameworks/kiconthemes-5.102.0:5 x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=webengine test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib x11-libs/libX11 x11-libs/libXres webengine? ( >=dev-qt/qtwebchannel-5.15.7:5 >=dev-qt/qtwebengine-5.15.7:5 ) !<kde-plasma/ksysguard-5.21.90: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/9
+SRC_URI=mirror://kde/stable/plasma/5.27.2/libksysguard-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=94b8dc8cdb6d1e2a5db700d6a41466fb
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.27.1 b/metadata/md5-cache/kde-plasma/libkworkspace-5.27.1
deleted file mode 100644
index 75b268b2dea1..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kscreenlocker-5.27.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.27.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kscreenlocker-5.27.1: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.27.1/plasma-workspace-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8d8461a4fbd70223092849f5c49f4c93
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.27.2 b/metadata/md5-cache/kde-plasma/libkworkspace-5.27.2
new file mode 100644
index 000000000000..09827c63c538
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kscreenlocker-5.27.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.27.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kscreenlocker-5.27.2: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.27.2/plasma-workspace-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8d8461a4fbd70223092849f5c49f4c93
diff --git a/metadata/md5-cache/kde-plasma/milou-5.27.1 b/metadata/md5-cache/kde-plasma/milou-5.27.1
deleted file mode 100644
index 4e6c291b7425..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/milou
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/plasma-5.102.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.27.1/milou-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c5ff5a7dd8a92921e01a6aca5508ef85
diff --git a/metadata/md5-cache/kde-plasma/milou-5.27.2 b/metadata/md5-cache/kde-plasma/milou-5.27.2
new file mode 100644
index 000000000000..2354400cddcb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/milou
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/plasma-5.102.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.27.2/milou-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c5ff5a7dd8a92921e01a6aca5508ef85
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.27.1 b/metadata/md5-cache/kde-plasma/oxygen-5.27.1
deleted file mode 100644
index 64ad63a7e1e7..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kdecoration-5.27.1:5 x11-libs/libxcb >=kde-frameworks/kservice-5.102.0:5 dev-qt/qtcore:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/oxygen
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.27.1:5
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kdecoration-5.27.1:5 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.27.1/oxygen-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ea01e07441fd3199769770b7a73df1a4
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.27.2 b/metadata/md5-cache/kde-plasma/oxygen-5.27.2
new file mode 100644
index 000000000000..7dcfd1501041
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kdecoration-5.27.2:5 x11-libs/libxcb >=kde-frameworks/kservice-5.102.0:5 dev-qt/qtcore:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/oxygen
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.27.2:5
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/frameworkintegration-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-plasma/kdecoration-5.27.2:5 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.27.2/oxygen-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ea01e07441fd3199769770b7a73df1a4
diff --git a/metadata/md5-cache/kde-plasma/oxygen-sounds-5.27.1 b/metadata/md5-cache/kde-plasma/oxygen-sounds-5.27.1
deleted file mode 100644
index a4268ec79b3b..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-sounds-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Oxygen sound theme for the Plasma desktop
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/oxygen-sounds
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=!<kde-plasma/oxygen-5.24.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.27.1/oxygen-sounds-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c01a5a6111f82802801d061ff2983c57
diff --git a/metadata/md5-cache/kde-plasma/oxygen-sounds-5.27.2 b/metadata/md5-cache/kde-plasma/oxygen-sounds-5.27.2
new file mode 100644
index 000000000000..5d9d192d10d0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-sounds-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Oxygen sound theme for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/oxygen-sounds
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=!<kde-plasma/oxygen-5.24.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.27.2/oxygen-sounds-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c01a5a6111f82802801d061ff2983c57
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.27.1
deleted file mode 100644
index c6ff1b698733..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kfilemetadata-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 >=kde-plasma/plasma-workspace-5.27.1:5 dev-qt/qtcore:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kfilemetadata-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 >=kde-plasma/plasma-workspace-5.27.1: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.27.1/plasma-browser-integration-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b7d78e1e0e33b0c52b4812a5a93490a6
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.27.2
new file mode 100644
index 000000000000..81c76553768f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kfilemetadata-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 >=kde-plasma/plasma-workspace-5.27.2:5 dev-qt/qtcore:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kfilemetadata-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/purpose-5.102.0:5 >=kde-plasma/plasma-workspace-5.27.2: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.27.2/plasma-browser-integration-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b7d78e1e0e33b0c52b4812a5a93490a6
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.1
deleted file mode 100644
index 7be4fbf97476..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtprintsupport-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 >=kde-plasma/kwin-5.27.1:5 >=kde-plasma/libksysguard-5.27.1:5 >=kde-plasma/libkworkspace-5.27.1:5 >=kde-plasma/plasma-workspace-5.27.1:5[screencast?] >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxkbfile ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) >=dev-libs/wayland-protocols-1.25 dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=ibus +kaccounts scim screencast +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/wayland >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtprintsupport-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 >=kde-plasma/kwin-5.27.1:5 >=kde-plasma/libksysguard-5.27.1:5 >=kde-plasma/libkworkspace-5.27.1:5 >=kde-plasma/plasma-workspace-5.27.1:5[screencast?] >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxkbfile ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) !<kde-plasma/kdeplasma-addons-5.25.50 >=dev-qt/qtgraphicaleffects-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtwaylandscanner-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/qqc2-desktop-style-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.1:5 >=kde-plasma/oxygen-5.27.1:5 media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) screencast? ( >=kde-plasma/kpipewire-5.27.1: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.27.1/plasma-desktop-5.27.1.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=948bfc7be7cd061dfc24ac585f66bdd9
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.2
new file mode 100644
index 000000000000..72f57267dc1f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtprintsupport-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 >=kde-plasma/kwin-5.27.2:5 >=kde-plasma/libksysguard-5.27.2:5 >=kde-plasma/libkworkspace-5.27.2:5 >=kde-plasma/plasma-workspace-5.27.2:5[screencast?] >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxkbfile ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) >=dev-libs/wayland-protocols-1.25 dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org optfeature
+IUSE=ibus +kaccounts scim screencast +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/wayland >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtprintsupport-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 >=kde-plasma/kwin-5.27.2:5 >=kde-plasma/libksysguard-5.27.2:5 >=kde-plasma/libkworkspace-5.27.2:5 >=kde-plasma/plasma-workspace-5.27.2:5[screencast?] >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxkbfile ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) !<kde-plasma/kdeplasma-addons-5.25.50 >=dev-qt/qtgraphicaleffects-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtwaylandscanner-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/qqc2-desktop-style-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.2:5 >=kde-plasma/oxygen-5.27.2:5 media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) screencast? ( >=kde-plasma/kpipewire-5.27.2: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.27.2/plasma-desktop-5.27.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=948bfc7be7cd061dfc24ac585f66bdd9
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-disks-5.27.1
deleted file mode 100644
index be0c9d32aaf2..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 sys-apps/smartmontools dev-qt/qtcore:5
-DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/solid-5.102.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.27.1/plasma-disks-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b5fabe370d3d790d40aa20362af88841
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-disks-5.27.2
new file mode 100644
index 000000000000..59ecfd87f5af
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 sys-apps/smartmontools dev-qt/qtcore:5
+DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/solid-5.102.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.27.2/plasma-disks-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b5fabe370d3d790d40aa20362af88841
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.27.1
deleted file mode 100644
index 2c46368f2ff4..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.27.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma frontend for Firewalld or UFW
-EAPI=8
-HOMEPAGE=https://invent.kde.org/network/plasma-firewall
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org python-single-r1
-IUSE=firewalld +ufw debug test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) firewalld? ( net-firewall/firewalld ) ufw? ( 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_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( firewalld ufw )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.1/plasma-firewall-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e64f7e1f476169c035997e82183a881a
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.27.2
new file mode 100644
index 000000000000..cef75166374d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.27.2
@@ -0,0 +1,18 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma frontend for Firewalld or UFW
+EAPI=8
+HOMEPAGE=https://invent.kde.org/network/plasma-firewall
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org python-single-r1
+IUSE=firewalld +ufw debug test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) firewalld? ( net-firewall/firewalld ) ufw? ( 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_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( firewalld ufw )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.2/plasma-firewall-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e64f7e1f476169c035997e82183a881a
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.27.1
deleted file mode 100644
index 1832ce520073..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/breeze-5.27.1:5 x11-libs/libXcursor x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.6.0 dev-qt/qtcore:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/breeze-5.27.1: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.27.1/plasma-integration-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=289431880c412902b8c17780a6fed02e
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-integration-5.27.2
new file mode 100644
index 000000000000..088e945f688d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/breeze-5.27.2:5 x11-libs/libXcursor x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.6.0 dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/breeze-5.27.2: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.27.2/plasma-integration-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=289431880c412902b8c17780a6fed02e
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.27.1
deleted file mode 100644
index 2239659dd558..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.27.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=8
-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 +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.27.1:5 >=kde-plasma/kactivitymanagerd-5.27.1:5 >=kde-plasma/kde-cli-tools-5.27.1:5 >=kde-plasma/kdecoration-5.27.1:5 >=kde-plasma/kdeplasma-addons-5.27.1:5 >=kde-plasma/kgamma-5.27.1:5 >=kde-plasma/khotkeys-5.27.1:5 >=kde-plasma/kinfocenter-5.27.1:5 >=kde-plasma/kmenuedit-5.27.1:5 >=kde-plasma/kscreen-5.27.1:5 >=kde-plasma/kscreenlocker-5.27.1:5 >=kde-plasma/ksshaskpass-5.27.1:5 >=kde-plasma/ksystemstats-5.27.1:5 >=kde-plasma/kwayland-integration-5.27.1:5 >=kde-plasma/kwin-5.27.1:5[lock] >=kde-plasma/kwrited-5.27.1:5 >=kde-plasma/layer-shell-qt-5.27.1:5 >=kde-plasma/libkscreen-5.27.1:5 >=kde-plasma/libksysguard-5.27.1:5 >=kde-plasma/milou-5.27.1:5 >=kde-plasma/oxygen-5.27.1:5 >=kde-plasma/oxygen-sounds-5.27.1:5 >=kde-plasma/plasma-desktop-5.27.1:5 >=kde-plasma/plasma-integration-5.27.1:5 >=kde-plasma/plasma-systemmonitor-5.27.1:5 >=kde-plasma/plasma-welcome-5.27.1:5 >=kde-plasma/plasma-workspace-5.27.1:5 >=kde-plasma/polkit-kde-agent-5.27.1:5 >=kde-plasma/powerdevil-5.27.1:5 >=kde-plasma/systemsettings-5.27.1:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.27.1:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.27.1:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.27.1:5 ) crypt? ( >=kde-plasma/plasma-vault-5.27.1:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.27.1:5 ) discover? ( >=kde-plasma/discover-5.27.1:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.27.1:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.27.1:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.27.1:5 >=kde-plasma/kde-gtk-config-5.27.1:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.27.1:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.27.1:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.27.1:5 net-misc/networkmanager[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.27.1:5 >=kde-plasma/plymouth-kcm-5.27.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.27.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.27.1:5 ) smart? ( >=kde-plasma/plasma-disks-5.27.1:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.27.1:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.27.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.27.1:5 ) accessibility? ( app-accessibility/orca )
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=5
-_md5_=794c8610fa810fcefebc916648f7fd60
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-meta-5.27.2
new file mode 100644
index 000000000000..ac122690fa06
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.27.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=8
+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 +sddm sdk +smart systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.27.2:5 >=kde-plasma/kactivitymanagerd-5.27.2:5 >=kde-plasma/kde-cli-tools-5.27.2:5 >=kde-plasma/kdecoration-5.27.2:5 >=kde-plasma/kdeplasma-addons-5.27.2:5 >=kde-plasma/kgamma-5.27.2:5 >=kde-plasma/khotkeys-5.27.2:5 >=kde-plasma/kinfocenter-5.27.2:5 >=kde-plasma/kmenuedit-5.27.2:5 >=kde-plasma/kscreen-5.27.2:5 >=kde-plasma/kscreenlocker-5.27.2:5 >=kde-plasma/ksshaskpass-5.27.2:5 >=kde-plasma/ksystemstats-5.27.2:5 >=kde-plasma/kwayland-integration-5.27.2:5 >=kde-plasma/kwin-5.27.2:5[lock] >=kde-plasma/kwrited-5.27.2:5 >=kde-plasma/layer-shell-qt-5.27.2:5 >=kde-plasma/libkscreen-5.27.2:5 >=kde-plasma/libksysguard-5.27.2:5 >=kde-plasma/milou-5.27.2:5 >=kde-plasma/oxygen-5.27.2:5 >=kde-plasma/oxygen-sounds-5.27.2:5 >=kde-plasma/plasma-desktop-5.27.2:5 >=kde-plasma/plasma-integration-5.27.2:5 >=kde-plasma/plasma-systemmonitor-5.27.2:5 >=kde-plasma/plasma-welcome-5.27.2:5 >=kde-plasma/plasma-workspace-5.27.2:5 >=kde-plasma/polkit-kde-agent-5.27.2:5 >=kde-plasma/powerdevil-5.27.2:5 >=kde-plasma/systemsettings-5.27.2:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.27.2:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.27.2:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.27.2:5 ) crypt? ( >=kde-plasma/plasma-vault-5.27.2:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.27.2:5 ) discover? ( >=kde-plasma/discover-5.27.2:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.27.2:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.27.2:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.27.2:5 >=kde-plasma/kde-gtk-config-5.27.2:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.27.2:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.27.2:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.27.2:5 net-misc/networkmanager[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.27.2:5 >=kde-plasma/plymouth-kcm-5.27.2:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.27.2:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.27.2:5 ) smart? ( >=kde-plasma/plasma-disks-5.27.2:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.27.2:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.27.2:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.27.2:5 ) accessibility? ( app-accessibility/orca )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=794c8610fa810fcefebc916648f7fd60
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.27.1
deleted file mode 100644
index 84fb8e280bc7..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/modemmanager-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5[teamd=] >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 net-misc/networkmanager[teamd=] >=dev-qt/qtxml-5.15.7:5 net-misc/mobile-broadband-provider-info openconnect? ( >=dev-qt/qtxml-5.15.7:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/modemmanager-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5[teamd=] >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 net-misc/networkmanager[teamd=] >=dev-qt/qtxml-5.15.7:5 net-misc/mobile-broadband-provider-info openconnect? ( >=dev-qt/qtxml-5.15.7:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kquickcharts-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/plasma-nm-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=99621564d8522209ef11a4db30687a60
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-nm-5.27.2
new file mode 100644
index 000000000000..7000b6090653
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/modemmanager-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5[teamd=] >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 net-misc/networkmanager[teamd=] >=dev-qt/qtxml-5.15.7:5 net-misc/mobile-broadband-provider-info openconnect? ( >=dev-qt/qtxml-5.15.7:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/modemmanager-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5[teamd=] >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 net-misc/networkmanager[teamd=] >=dev-qt/qtxml-5.15.7:5 net-misc/mobile-broadband-provider-info openconnect? ( >=dev-qt/qtxml-5.15.7:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kquickcharts-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/plasma-nm-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=99621564d8522209ef11a4db30687a60
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.27.1
deleted file mode 100644
index 59de2c02ef38..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 media-libs/libcanberra media-libs/libpulse dev-qt/qtcore:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 media-libs/libcanberra media-libs/libpulse >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.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.27.1/plasma-pa-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b593f81717dd0b36999df65440dcb00
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-pa-5.27.2
new file mode 100644
index 000000000000..0adfa454d95b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 media-libs/libcanberra media-libs/libpulse dev-qt/qtcore:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 media-libs/libcanberra media-libs/libpulse >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.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.27.2/plasma-pa-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5b593f81717dd0b36999df65440dcb00
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.27.1
deleted file mode 100644
index b5f0afbbd0bb..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.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.27.1/plasma-sdk-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=164fea1195fb6b254848c5634a12d11a
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.27.2
new file mode 100644
index 000000000000..50c51add8324
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.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.27.2/plasma-sdk-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=164fea1195fb6b254848c5634a12d11a
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.27.1
deleted file mode 100644
index beadd37366a2..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-plasma/libksysguard-5.27.1:5 dev-qt/qtcore:5
-DESCRIPTION=Monitor system sensors, process information and other system resources
-EAPI=8
-HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-plasma/libksysguard-5.27.1:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] >=kde-frameworks/kquickcharts-5.102.0:5 >=kde-plasma/ksystemstats-5.27.1: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.27.1/plasma-systemmonitor-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=33ecd3c25ef42bf52cc60793a8cfa9be
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.27.2
new file mode 100644
index 000000000000..62646cc619f9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-plasma/libksysguard-5.27.2:5 dev-qt/qtcore:5
+DESCRIPTION=Monitor system sensors, process information and other system resources
+EAPI=8
+HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-plasma/libksysguard-5.27.2:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] >=kde-frameworks/kquickcharts-5.102.0:5 >=kde-plasma/ksystemstats-5.27.2: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.27.2/plasma-systemmonitor-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=33ecd3c25ef42bf52cc60793a8cfa9be
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.27.1
deleted file mode 100644
index 301f2d351ac9..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for controlling Thunderbolt devices
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=~amd64 ~loong ~riscv ~x86
-LICENSE=|| ( GPL-2 GPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.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.27.1/plasma-thunderbolt-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=640fbc021cea09929112f07d9495cef7
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.27.2
new file mode 100644
index 000000000000..d1aa7aec7944
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for controlling Thunderbolt devices
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~loong ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.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.27.2/plasma-thunderbolt-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=640fbc021cea09929112f07d9495cef7
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-vault-5.27.1
deleted file mode 100644
index f7133033dfcb..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/libksysguard-5.27.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/libksysguard-5.27.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) >=dev-qt/qtquickcontrols2-5.15.7: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.27.1/plasma-vault-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c8d3fa1469b2ef405c947ce039acac2a
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-vault-5.27.2
new file mode 100644
index 000000000000..be23da74db8e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/libksysguard-5.27.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kcodecs-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-plasma/libksysguard-5.27.2:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) >=dev-qt/qtquickcontrols2-5.15.7: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.27.2/plasma-vault-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c8d3fa1469b2ef405c947ce039acac2a
diff --git a/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.1
deleted file mode 100644
index 0c6c9fba1206..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 kde-apps/kaccounts-integration:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-qt/qtcore:5
-DESCRIPTION=A friendly onboarding wizard for Plasma
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=telemetry debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 kde-apps/kaccounts-integration:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 telemetry? ( dev-libs/kuserfeedback: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.27.1/plasma-welcome-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1ce0e5da1c95f9b63ff695b631174b0a
diff --git a/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.2
new file mode 100644
index 000000000000..03d7cb40e3a4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 kde-apps/kaccounts-integration:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-qt/qtcore:5
+DESCRIPTION=A friendly onboarding wizard for Plasma
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=telemetry debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 kde-apps/kaccounts-integration:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 telemetry? ( dev-libs/kuserfeedback: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.27.2/plasma-welcome-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1ce0e5da1c95f9b63ff695b631174b0a
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.1
deleted file mode 100644
index ca86348cb80e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.1
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kinit-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kpeople-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/prison-5.102.0:5[qml] >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/breeze-5.27.1:5 >=kde-plasma/kscreenlocker-5.27.1:5 >=kde-plasma/kwin-5.27.1:5 >=kde-plasma/layer-shell-qt-5.27.1:5 >=kde-plasma/libkscreen-5.27.1:5 >=kde-plasma/libksysguard-5.27.1:5 >=kde-plasma/libkworkspace-5.27.1:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= 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 appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.102.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.7:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( sys-auth/polkit-qt virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.7:5=[egl] >=kde-plasma/kpipewire-5.27.1:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) wallpaper-metadata? ( kde-apps/libkexiv2:5 ) >=dev-libs/plasma-wayland-protocols-1.6.0 >=dev-libs/wayland-protocols-1.31 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry +wallpaper-metadata test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.27.1:5
-RDEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kinit-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kpeople-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/prison-5.102.0:5[qml] >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/breeze-5.27.1:5 >=kde-plasma/kscreenlocker-5.27.1:5 >=kde-plasma/kwin-5.27.1:5 >=kde-plasma/layer-shell-qt-5.27.1:5 >=kde-plasma/libkscreen-5.27.1:5 >=kde-plasma/libksysguard-5.27.1:5 >=kde-plasma/libkworkspace-5.27.1:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= 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 appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.102.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.7:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( sys-auth/polkit-qt virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.7:5=[egl] >=kde-plasma/kpipewire-5.27.1:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) wallpaper-metadata? ( kde-apps/libkexiv2:5 ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.27.0:5 app-text/iso-codes >=dev-qt/qdbus-5.15.7:* >=dev-qt/qtgraphicaleffects-5.15.7:5 >=dev-qt/qtpaths-5.15.7:5 >=dev-qt/qtquickcontrols-5.15.7:5[widgets] >=dev-qt/qtquickcontrols2-5.15.7:5 kde-apps/kio-extras:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kquickcharts-5.102.0:5 >=kde-plasma/milou-5.27.1:5 >=kde-plasma/plasma-integration-5.27.1:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.1/plasma-workspace-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=61104c9a23819dce0a8c196569b04bea
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.2
new file mode 100644
index 000000000000..2e46a1ea7506
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.2
@@ -0,0 +1,19 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 >=kde-frameworks/kcmutils-5.102.0:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kinit-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kpeople-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/prison-5.102.0:5[qml] >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/breeze-5.27.2:5 >=kde-plasma/kscreenlocker-5.27.2:5 >=kde-plasma/kwin-5.27.2:5 >=kde-plasma/layer-shell-qt-5.27.2:5 >=kde-plasma/libkscreen-5.27.2:5 >=kde-plasma/libksysguard-5.27.2:5 >=kde-plasma/libkworkspace-5.27.2:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= 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 appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.102.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.7:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( sys-auth/polkit-qt virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.7:5=[egl] >=kde-plasma/kpipewire-5.27.2:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) wallpaper-metadata? ( kde-apps/libkexiv2:5 ) >=dev-libs/plasma-wayland-protocols-1.6.0 >=dev-libs/wayland-protocols-1.31 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry +wallpaper-metadata test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.27.2:5
+RDEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5= >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kinit-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kpeople-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/ktexteditor-5.102.0:5 >=kde-frameworks/ktextwidgets-5.102.0:5 >=kde-frameworks/kunitconversion-5.102.0:5 >=kde-frameworks/kwallet-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/prison-5.102.0:5[qml] >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/breeze-5.27.2:5 >=kde-plasma/kscreenlocker-5.27.2:5 >=kde-plasma/kwin-5.27.2:5 >=kde-plasma/layer-shell-qt-5.27.2:5 >=kde-plasma/libkscreen-5.27.2:5 >=kde-plasma/libksysguard-5.27.2:5 >=kde-plasma/libkworkspace-5.27.2:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= 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 appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.102.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.7:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.102.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( sys-auth/polkit-qt virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.7:5=[egl] >=kde-plasma/kpipewire-5.27.2:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) wallpaper-metadata? ( kde-apps/libkexiv2:5 ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.27.0:5 app-text/iso-codes >=dev-qt/qdbus-5.15.7:* >=dev-qt/qtgraphicaleffects-5.15.7:5 >=dev-qt/qtpaths-5.15.7:5 >=dev-qt/qtquickcontrols-5.15.7:5[widgets] >=dev-qt/qtquickcontrols2-5.15.7:5 kde-apps/kio-extras:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kquickcharts-5.102.0:5 >=kde-plasma/milou-5.27.2:5 >=kde-plasma/plasma-integration-5.27.2:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.2/plasma-workspace-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=61104c9a23819dce0a8c196569b04bea
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.27.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.27.1
deleted file mode 100644
index 4d2a5f1079fb..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.27.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Wallpapers for the Plasma workspace
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=cmake plasma.kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.1/plasma-workspace-wallpapers-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1dbc43604de589828ff95a65aaa3b115
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.27.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.27.2
new file mode 100644
index 000000000000..dbcedfc13fad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.27.2
@@ -0,0 +1,12 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Wallpapers for the Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=cmake plasma.kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.2/plasma-workspace-wallpapers-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1dbc43604de589828ff95a65aaa3b115
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.27.1 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.27.1
deleted file mode 100644
index d8186b7ab2c9..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 sys-boot/plymouth dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/plymouth-kcm-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=27208e920aca70035b31a09c381cb65b
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.27.2 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.27.2
new file mode 100644
index 000000000000..ac3ca1806ecb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 sys-boot/plymouth dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/plymouth-kcm-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=27208e920aca70035b31a09c381cb65b
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.27.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.27.1
deleted file mode 100644
index e48172e029f0..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=sys-auth/polkit-qt-0.113.0[qt5(+)] dev-qt/qtcore:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=8
-HOMEPAGE=https://kde.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=sys-auth/polkit-qt-0.113.0[qt5(+)] || ( 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.27.1/polkit-kde-agent-1-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a2a9fbbd53c5be7a5411f1980055804c
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.27.2 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.27.2
new file mode 100644
index 000000000000..c965771305a5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=sys-auth/polkit-qt-0.113.0[qt5(+)] dev-qt/qtcore:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=8
+HOMEPAGE=https://kde.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=sys-auth/polkit-qt-0.113.0[qt5(+)] || ( 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.27.2/polkit-kde-agent-1-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a2a9fbbd53c5be7a5411f1980055804c
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.27.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.27.1
deleted file mode 100644
index 17671ec308f2..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5[policykit] >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libkscreen-5.27.1:5 >=kde-plasma/libkworkspace-5.27.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5 ) dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=brightness-control caps +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5[policykit] >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libkscreen-5.27.1:5 >=kde-plasma/libkworkspace-5.27.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5 ) >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/powerdevil-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=77e36503826d7cbfedb55ed596c8a9c0
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.27.2 b/metadata/md5-cache/kde-plasma/powerdevil-5.27.2
new file mode 100644
index 000000000000..bd65ebfd6466
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5[policykit] >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libkscreen-5.27.2:5 >=kde-plasma/libkworkspace-5.27.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=brightness-control caps +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5[policykit] >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libkscreen-5.27.2:5 >=kde-plasma/libkworkspace-5.27.2:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5 ) >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/powerdevil-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=77e36503826d7cbfedb55ed596c8a9c0
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.27.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.27.1
deleted file mode 100644
index b5243ed8d1d9..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] >=kde-plasma/kde-cli-tools-5.27.1: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.27.1/sddm-kcm-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4491e98a66a4018de3a4a246571c007f
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.27.2 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.27.2
new file mode 100644
index 000000000000..91cf45460470
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] >=kde-plasma/kde-cli-tools-5.27.2: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.27.2/sddm-kcm-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4491e98a66a4018de3a4a246571c007f
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.27.1 b/metadata/md5-cache/kde-plasma/systemsettings-5.27.1
deleted file mode 100644
index 7bad07d86ddd..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.1:5 dev-qt/qtcore:5
-DESCRIPTION=Control Center to configure KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.1:5 >=dev-qt/qtquickcontrols2-5.15.7: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.27.1/systemsettings-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=64c9859da1abadfd1ed772cbb23d3ab8
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.27.2 b/metadata/md5-cache/kde-plasma/systemsettings-5.27.2
new file mode 100644
index 000000000000..120f56f82b9e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.27.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.102.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.2:5 dev-qt/qtcore:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org optfeature
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcompletion-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-plasma/libkworkspace-5.27.2:5 >=dev-qt/qtquickcontrols2-5.15.7: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.27.2/systemsettings-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=64c9859da1abadfd1ed772cbb23d3ab8
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.27.1 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.27.1
deleted file mode 100644
index b996baf1c7eb..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.27.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtprintsupport-5.15.7:5[cups] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5[dbus] >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 x11-libs/libxkbcommon >=dev-libs/plasma-wayland-protocols-1.7.0 >=dev-libs/wayland-protocols-1.25 >=dev-qt/qtconcurrent-5.15.7:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtprintsupport-5.15.7:5[cups] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5[dbus] >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 x11-libs/libxkbcommon kde-misc/kio-fuse:5 sys-apps/xdg-desktop-portal || ( 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.27.1/xdg-desktop-portal-kde-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bc25c6b2aecce9aeb857adc60407eb73
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.27.2 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.27.2
new file mode 100644
index 000000000000..ac41f7a01e36
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.27.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtprintsupport-5.15.7:5[cups] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5[dbus] >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 x11-libs/libxkbcommon >=dev-libs/plasma-wayland-protocols-1.7.0 >=dev-libs/wayland-protocols-1.25 >=dev-qt/qtconcurrent-5.15.7:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 || ( >=dev-qt/qtgui-5.15.7:5[libinput] >=dev-qt/qtgui-5.15.7:5[X] ) >=dev-qt/qtprintsupport-5.15.7:5[cups] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5[dbus] >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 x11-libs/libxkbcommon kde-misc/kio-fuse:5 sys-apps/xdg-desktop-portal || ( 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.27.2/xdg-desktop-portal-kde-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=bc25c6b2aecce9aeb857adc60407eb73
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.27.1 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.27.1
deleted file mode 100644
index 2f4017e012c2..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-INHERIT=cmake plasma.kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kwindowsystem-5.102.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.27.1/plasma-workspace-5.27.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=18c62924c988fbf94198f888235433aa
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.27.2 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.27.2
new file mode 100644
index 000000000000..a4323bf34898
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.27.2
@@ -0,0 +1,14 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
+INHERIT=cmake plasma.kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kwindowsystem-5.102.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.27.2/plasma-workspace-5.27.2.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=18c62924c988fbf94198f888235433aa
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 0d384f093fb6..a0684be9affc 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/claws-mail-9999 b/metadata/md5-cache/mail-client/claws-mail-9999
index 7048f132928d..b8cb835e4561 100644
--- a/metadata/md5-cache/mail-client/claws-mail-9999
+++ b/metadata/md5-cache/mail-client/claws-mail-9999
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:=
 REQUIRED_USE=libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) oauth? ( gnutls ) smime? ( pgp )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bf560d4312d060ab03dca847e69f52b0
+_md5_=304655376a153b4d5b0cf07c309b29a8
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.8.0 b/metadata/md5-cache/mail-client/thunderbird-102.8.0
index 54aaeec70485..a23f3a381ad7 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.8.0
+++ b/metadata/md5-cache/mail-client/thunderbird-102.8.0
@@ -14,4 +14,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/source/thunderbird-102.8.0.source.tar.xz -> thunderbird-102.8.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-09jtb.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-09jtb.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-09jtb.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.8.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.8.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.8.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.8.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.8.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.8.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.8.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.8.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.8.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.8.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.8.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.8.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.8.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.8.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.8.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.8.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.8.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.8.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.8.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.8.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.8.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.8.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.8.0-zh-TW.xpi )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=da14cf2ad7f2263e17719af9d274d9fe
+_md5_=3a3833a4114723e5f7c52459f9d32f89
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-102.8.0 b/metadata/md5-cache/mail-client/thunderbird-bin-102.8.0
index 045f71769d3a..562b293eae63 100644
--- a/metadata/md5-cache/mail-client/thunderbird-bin-102.8.0
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-102.8.0
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=0/102
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/en-US/thunderbird-102.8.0.tar.bz2 -> thunderbird-bin_x86_64-102.8.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/en-US/thunderbird-102.8.0.tar.bz2 -> thunderbird-bin_i686-102.8.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.8.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.8.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.8.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.8.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.8.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.8.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.8.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.8.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.8.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.8.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.8.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.8.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.8.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.8.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.8.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.8.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.8.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.8.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.8.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.8.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.8.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.8.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.8.0-zh-TW.xpi )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a6583e22263833999bfb4f7830a54620
+_md5_=3df9037cc65980dc74700303a66b3553
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c311573e44be..cf419088c966 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/courier-pythonfilter-3.0.4 b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4
new file mode 100644
index 000000000000..527f966cafd0
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=mail-mta/courier
+DESCRIPTION=Python filtering architecture for the Courier MTA
+EAPI=8
+HOMEPAGE=https://pypi.org/project/courier-pythonfilter/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/c/courier-pythonfilter/courier-pythonfilter-3.0.4.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=08c84dedc303797f590a35c57bc3c237
diff --git a/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1 b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1
index 867f69ee272e..c7246140c769 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://spamassassin.apache.org/
 INHERIT=perl-functions systemd toolchain-funcs verify-sig
 IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Digest-SHA ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/Archive-Zip dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Email-Address-XS dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/IO-String dev-perl/Mail-DKIM dev-perl/Mail-DMARC dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-LibIDN2 dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2 verify-sig? ( https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=5b136c89e609b3a134130381bfa0e8c3
+_md5_=b5c908a23dff2c4b696c80e2328de72e
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 6b38e16b000e..8cbe5b916a90 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/encodings-1.0.7 b/metadata/md5-cache/media-fonts/encodings-1.0.7
new file mode 100644
index 000000000000..044757b4febe
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.7
@@ -0,0 +1,12 @@
+BDEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 setup unpack
+DESCRIPTION=X.Org font encodings
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/encodings
+INHERIT=font xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.7.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=1def5cb536ef1d1367133ae6391e0d1b
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
new file mode 100644
index 000000000000..cf9c171fe542
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Adobe bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-100dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-adobe-100dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=024926fe14ab24c0437de0b948743de8
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
new file mode 100644
index 000000000000..6473bb3a7de3
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Adobe bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-75dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-adobe-75dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=6b15b99fd1b0550a5d71ffb2fcd7486e
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
new file mode 100644
index 000000000000..e1865f5b5f8b
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Adobe Utopia bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=05fbae5c3f9bd7f26da0ac87838bc4d1
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
new file mode 100644
index 000000000000..5831893d3dc6
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Adobe Utopia bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-75dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=46648d625a10b8524d6d30a50ce36b25
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
new file mode 100644
index 000000000000..352ce400cb66
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Adobe Utopia Type 1 fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-type1
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=6e53ab037d2e3376a3de3cd33dbb0002
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.5 b/metadata/md5-cache/media-fonts/font-alias-1.0.5
new file mode 100644
index 000000000000..a3b661d373fc
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.5
@@ -0,0 +1,12 @@
+BDEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
+DESCRIPTION=X.Org font aliases
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/alias
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=093bec5bc9515e249c993a62bc697f4b
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
new file mode 100644
index 000000000000..dc1b8a79672a
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org arabic bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/arabic-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-arabic-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=120be052caa946b6044cdb94f111ee9f
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
new file mode 100644
index 000000000000..56171baa8049
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-100dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bh-100dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=f0c61eb42d24e37b08e412264b2d02f5
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
new file mode 100644
index 000000000000..80f881c5fe44
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-75dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bh-75dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=39b1166000f88a4180fa3af6130ca9d2
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
new file mode 100644
index 000000000000..061f6d5cfac3
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=1f1d873d29b2fa30db1deb790368e995
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
new file mode 100644
index 000000000000..b1715bae69ad
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=459dfde221d067349ee07599e63224d5
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
new file mode 100644
index 000000000000..4960f9cf8e37
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bigelow & Holmes TrueType fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-ttf
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=bh-luxi
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=95b8aa1bdcee5eac4578e357e33d92b5
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
new file mode 100644
index 000000000000..90f4266178ce
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bigelow & Holmes Type 1 fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-type1
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=bh-luxi
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=6854d498e17cadda2a367d98b808ec55
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
new file mode 100644
index 000000000000..6dc06d7b34b0
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bitstream bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-100dpi
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=3d082aa358e322dd4b482db0206eac4e
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
new file mode 100644
index 000000000000..e7451a419d69
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bitstream bitmap fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-75dpi
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=9187b1a339d2776e98ea15fb2ef177d7
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
new file mode 100644
index 000000000000..1d91f8cba5a3
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Bitstream Type 1 fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-type1
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-type1-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=d2735bdf150efec843355a1ce4d5d690
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
new file mode 100644
index 000000000000..74ef7488e25d
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Cronyx cyrillic fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=5e57cbb39968df0de94190db4b9e19ba
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
new file mode 100644
index 000000000000..b4a6aa74a4b9
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org cursor font
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/cursor-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-cursor-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=10ea220df43aef66ed76c5e2a18e55e8
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
new file mode 100644
index 000000000000..ee6cd1f1f1e2
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Daewoo fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/daewoo-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-daewoo-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=94d9496640f3f84709dabfeb97bc55ec
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
new file mode 100644
index 000000000000..7ca33ec54acd
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org DEC fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/dec-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-dec-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=6eefe8a1900765d13fc4efe58628401f
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
new file mode 100644
index 000000000000..80525e482ec5
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org IBM Courier font
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/ibm-type1
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-ibm-type1-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=a05019d7a58548ed59899633b49e751d
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
new file mode 100644
index 000000000000..66da3a375a0f
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org the Institute of Software, Academia Sinica (chinese) fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/isas-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-isas-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=d1abee1d08c81c867fca337ac70b6102
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
new file mode 100644
index 000000000000..1e5232740b68
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org JIS (japanese) fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/jis-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-jis-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=2f54a87656dbd65f79d79c5374336f32
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
new file mode 100644
index 000000000000..c3c1bd74d708
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org micro-misc font
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/micro-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-micro-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=25fe0d19d40a8a46359e42e7212a5be8
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
new file mode 100644
index 000000000000..2445f45ca0f5
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org misc-cyrillic fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-cyrillic
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-misc-cyrillic-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=f65eccb4ec8d22433ba210a730ad6756
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
new file mode 100644
index 000000000000..0f0a05616240
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=Miscellaneous Ethiopic fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-ethiopic
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-misc-ethiopic-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=6382386f6788dc822d0893d0b9ad18f5
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
new file mode 100644
index 000000000000..6c78526f0234
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Syriac fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-meltho
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-misc-meltho-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=5b88608c2e8d4795b9235a49632702f9
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
new file mode 100644
index 000000000000..5a5bb413060c
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org miscellaneous fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-misc
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.3.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=0571bf968272ccd7d96606c582074e74
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
new file mode 100644
index 000000000000..0badfebb6a4a
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org ClearlyU fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/mutt-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-mutt-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=9019150960dcdad898c2d975766fcbbe
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
new file mode 100644
index 000000000000..cc4a146a30a3
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Schumacher fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/schumacher-misc
+INHERIT=xorg-3
+IUSE=nls X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-schumacher-misc-1.1.3.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=4b9ffcfc2a6d6b9d8897352be31230f3
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
new file mode 100644
index 000000000000..945b173fca37
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Screen cyrillic fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/screen-cyrillic
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-screen-cyrillic-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=8b3a4129a90cd1b79057abbd4dd14ba3
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
new file mode 100644
index 000000000000..460872e18958
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Sony fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/sony-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-sony-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=29b3b1541a65db16f7a47726d0cdd5f6
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
new file mode 100644
index 000000000000..8e1d3007c6ea
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Sun fonts
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/sun-misc
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-sun-misc-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=9550c2d6fa8d26b9f40adf9994f0a91d
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
new file mode 100644
index 000000000000..7d5967f99ddb
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) opentype-compat? ( x11-apps/fonttosfnt ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org Winitzki cyrillic font
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/winitzki-cyrillic
+INHERIT=xorg-3
+IUSE=X +opentype-compat
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=63b1dcaa037eeff52921c2ceefbb1f6b
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
new file mode 100644
index 000000000000..b2836ac7dba2
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x11-apps/bdftopcf virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0
+DESCRIPTION=X.Org XFree86 Type 1 font
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/xfree86-type1
+INHERIT=xorg-3
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=media-fonts/font-alias
+RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-xfree86-type1-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=d2c2c71275872c30734e5a52ae2ff9ba
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index adb0692c6fb4..d0bc30620a60 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-4.2.1 b/metadata/md5-cache/media-gfx/darktable-4.2.1
new file mode 100644
index 000000000000..3048ca822190
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/darktable-4.2.1
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-python/jsonschema-3.2.0 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango avif? ( >=media-libs/libavif-0.8.2:= ) colord? ( x11-libs/colord-gtk:= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) gamepad? ( media-libs/libsdl2 ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gmic? ( media-gfx/gmic ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) heif? ( media-libs/libheif:= ) jpeg2k? ( media-libs/openjpeg:2= ) lua? ( lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) midi? ( media-libs/portmidi ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:= ) webp? ( media-libs/libwebp:= )
+DESCRIPTION=A virtual lighttable and darkroom for photographers
+EAPI=8
+HOMEPAGE=https://www.darktable.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic lua-single toolchain-funcs xdg
+IUSE=avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp l10n_cs l10n_de l10n_es l10n_fi l10n_fr l10n_he l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ru l10n_sl l10n_sq l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW +lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm64 -x86
+LICENSE=GPL-3 CC-BY-3.0
+RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango avif? ( >=media-libs/libavif-0.8.2:= ) colord? ( x11-libs/colord-gtk:= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) gamepad? ( media-libs/libsdl2 ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gmic? ( media-gfx/gmic ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) heif? ( media-libs/libheif:= ) jpeg2k? ( media-libs/openjpeg:2= ) lua? ( lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) midi? ( media-libs/portmidi ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:= ) webp? ( media-libs/libwebp:= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-4 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-4.2.1/darktable-4.2.1.tar.xz doc? ( https://docs.darktable.org/usermanual/4.2/en/darktable_user_manual.pdf -> darktable-usermanual-4.2.en.pdf l10n_uk? ( https://docs.darktable.org/usermanual/4.2/uk/darktable_user_manual.pdf -> darktable-usermanual-4.2.uk.pdf ) )
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=16b2e1a68642e9e2370a2ba388b3c422
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.5-r1 b/metadata/md5-cache/media-gfx/exiv2-0.27.5-r1
deleted file mode 100644
index 9899721d2ed0..000000000000
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-cpp/gtest )
-DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
-EAPI=8
-HOMEPAGE=https://exiv2.org/
-INHERIT=cmake-multilib python-any-r1
-IUSE=+bmff doc examples nls +png test webready +xmp 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=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(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( 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(-)?] ) webready? ( >net-libs/libssh-0.9.1[sftp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/27.5
-SRC_URI=https://exiv2.org/builds/exiv2-0.27.5-Source.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98541898ba442c604308c0092e70f442
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.6 b/metadata/md5-cache/media-gfx/exiv2-0.27.6
index 7a80436c9afa..020c97dcce2b 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.6
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://exiv2.org/
 INHERIT=cmake-multilib python-any-r1
 IUSE=+bmff doc examples nls +png test webready +xmp 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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( 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(-)?] ) webready? ( >net-libs/libssh-0.9.1[sftp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/27.5
 SRC_URI=https://github.com/Exiv2/exiv2/releases/download/v0.27.6/exiv2-0.27.6-Source.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9fad297d77d9eefa1b0eec5e66b6b86a
+_md5_=3e1fabb155f29e82216bdb3cb239a5cc
diff --git a/metadata/md5-cache/media-gfx/flameshot-12.1.0 b/metadata/md5-cache/media-gfx/flameshot-12.1.0
index 2a1421e9744e..77a84f387914 100644
--- a/metadata/md5-cache/media-gfx/flameshot-12.1.0
+++ b/metadata/md5-cache/media-gfx/flameshot-12.1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://flameshot.org https://github.com/flameshot-org/flameshot
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0 Free-Art-1.3 GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 =dev-qt/qtsingleapplication-2.6*[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/flameshot-org/flameshot/archive/v12.1.0.tar.gz -> flameshot-12.1.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=15a23cb7d50121df9f89a595e1a04f5f
+_md5_=1d31167b3297b100a0a0295e04a78f73
diff --git a/metadata/md5-cache/media-gfx/fontforge-20230101 b/metadata/md5-cache/media-gfx/fontforge-20230101
index de087c4fecd2..3bc98162ad87 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20230101
+++ b/metadata/md5-cache/media-gfx/fontforge-20230101
@@ -7,7 +7,7 @@ HOMEPAGE=https://fontforge.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=python-single-r1 xdg cmake
 IUSE=doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD GPL-3+
 RDEPEND=>=dev-libs/glib-2.67:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) tiff? ( media-libs/tiff:= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:= x11-libs/libXi:= ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:0= ) woff2? ( media-libs/woff2:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20230101/fontforge-20230101.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=79fe062a5281589439989ba4eeb006e8
+_md5_=6294de5713948c619c96014ccb2419ac
diff --git a/metadata/md5-cache/media-gfx/fotoxx-23.2 b/metadata/md5-cache/media-gfx/fotoxx-23.2
new file mode 100644
index 000000000000..f1c16022c564
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fotoxx-23.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3
+DESCRIPTION=Program for improving image files made with a digital camera
+EAPI=7
+HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
+INHERIT=optfeature xdg-utils
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
+SLOT=0
+SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-23.2-source.tar.gz
+_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2d5b528cc91f7b5ef4965d846028255d
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.34 b/metadata/md5-cache/media-gfx/gimp-2.10.34
deleted file mode 100644
index ce7f4a4910ad..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.10.34
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.100 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.42:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=8
-HOMEPAGE=https://www.gimp.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools gnome2 toolchain-funcs virtualx
-IUSE=aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+ LGPL-3+
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.100 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.42:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0/2
-SRC_URI=mirror://gimp/v2.10/gimp-2.10.34.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ef2724a546378dec51e2f4f48c410a19
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.34-r1 b/metadata/md5-cache/media-gfx/gimp-2.10.34-r1
new file mode 100644
index 000000000000..b1a399554853
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.34-r1
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.98 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.40:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=8
+HOMEPAGE=https://www.gimp.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome2 toolchain-funcs virtualx
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+ LGPL-3+
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.98 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.40:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.34.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=176afd3ef7187050567c56c0a4468bac
diff --git a/metadata/md5-cache/media-gfx/gmic-3.0.1-r3 b/metadata/md5-cache/media-gfx/gmic-3.0.1-r3
deleted file mode 100644
index 4ec958e8cc5c..000000000000
--- a/metadata/md5-cache/media-gfx/gmic-3.0.1-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gimp? ( dev-qt/linguist-tools:5 ) qt5? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup 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:= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:= ) 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:= ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:= )
-DESCRIPTION=GREYC's Magic Image Converter
-EAPI=8
-HOMEPAGE=https://gmic.eu/ https://github.com/GreycLab/gmic
-INHERIT=cmake bash-completion-r1 toolchain-funcs
-IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv 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:= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:= ) 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:= ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:= ) ffmpeg? ( media-video/ffmpeg:= )
-REQUIRED_USE=gimp? ( png zlib fftw X ) qt5? ( png zlib fftw X )
-SLOT=0
-SRC_URI=https://gmic.eu/files/source/gmic_3.0.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98a4ac68ca31284926cc3b1b972b8970
diff --git a/metadata/md5-cache/media-gfx/gmic-3.2.1 b/metadata/md5-cache/media-gfx/gmic-3.2.1
new file mode 100644
index 000000000000..74fe191eba1a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-3.2.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig gimp? ( dev-qt/linguist-tools:5 media-gfx/gimp:0/2 ) qt5? ( dev-qt/linguist-tools:5 )
+DEFINED_PHASES=compile install pretend setup
+DEPEND=sys-libs/zlib:0= 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:= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:= ) 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:= ) X? ( x11-libs/libX11 x11-libs/libXext )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=8
+HOMEPAGE=https://gmic.eu/ https://github.com/GreycLab/gmic
+INHERIT=toolchain-funcs
+IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=sys-libs/zlib:0= 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:= ) jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) openexr? ( dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:= ) 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:= ) X? ( x11-libs/libX11 x11-libs/libXext ) ffmpeg? ( media-video/ffmpeg:= )
+REQUIRED_USE=gimp? ( png fftw X ) qt5? ( png fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_3.2.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=21cda35aa3ebb3545fef5f4b3742ddda
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40
index 832a7ff82233..87274062bda8 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM
 INHERIT=autotools toolchain-funcs verify-sig
 IUSE=bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype webp wmf X zlib zstd verify-sig
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.40.tar.xz verify-sig? ( mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.40.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=eb4893e772bed2baebc029acd78881fe
+_md5_=eb51bbf0b921d2b3463f2ea475dc6a5d
diff --git a/metadata/md5-cache/media-gfx/hydrus-515 b/metadata/md5-cache/media-gfx/hydrus-515
deleted file mode 100644
index b2adfb98b4bf..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-515
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=8
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-INHERIT=python-single-r1 desktop docs optfeature
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v515.tar.gz -> hydrus-515.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=93c5665efa1b2f181b9924f9c365d9dd
diff --git a/metadata/md5-cache/media-gfx/hydrus-518 b/metadata/md5-cache/media-gfx/hydrus-518
new file mode 100644
index 000000000000..bbacfadac701
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-518
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/httmock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=8
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+INHERIT=python-single-r1 desktop docs optfeature
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 doc
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v518.tar.gz -> hydrus-518.tar.gz https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> hydrus-3.11-test-fixes.patch
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8d7d700602c38db5e531be51b69a2517
diff --git a/metadata/md5-cache/media-gfx/hydrus-9999 b/metadata/md5-cache/media-gfx/hydrus-9999
index cae38920874b..c8fa01ce4781 100644
--- a/metadata/md5-cache/media-gfx/hydrus-9999
+++ b/metadata/md5-cache/media-gfx/hydrus-9999
@@ -1,15 +1,16 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/httmock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare setup test unpack
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=8
 HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
 INHERIT=python-single-r1 desktop docs optfeature git-r3
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 doc
 LICENSE=WTFPL-2 CC-BY-2.5
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
+SRC_URI=https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> hydrus-3.11-test-fixes.patch
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	314e509c51630fb75f120d62a77d008c	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=24bce584ed7abbeb82e75d857bc590e3
+_md5_=8d7d700602c38db5e531be51b69a2517
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.21 b/metadata/md5-cache/media-gfx/renderdoc-1.21
deleted file mode 100644
index 564e050ed3c2..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.21
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-DESCRIPTION=A stand-alone graphics debugging tool
-EAPI=8
-HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.21.tar.gz -> renderdoc-1.21.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.21/v1.21.tar.gz.asc -> renderdoc-1.21.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c6bc1500eaa4ff9d55b9157c8ce0a12a
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.22 b/metadata/md5-cache/media-gfx/renderdoc-1.22
deleted file mode 100644
index bd90223881f6..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.22
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-DESCRIPTION=A stand-alone graphics debugging tool
-EAPI=8
-HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.22.tar.gz -> renderdoc-1.22.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.22/v1.22.tar.gz.asc -> renderdoc-1.22.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a010751ea5159d451056100bb631ffdf
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.22-r1 b/metadata/md5-cache/media-gfx/renderdoc-1.22-r1
deleted file mode 100644
index 09971a47c60a..000000000000
--- a/metadata/md5-cache/media-gfx/renderdoc-1.22-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-DESCRIPTION=A stand-alone graphics debugging tool
-EAPI=8
-HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.22.tar.gz -> renderdoc-1.22.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.22/v1.22.tar.gz.asc -> renderdoc-1.22.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b8bb8633917745574f9eafa026eb5efc
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.24 b/metadata/md5-cache/media-gfx/renderdoc-1.24
index d4cbb51b7037..163d9ed8e4bd 100644
--- a/metadata/md5-cache/media-gfx/renderdoc-1.24
+++ b/metadata/md5-cache/media-gfx/renderdoc-1.24
@@ -1,17 +1,17 @@
-BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyside2[python_targets_python3_11(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
 DESCRIPTION=A stand-alone graphics debugging tool
 EAPI=8
 HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
-KEYWORDS=~amd64
+IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 doc verify-sig
+KEYWORDS=amd64
 LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
-RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
+RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyside2[python_targets_python3_11(-)] ) ) qt5? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.24.tar.gz -> renderdoc-1.24.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.24/v1.24.tar.gz.asc -> renderdoc-1.24.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ba1539ab0ff87c1fe97d5ac46b0f1a6
+_md5_=984486a3817699ec70b8c7a33af6218e
diff --git a/metadata/md5-cache/media-gfx/scrot-1.8.1 b/metadata/md5-cache/media-gfx/scrot-1.8.1
index 3be87d1d6a95..473eec0a8fca 100644
--- a/metadata/md5-cache/media-gfx/scrot-1.8.1
+++ b/metadata/md5-cache/media-gfx/scrot-1.8.1
@@ -5,10 +5,10 @@ DESCRIPTION=Screen capture utility using imlib2 library
 EAPI=8
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
 INHERIT=bash-completion-r1
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=feh LGPL-2+
 RDEPEND=dev-libs/libbsd media-libs/imlib2[X] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/releases/download/1.8.1/scrot-1.8.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a4c2c7985b7b41d634865498b43c4b07
+_md5_=a1056915838a62cc6d867287c0241110
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fd092154a5d0..11e43f2c4ad9 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/aribb24-1.0.3-r2 b/metadata/md5-cache/media-libs/aribb24-1.0.3-r2
index 80fb11e80b2d..0e684e9d2460 100644
--- a/metadata/md5-cache/media-libs/aribb24-1.0.3-r2
+++ b/metadata/md5-cache/media-libs/aribb24-1.0.3-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/nkoriyama/aribb24
 INHERIT=autotools multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-3
 RDEPEND=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(-)?]
 SLOT=0
 SRC_URI=https://github.com/nkoriyama/aribb24/archive/v1.0.3.tar.gz -> aribb24-1.0.3.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=68d6a91a6215162279f4a4bb119ee471
+_md5_=71822e95b4856d2902c640970e25bae9
diff --git a/metadata/md5-cache/media-libs/babl-0.1.100 b/metadata/md5-cache/media-libs/babl-0.1.100
deleted file mode 100644
index acd2d2bea3f9..000000000000
--- a/metadata/md5-cache/media-libs/babl-0.1.100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-1.72:= ) lcms? ( >=media-libs/lcms-2.13.1:2 )
-DESCRIPTION=A dynamic, any to any, pixel format conversion library
-EAPI=8
-HOMEPAGE=https://gegl.org/babl/
-INHERIT=meson gnome2-utils vala
-IUSE=introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-3
-RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.72:= ) lcms? ( >=media-libs/lcms-2.13.1:2 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://download.gimp.org/pub/babl/0.1/babl-0.1.100.tar.xz
-_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6b1c95b1915f53a0e2ce3121230adbb0
diff --git a/metadata/md5-cache/media-libs/babl-0.1.102 b/metadata/md5-cache/media-libs/babl-0.1.102
new file mode 100644
index 000000000000..ed4b67394f46
--- /dev/null
+++ b/metadata/md5-cache/media-libs/babl-0.1.102
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-1.72:= ) lcms? ( >=media-libs/lcms-2.13.1:2 )
+DESCRIPTION=A dynamic, any to any, pixel format conversion library
+EAPI=8
+HOMEPAGE=https://gegl.org/babl/
+INHERIT=meson gnome2-utils vala
+IUSE=introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-3
+RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.72:= ) lcms? ( >=media-libs/lcms-2.13.1:2 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://download.gimp.org/pub/babl/0.1/babl-0.1.102.tar.xz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6b1c95b1915f53a0e2ce3121230adbb0
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.5.1-r2 b/metadata/md5-cache/media-libs/chromaprint-1.5.1-r2
index 033700e55d0a..1174e39cfaec 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.5.1-r2
+++ b/metadata/md5-cache/media-libs/chromaprint-1.5.1-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://acoustid.org/chromaprint
 INHERIT=cmake-multilib
 IUSE=test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=tools? ( <media-video/ffmpeg-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(-)?] ) !tools? ( sci-libs/fftw:=[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/1
 SRC_URI=https://github.com/acoustid/chromaprint/releases/download/v1.5.1/chromaprint-1.5.1.tar.gz test? ( https://github.com/google/googletest/archive/v1.10.x.tar.gz -> gtest-1.10.0.tar.gz )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c1c8e2346b0285fd38a7366eaef6e0d6
+_md5_=5693ee9bc71462f553b198badb472a67
diff --git a/metadata/md5-cache/media-libs/dav1d-1.1.0 b/metadata/md5-cache/media-libs/dav1d-1.1.0
index 8a230ba8f998..6673d9697fef 100644
--- a/metadata/md5-cache/media-libs/dav1d-1.1.0
+++ b/metadata/md5-cache/media-libs/dav1d-1.1.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://code.videolan.org/videolan/dav1d
 INHERIT=meson-multilib
 IUSE=+8bit +10bit +asm test xxhash 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/1.1.0/dav1d-1.1.0.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=842fa413dcf56044762a6dd174504eee
+_md5_=90d522715da0de01625434fe468ab5f0
diff --git a/metadata/md5-cache/media-libs/fdk-aac-2.0.2 b/metadata/md5-cache/media-libs/fdk-aac-2.0.2
index d755ce29c206..4155e5645b23 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-2.0.2
+++ b/metadata/md5-cache/media-libs/fdk-aac-2.0.2
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/opencore-amr/
 INHERIT=multilib-minimal libtool
 IUSE=examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0/2
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-2.0.2.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=75960832c698a39900cedf135a24e45a
+_md5_=00899d085b8e5d7550935638f19eb88c
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.42 b/metadata/md5-cache/media-libs/gegl-0.4.42
deleted file mode 100644
index 141d47322c48..000000000000
--- a/metadata/md5-cache/media-libs/gegl-0.4.42
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pygobject-3.2:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.100[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) x11-base/xorg-proto
-DESCRIPTION=A graph based image processing framework
-EAPI=8
-HOMEPAGE=https://gegl.org/
-INHERIT=flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
-IUSE=cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-3+ LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.100[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
-REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0.4
-SRC_URI=https://download.gimp.org/pub/gegl/0.4/gegl-0.4.42.tar.xz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=36d64904b1d6601c46708a7796f7f624
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.42-r1 b/metadata/md5-cache/media-libs/gegl-0.4.42-r1
new file mode 100644
index 000000000000..3896e4a6febf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.42-r1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pygobject-3.2:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.98[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) x11-base/xorg-proto
+DESCRIPTION=A graph based image processing framework
+EAPI=8
+HOMEPAGE=https://gegl.org/
+INHERIT=flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
+IUSE=cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-3+ LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.98[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=https://download.gimp.org/pub/gegl/0.4/gegl-0.4.42.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
+_md5_=5fefce2689a9a274f4e993e8908a1342
diff --git a/metadata/md5-cache/media-libs/libass-0.17.1 b/metadata/md5-cache/media-libs/libass-0.17.1
new file mode 100644
index 000000000000..f4362e2af7f0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libass-0.17.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) test? ( media-libs/libpng[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libass ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-libs/fribidi-0.19.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(-)?] >=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(-)?] >=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(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] )
+DESCRIPTION=Library for SSA/ASS subtitles rendering
+EAPI=8
+HOMEPAGE=https://github.com/libass/libass
+INHERIT=multilib-minimal verify-sig
+IUSE=+fontconfig 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 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=ISC
+RDEPEND=>=dev-libs/fribidi-0.19.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(-)?] >=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(-)?] >=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(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz verify-sig? ( https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz.asc )
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=51f9ce0d2ee4add874392f5c2c49d938
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11
index e580610d5223..b82bf3bbb4dd 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11
@@ -12,5 +12,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=223a01db3b9db06b37f5201c86d324cf
diff --git a/metadata/md5-cache/media-libs/libdiscid-0.6.3 b/metadata/md5-cache/media-libs/libdiscid-0.6.3
new file mode 100644
index 000000000000..a7b83e7cb262
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libdiscid-0.6.3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Client library to create MusicBrainz enabled tagging applications
+EAPI=8
+HOMEPAGE=http://musicbrainz.org/doc/libdiscid
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-0.6.3.tar.gz
+_md5_=d1acc6ea9597e7a1e5e2956222bb7eb0
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2 b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
index b49f30521a85..5360efe6cc75 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
+++ b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883
 INHERIT=multilib-minimal
 IUSE=examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( LGPL-2.1 GPL-2 )
 RDEPEND=>=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(-)?]
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9d080127dd7b87569aad40637b76732f
+_md5_=39574c352accdf8e7c23e13ff4b69bcf
diff --git a/metadata/md5-cache/media-libs/libilbc-3.0.4 b/metadata/md5-cache/media-libs/libilbc-3.0.4
index 1db644e056b6..798a3d55740f 100644
--- a/metadata/md5-cache/media-libs/libilbc-3.0.4
+++ b/metadata/md5-cache/media-libs/libilbc-3.0.4
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/TimothyGu/libilbc
 INHERIT=cmake-multilib
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/TimothyGu/libilbc/releases/download/v3.0.4/libilbc-3.0.4.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9ab268e489587aad8a8b290977ba4cef
+_md5_=604dcfdbdaeda5b8e69c3ebf6a760c28
diff --git a/metadata/md5-cache/media-libs/libsixel-1.10.3 b/metadata/md5-cache/media-libs/libsixel-1.10.3
index 1d330bf853d0..cd56e87b3185 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.10.3
+++ b/metadata/md5-cache/media-libs/libsixel-1.10.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libsixel/libsixel
 INHERIT=bash-completion-r1 distutils-r1 meson
 IUSE=curl gd gtk jpeg png python test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=MIT public-domain
 RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsixel/libsixel/archive/v1.10.3.tar.gz -> libsixel-1.10.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6e708b5bf147a59eb55e0292e5d09c14
+_md5_=2f817be0e5cf5ccc49e873c89218647b
diff --git a/metadata/md5-cache/media-libs/libva-2.17.0 b/metadata/md5-cache/media-libs/libva-2.17.0
index 542eb8e5569c..6e4da188374b 100644
--- a/metadata/md5-cache/media-libs/libva-2.17.0
+++ b/metadata/md5-cache/media-libs/libva-2.17.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson-multilib optfeature
 IUSE=opengl 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 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.60[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? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=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(-)?] >=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/libXfixes-5.0.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-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=opengl? ( X )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/archive/2.17.0.tar.gz -> libva-2.17.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e6b30ef1627bacad273f0ae776c738a3
+_md5_=388889f41e3049f1083afd300335ba08
diff --git a/metadata/md5-cache/media-libs/ptex-2.4.2 b/metadata/md5-cache/media-libs/ptex-2.4.2
new file mode 100644
index 000000000000..fc8036942ffd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ptex-2.4.2
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/doxygen >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib
+DESCRIPTION=Per-Face Texture Mapping for Production Rendering
+EAPI=8
+HOMEPAGE=https://ptex.us/
+INHERIT=cmake
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/wdas/ptex/archive/refs/tags/v2.4.2.tar.gz -> ptex-2.4.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ab35c729ffa9a26788d4068eddbb423e
diff --git a/metadata/md5-cache/media-libs/zita-resampler-1.10.1 b/metadata/md5-cache/media-libs/zita-resampler-1.10.1
new file mode 100644
index 000000000000..5ee7cb961342
--- /dev/null
+++ b/metadata/md5-cache/media-libs/zita-resampler-1.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=tools? ( media-libs/libsndfile )
+DESCRIPTION=C++ library for real-time resampling of audio signals
+EAPI=8
+HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=cpu_flags_x86_sse2 tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=tools? ( media-libs/libsndfile )
+SLOT=0/1
+SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-resampler-1.10.1.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=05a4fe24a8e2908ddd0754fdd9dc7d24
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index aa4f1d011b95..d2dd4b72ed4f 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/hdx-realtime-media-engine-2.9.600.2900 b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.600.2900
new file mode 100644
index 000000000000..6a4fa5974e33
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.600.2900
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install nofetch setup unpack
+DESCRIPTION=HDX RealTime Media Engine plugin for Citrix Workspace App
+EAPI=8
+HOMEPAGE=https://www.citrix.com/
+INHERIT=unpacker
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=icaclient
+RDEPEND=sys-libs/llvm-libunwind || ( media-video/pipewire media-sound/pulseaudio media-sound/apulse ) !<net-misc/icaclient-22.12.0.12 x11-libs/libX11 x11-libs/libXv
+RESTRICT=fetch mirror strip
+SLOT=0
+SRC_URI=amd64? ( HDX_RealTime_Media_Engine_2.9.600_for_Linux_x64.zip ) x86? ( HDX_RealTime_Media_Engine_2.9.600_for_Linux.zip )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=244f784ffc80bf63d08b3869fd78f282
diff --git a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1 b/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
deleted file mode 100644
index eb4d439fdc29..000000000000
--- a/metadata/md5-cache/media-plugins/zam-plugins-3.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
-DESCRIPTION=Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing
-EAPI=8
-HOMEPAGE=https://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins
-IUSE=jack opengl
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=media-libs/ladspa-sdk media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 x11-libs/libX11 jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[X] x11-libs/cairo[X] )
-SLOT=0
-SRC_URI=https://github.com/zamaudio/zam-plugins/archive/refs/tags/3.14.tar.gz -> zam-plugins-3.14.tar.gz https://github.com/DISTRHO/DPF/archive/9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz -> DPF-9243625aacb9fb8dd9fe4bd479b227149eb37959.tar.gz
-_md5_=95d35472db39dfde4d801817c7a38dd4
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d108bf4b4a57..33823fbf6684 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/ardour-7.3 b/metadata/md5-cache/media-sound/ardour-7.3
index 830742b190fc..6d149e719351 100644
--- a/metadata/md5-cache/media-sound/ardour-7.3
+++ b/metadata/md5-cache/media-sound/ardour-7.3
@@ -12,4 +12,4 @@ RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-
 SLOT=7
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-7.3.0.tar.bz2
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5bc3c1d4d14cecfac07d9c5b9bd20527
+_md5_=695aa7d28979061406e245f763dc072e
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index 529a5c0d2084..de16c854abc1 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk2] media-libs/lv2
 SLOT=7
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5bc3c1d4d14cecfac07d9c5b9bd20527
+_md5_=695aa7d28979061406e245f763dc072e
diff --git a/metadata/md5-cache/media-sound/denemo-2.5.0-r1 b/metadata/md5-cache/media-sound/denemo-2.5.0-r1
deleted file mode 100644
index d6aa7c860120..000000000000
--- a/metadata/md5-cache/media-sound/denemo-2.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/gtk-doc-am-1.25-r1 >=dev-util/intltool-0.51.0-r1 >=sys-devel/flex-2.6.1 virtual/pkgconfig app-alternatives/yacc gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 ) nls? ( >=sys-devel/gettext-0.19.8.1 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-text/evince-3.22.1-r1:= dev-libs/libxml2:2 >=dev-scheme/guile-2:12= gnome-base/librsvg:2 media-libs/fontconfig:1.0 >=media-libs/libsmf-1.3 >=media-libs/libsndfile-1.0.28-r1 >=media-sound/lilypond-2.19.54 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= alsa? ( >=media-libs/alsa-lib-1.1.2 ) aubio? ( >=media-libs/aubio-0.4.1-r1:= ) fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre20140130 sci-libs/fftw:3.0= ) portmidi? ( >=media-libs/portmidi-217-r1 ) rubberband? ( >=media-libs/rubberband-1.8.1-r1 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A music notation editor
-EAPI=7
-HOMEPAGE=http://www.denemo.org/
-INHERIT=autotools font xdg
-IUSE=alsa +aubio debug jack +fluidsynth gtk-doc nls +portaudio +portmidi +rubberband test X
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ OFL-1.1
-RDEPEND=>=app-text/evince-3.22.1-r1:= dev-libs/libxml2:2 >=dev-scheme/guile-2:12= gnome-base/librsvg:2 media-libs/fontconfig:1.0 >=media-libs/libsmf-1.3 >=media-libs/libsndfile-1.0.28-r1 >=media-sound/lilypond-2.19.54 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0= alsa? ( >=media-libs/alsa-lib-1.1.2 ) aubio? ( >=media-libs/aubio-0.4.1-r1:= ) fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre20140130 sci-libs/fftw:3.0= ) portmidi? ( >=media-libs/portmidi-217-r1 ) rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/denemo/denemo-2.5.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	font	5e03cb70902daa9ff8967c61130f0f60	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a69d0ac16d93cd4f75ed47b73c760ca2
diff --git a/metadata/md5-cache/media-sound/easyeffects-7.0.0-r1 b/metadata/md5-cache/media-sound/easyeffects-7.0.0-r1
deleted file mode 100644
index f702547a7b39..000000000000
--- a/metadata/md5-cache/media-sound/easyeffects-7.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm pretend test
-DEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speex media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 media-libs/libsamplerate
-DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
-EAPI=8
-HOMEPAGE=https://github.com/wwmm/easyeffects
-INHERIT=gnome2-utils meson toolchain-funcs
-IUSE=calf +doc mda-lv2 zamaudio
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speex media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
-SLOT=0
-SRC_URI=https://github.com/wwmm/easyeffects/archive/v7.0.0.tar.gz -> easyeffects-7.0.0.tar.gz
-_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=660adf96baf8a4125c78b8f6626f9ae8
diff --git a/metadata/md5-cache/media-sound/easyeffects-7.0.1 b/metadata/md5-cache/media-sound/easyeffects-7.0.1
new file mode 100644
index 000000000000..5dfc375f44db
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easyeffects-7.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm pretend test
+DEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speex media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 media-libs/libsamplerate
+DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
+EAPI=8
+HOMEPAGE=https://github.com/wwmm/easyeffects
+INHERIT=gnome2-utils meson toolchain-funcs
+IUSE=calf +doc mda-lv2 zamaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speex media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
+SLOT=0
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v7.0.1.tar.gz -> easyeffects-7.0.1.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=11c0ea0e52b11b64c4cb40244363ec66
diff --git a/metadata/md5-cache/media-sound/flacon-10.0.0 b/metadata/md5-cache/media-sound/flacon-10.0.0
new file mode 100644
index 000000000000..f58246e9fa42
--- /dev/null
+++ b/metadata/md5-cache/media-sound/flacon-10.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/taglib dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 media-libs/flac media-sound/mac media-sound/shntool media-sound/ttaenc media-sound/wavpack )
+DESCRIPTION=Extracts audio tracks from an audio CD image to separate tracks
+EAPI=8
+HOMEPAGE=https://flacon.github.io/
+INHERIT=check-reqs cmake optfeature virtualx xdg-utils
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/taglib
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/flacon/flacon/archive/v10.0.0.tar.gz -> flacon-10.0.0.tar.gz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e6e27d770ecb00c95dbf4736753684db
diff --git a/metadata/md5-cache/media-sound/flacon-9.4.0 b/metadata/md5-cache/media-sound/flacon-9.4.0
index 60d63e789906..a8e2993a70d6 100644
--- a/metadata/md5-cache/media-sound/flacon-9.4.0
+++ b/metadata/md5-cache/media-sound/flacon-9.4.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v9.4.0.tar.gz -> flacon-9.4.0.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ed82f01650284142fbf84059007eeda
+_md5_=caef3114bfe4f2f6b03ac28bf3f15a86
diff --git a/metadata/md5-cache/media-sound/kid3-3.9.2-r1 b/metadata/md5-cache/media-sound/kid3-3.9.2-r1
deleted file mode 100644
index 67f70761450a..000000000000
--- a/metadata/md5-cache/media-sound/kid3-3.9.2-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-qt/linguist-tools:5 kde? ( kde-frameworks/extra-cmake-modules:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:= acoustid? ( media-libs/chromaprint:= media-video/ffmpeg:= ) flac? ( media-libs/flac:=[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Simple tag editor based on Qt
-EAPI=8
-HOMEPAGE=https://kid3.kde.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake kde.org python-any-r1 xdg
-IUSE=acoustid flac kde mp3 mp4 +mpris +taglib test vorbis
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:= acoustid? ( media-libs/chromaprint:= media-video/ffmpeg:= ) flac? ( media-libs/flac:=[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis )
-REQUIRED_USE=flac? ( vorbis )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/kid3/3.9.2/kid3-3.9.2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0d07018a585c6013ce3c7c8d0997d239
diff --git a/metadata/md5-cache/media-sound/lingot-1.0.1 b/metadata/md5-cache/media-sound/lingot-1.0.1
deleted file mode 100644
index 28e523dd2fa0..000000000000
--- a/metadata/md5-cache/media-sound/lingot-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
-DESCRIPTION=Accurate, easy to use, and highly configurable musical instrument tuner
-EAPI=7
-HOMEPAGE=https://www.nongnu.org/lingot/
-INHERIT=autotools
-IUSE=alsa +fftw jack pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/lingot/lingot-1.0.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=691c2baa4e80a43b0e2ec37abf60bf04
diff --git a/metadata/md5-cache/media-sound/linux-show-player-0.5.3-r1 b/metadata/md5-cache/media-sound/linux-show-player-0.5.3-r1
index 13bc0881587a..01d20e9739b0 100644
--- a/metadata/md5-cache/media-sound/linux-show-player-0.5.3-r1
+++ b/metadata/md5-cache/media-sound/linux-show-player-0.5.3-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] )
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DESCRIPTION=A cue player designed for stage productions
 EAPI=8
 HOMEPAGE=https://www.linux-show-player.org/ https://github.com/FrancescoCeruti/linux-show-player/
 INHERIT=distutils-r1
-IUSE=alsa jack midi pulseaudio timecode python_single_target_python3_9 python_single_target_python3_10
+IUSE=alsa jack midi pulseaudio timecode python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sortedcontainers[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sortedcontainers[python_targets_python3_10(-)] ) media-libs/gstreamer[introspection] alsa? ( media-libs/gst-plugins-base[alsa] ) jack? ( python_single_target_python3_9? ( dev-python/jack-client[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jack-client[python_targets_python3_10(-)] ) media-plugins/gst-plugins-jack ) midi? ( python_single_target_python3_9? ( dev-python/mido[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mido[python_targets_python3_10(-)] ) ) pulseaudio? ( media-plugins/gst-plugins-pulse ) timecode? ( app-misc/ola[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sortedcontainers[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-)] dev-python/sortedcontainers[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[python_targets_python3_11(-)] dev-python/sortedcontainers[python_targets_python3_11(-)] ) media-libs/gstreamer[introspection] alsa? ( media-libs/gst-plugins-base[alsa] ) jack? ( python_single_target_python3_9? ( dev-python/jack-client[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jack-client[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jack-client[python_targets_python3_11(-)] ) media-plugins/gst-plugins-jack ) midi? ( python_single_target_python3_9? ( dev-python/mido[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mido[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mido[python_targets_python3_11(-)] ) ) pulseaudio? ( media-plugins/gst-plugins-pulse ) timecode? ( app-misc/ola[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/FrancescoCeruti/linux-show-player/archive/refs/tags/v0.5.3.tar.gz -> linux-show-player-0.5.3.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4db223933ec4ea182c69fe69c1b7e806
+_md5_=4368269a9af1e2f1829f5cfc91e7190e
diff --git a/metadata/md5-cache/media-sound/ncspot-0.12.0 b/metadata/md5-cache/media-sound/ncspot-0.12.0
index e90d7dcdb40c..b6cbc60efa44 100644
--- a/metadata/md5-cache/media-sound/ncspot-0.12.0
+++ b/metadata/md5-cache/media-sound/ncspot-0.12.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/hrkfdn/ncspot
 INHERIT=cargo optfeature python-any-r1
 IUSE=clipboard cover mpris +notify debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD-2 Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016
 RDEPEND=dev-libs/openssl:= media-libs/libpulse sys-apps/dbus sys-libs/ncurses x11-libs/libxcb:= cover? ( media-gfx/ueberzug )
 SLOT=0
 SRC_URI=https://github.com/hrkfdn/ncspot/archive/refs/tags/v0.12.0.tar.gz -> ncspot-0.12.0.tar.gz https://crates.io/api/v1/crates/addr2line/0.19.0/download -> addr2line-0.19.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-ctr/0.6.0/download -> aes-ctr-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/ahash/0.8.2/download -> ahash-0.8.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/alsa/0.6.0/download -> alsa-0.6.0.crate https://crates.io/api/v1/crates/alsa-sys/0.3.1/download -> alsa-sys-0.3.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/async-trait/0.1.60/download -> async-trait-0.1.60.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.67/download -> backtrace-0.3.67.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bindgen/0.61.0/download -> bindgen-0.61.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/bytecount/0.6.3/download -> bytecount-0.6.3.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.3.0/download -> bytes-1.3.0.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cesu8/1.1.0/download -> cesu8-1.1.0.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.1/download -> chunked_transfer-1.4.1.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/clipboard/0.5.0/download -> clipboard-0.5.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/cookie/0.16.2/download -> cookie-0.16.2.crate https://crates.io/api/v1/crates/cookie_store/0.16.1/download -> cookie_store-0.16.1.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/coreaudio-rs/0.10.0/download -> coreaudio-rs-0.10.0.crate https://crates.io/api/v1/crates/coreaudio-sys/0.2.11/download -> coreaudio-sys-0.2.11.crate https://crates.io/api/v1/crates/cpal/0.13.5/download -> cpal-0.13.5.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/crypto-mac/0.11.1/download -> crypto-mac-0.11.1.crate https://crates.io/api/v1/crates/ctr/0.6.0/download -> ctr-0.6.0.crate https://crates.io/api/v1/crates/cursive/0.20.0/download -> cursive-0.20.0.crate https://crates.io/api/v1/crates/cursive_buffered_backend/0.6.1/download -> cursive_buffered_backend-0.6.1.crate https://crates.io/api/v1/crates/cursive_core/0.3.6/download -> cursive_core-0.3.6.crate https://crates.io/api/v1/crates/cxx/1.0.85/download -> cxx-1.0.85.crate https://crates.io/api/v1/crates/cxx-build/1.0.85/download -> cxx-build-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.85/download -> cxxbridge-flags-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.85/download -> cxxbridge-macro-1.0.85.crate https://crates.io/api/v1/crates/darling/0.13.4/download -> darling-0.13.4.crate https://crates.io/api/v1/crates/darling/0.14.2/download -> darling-0.14.2.crate https://crates.io/api/v1/crates/darling_core/0.13.4/download -> darling_core-0.13.4.crate https://crates.io/api/v1/crates/darling_core/0.14.2/download -> darling_core-0.14.2.crate https://crates.io/api/v1/crates/darling_macro/0.13.4/download -> darling_macro-0.13.4.crate https://crates.io/api/v1/crates/darling_macro/0.14.2/download -> darling_macro-0.14.2.crate https://crates.io/api/v1/crates/dbus/0.9.6/download -> dbus-0.9.6.crate https://crates.io/api/v1/crates/dbus-tree/0.9.2/download -> dbus-tree-0.9.2.crate https://crates.io/api/v1/crates/derive-new/0.5.9/download -> derive-new-0.5.9.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs-next/1.0.2/download -> dirs-next-1.0.2.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enum-map/2.4.2/download -> enum-map-2.4.2.crate https://crates.io/api/v1/crates/enum-map-derive/0.11.0/download -> enum-map-derive-0.11.0.crate https://crates.io/api/v1/crates/enum_dispatch/0.3.8/download -> enum_dispatch-0.3.8.crate https://crates.io/api/v1/crates/enumset/1.0.12/download -> enumset-1.0.12.crate https://crates.io/api/v1/crates/enumset_derive/0.6.1/download -> enumset_derive-0.6.1.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fern/0.6.1/download -> fern-0.6.1.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gimli/0.27.0/download -> gimli-0.27.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.15/download -> h2-0.3.15.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/headers/0.3.8/download -> headers-0.3.8.crate https://crates.io/api/v1/crates/headers-core/0.2.0/download -> headers-core-0.2.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/hyper/0.14.23/download -> hyper-0.14.23.crate https://crates.io/api/v1/crates/hyper-proxy/0.9.1/download -> hyper-proxy-0.9.1.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.3/download -> io-lifetimes-1.0.3.crate https://crates.io/api/v1/crates/ioctl-rs/0.2.0/download -> ioctl-rs-0.2.0.crate https://crates.io/api/v1/crates/ipnet/2.7.0/download -> ipnet-2.7.0.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/jni/0.19.0/download -> jni-0.19.0.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.25/download -> jobserver-0.1.25.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lewton/0.10.2/download -> lewton-0.10.2.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libdbus-sys/0.2.2/download -> libdbus-sys-0.2.2.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/libm/0.2.6/download -> libm-0.2.6.crate https://crates.io/api/v1/crates/libpulse-binding/2.26.0/download -> libpulse-binding-2.26.0.crate https://crates.io/api/v1/crates/libpulse-simple-binding/2.25.0/download -> libpulse-simple-binding-2.25.0.crate https://crates.io/api/v1/crates/libpulse-simple-sys/1.19.2/download -> libpulse-simple-sys-1.19.2.crate https://crates.io/api/v1/crates/libpulse-sys/1.19.3/download -> libpulse-sys-1.19.3.crate https://crates.io/api/v1/crates/librespot-audio/0.4.2/download -> librespot-audio-0.4.2.crate https://crates.io/api/v1/crates/librespot-core/0.4.2/download -> librespot-core-0.4.2.crate https://crates.io/api/v1/crates/librespot-metadata/0.4.2/download -> librespot-metadata-0.4.2.crate https://crates.io/api/v1/crates/librespot-playback/0.4.2/download -> librespot-playback-0.4.2.crate https://crates.io/api/v1/crates/librespot-protocol/0.4.2/download -> librespot-protocol-0.4.2.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/mac-notification-sys/0.5.6/download -> mac-notification-sys-0.5.6.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/maybe-async/0.2.6/download -> maybe-async-0.2.6.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/ncurses/5.101.0/download -> ncurses-5.101.0.crate https://crates.io/api/v1/crates/ndk/0.6.0/download -> ndk-0.6.0.crate https://crates.io/api/v1/crates/ndk-context/0.1.1/download -> ndk-context-0.1.1.crate https://crates.io/api/v1/crates/ndk-glue/0.6.2/download -> ndk-glue-0.6.2.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.3.0/download -> ndk-sys-0.3.0.crate https://crates.io/api/v1/crates/nix/0.23.2/download -> nix-0.23.2.crate https://crates.io/api/v1/crates/nix/0.24.3/download -> nix-0.24.3.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/notify-rust/4.6.0/download -> notify-rust-4.6.0.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/num_enum/0.5.7/download -> num_enum-0.5.7.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.7/download -> num_enum_derive-0.5.7.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.30.0/download -> object-0.30.0.crate https://crates.io/api/v1/crates/oboe/0.4.6/download -> oboe-0.4.6.crate https://crates.io/api/v1/crates/oboe-sys/0.4.5/download -> oboe-sys-0.4.5.crate https://crates.io/api/v1/crates/ogg/0.8.0/download -> ogg-0.8.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.45/download -> openssl-0.10.45.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.80/download -> openssl-sys-0.9.80.crate https://crates.io/api/v1/crates/os_pipe/1.1.2/download -> os_pipe-1.1.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/owning_ref/0.4.1/download -> owning_ref-0.4.1.crate https://crates.io/api/v1/crates/pancurses/0.17.0/download -> pancurses-0.17.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.5/download -> parking_lot_core-0.9.5.crate https://crates.io/api/v1/crates/parse_duration/2.1.1/download -> parse_duration-2.1.1.crate https://crates.io/api/v1/crates/pbkdf2/0.8.0/download -> pbkdf2-0.8.0.crate https://crates.io/api/v1/crates/pdcurses-sys/0.7.1/download -> pdcurses-sys-0.7.1.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/platform-dirs/0.3.0/download -> platform-dirs-0.3.0.crate https://crates.io/api/v1/crates/portaudio-rs/0.3.2/download -> portaudio-rs-0.3.2.crate https://crates.io/api/v1/crates/portaudio-sys/0.1.1/download -> portaudio-sys-0.1.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/priority-queue/1.3.0/download -> priority-queue-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/protobuf/2.28.0/download -> protobuf-2.28.0.crate https://crates.io/api/v1/crates/protobuf-codegen/2.28.0/download -> protobuf-codegen-2.28.0.crate https://crates.io/api/v1/crates/protobuf-codegen-pure/2.28.0/download -> protobuf-codegen-pure-2.28.0.crate https://crates.io/api/v1/crates/psl-types/2.0.11/download -> psl-types-2.0.11.crate https://crates.io/api/v1/crates/publicsuffix/2.2.3/download -> publicsuffix-2.2.3.crate https://crates.io/api/v1/crates/quick-xml/0.23.1/download -> quick-xml-0.23.1.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.0/download -> regex-1.7.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.13/download -> reqwest-0.11.13.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rodio/0.15.0/download -> rodio-0.15.0.crate https://crates.io/api/v1/crates/rspotify/0.11.6/download -> rspotify-0.11.6.crate https://crates.io/api/v1/crates/rspotify-http/0.11.6/download -> rspotify-http-0.11.6.crate https://crates.io/api/v1/crates/rspotify-macros/0.11.6/download -> rspotify-macros-0.11.6.crate https://crates.io/api/v1/crates/rspotify-model/0.11.6/download -> rspotify-model-0.11.6.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.6/download -> rustix-0.36.6.crate https://crates.io/api/v1/crates/rustls/0.20.7/download -> rustls-0.20.7.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/security-framework/2.7.0/download -> security-framework-2.7.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_cbor/0.11.2/download -> serde_cbor-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.91/download -> serde_json-1.0.91.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha-1/0.9.8/download -> sha-1-0.9.8.crate https://crates.io/api/v1/crates/sha1/0.10.5/download -> sha1-0.10.5.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/shannon/0.2.0/download -> shannon-0.2.0.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.22.0/download -> strum-0.22.0.crate https://crates.io/api/v1/crates/strum/0.24.1/download -> strum-0.24.1.crate https://crates.io/api/v1/crates/strum_macros/0.22.0/download -> strum_macros-0.22.0.crate https://crates.io/api/v1/crates/strum_macros/0.24.3/download -> strum_macros-0.24.3.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/tauri-winrt-notification/0.1.0/download -> tauri-winrt-notification-0.1.0.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread-id/4.0.0/download -> thread-id-4.0.0.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/time/0.3.17/download -> time-0.3.17.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.6/download -> time-macros-0.2.6.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.23.0/download -> tokio-1.23.0.crate https://crates.io/api/v1/crates/tokio-macros/1.8.2/download -> tokio-macros-1.8.2.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-stream/0.1.11/download -> tokio-stream-0.1.11.crate https://crates.io/api/v1/crates/tokio-util/0.7.4/download -> tokio-util-0.7.4.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tree_magic_mini/3.0.3/download -> tree_magic_mini-3.0.3.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.0/download -> unicode-segmentation-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.5.0/download -> ureq-2.5.0.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.2.2/download -> uuid-1.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vergen/3.2.0/download -> vergen-3.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.33/download -> wasm-bindgen-futures-0.4.33.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/wayland-client/0.29.5/download -> wayland-client-0.29.5.crate https://crates.io/api/v1/crates/wayland-commons/0.29.5/download -> wayland-commons-0.29.5.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.5/download -> wayland-protocols-0.29.5.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.5/download -> wayland-scanner-0.29.5.crate https://crates.io/api/v1/crates/wayland-sys/0.29.5/download -> wayland-sys-0.29.5.crate https://crates.io/api/v1/crates/web-sys/0.3.60/download -> web-sys-0.3.60.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.39.0/download -> windows-0.39.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.39.0/download -> windows_aarch64_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.39.0/download -> windows_i686_gnu-0.39.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.39.0/download -> windows_i686_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.39.0/download -> windows_x86_64_gnu-0.39.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.39.0/download -> windows_x86_64_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/winreg/0.5.1/download -> winreg-0.5.1.crate https://crates.io/api/v1/crates/wl-clipboard-rs/0.7.0/download -> wl-clipboard-rs-0.7.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.3.3/download -> x11-clipboard-0.3.3.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xi-unicode/0.3.0/download -> xi-unicode-0.3.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/zerocopy/0.6.1/download -> zerocopy-0.6.1.crate https://crates.io/api/v1/crates/zerocopy-derive/0.3.2/download -> zerocopy-derive-0.3.2.crate
 _eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=73415f5e25316619074027c9973de9b8
+_md5_=805bf39675c7b178152af81c64852ef4
diff --git a/metadata/md5-cache/media-sound/nickvision-tagger-2022.11.2 b/metadata/md5-cache/media-sound/nickvision-tagger-2022.11.2
index e621d7bb3500..055b73cc2f1b 100644
--- a/metadata/md5-cache/media-sound/nickvision-tagger-2022.11.2
+++ b/metadata/md5-cache/media-sound/nickvision-tagger-2022.11.2
@@ -12,4 +12,4 @@ RDEPEND=dev-cpp/curlpp:= dev-libs/jsoncpp:= gui-libs/gtk:4 gui-libs/libadwaita:=
 SLOT=0
 SRC_URI=https://github.com/nlogozzo/NickvisionTagger/archive/2022.11.2.tar.gz -> nickvision-tagger-2022.11.2.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3c41be997a94e348f15817291507f49a
+_md5_=ee5909283fc7ce3c851ca3595ec274bc
diff --git a/metadata/md5-cache/media-sound/rescrobbled-0.7.0 b/metadata/md5-cache/media-sound/rescrobbled-0.7.0
index 5761fd85463a..e59bae5e73b3 100644
--- a/metadata/md5-cache/media-sound/rescrobbled-0.7.0
+++ b/metadata/md5-cache/media-sound/rescrobbled-0.7.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/InputUsername/rescrobbled
 INHERIT=cargo systemd
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3 Apache-2.0 BSD MIT MPL-2.0 Unicode-DFS-2016
 RDEPEND=dev-libs/openssl:= sys-apps/dbus
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/InputUsername/rescrobbled/archive/refs/tags/v0.7.0.tar.gz -> rescrobbled-0.7.0.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/anyhow/1.0.58/download -> anyhow-1.0.58.crate https://crates.io/api/v1/crates/attohttpc/0.24.0/download -> attohttpc-0.24.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bytes/1.2.0/download -> bytes-1.2.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/darling/0.13.4/download -> darling-0.13.4.crate https://crates.io/api/v1/crates/darling_core/0.13.4/download -> darling_core-0.13.4.crate https://crates.io/api/v1/crates/darling_macro/0.13.4/download -> darling_macro-0.13.4.crate https://crates.io/api/v1/crates/dbus/0.9.6/download -> dbus-0.9.6.crate https://crates.io/api/v1/crates/derive_is_enum_variant/0.1.1/download -> derive_is_enum_variant-0.1.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/enum-kinds/0.5.1/download -> enum-kinds-0.5.1.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/from_variants/1.0.0/download -> from_variants-1.0.0.crate https://crates.io/api/v1/crates/from_variants_impl/1.0.0/download -> from_variants_impl-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libdbus-sys/0.2.2/download -> libdbus-sys-0.2.2.crate https://crates.io/api/v1/crates/listenbrainz/0.5.0/download -> listenbrainz-0.5.0.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md5/0.7.0/download -> md5-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/mpris/2.0.0/download -> mpris-2.0.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/once_cell/1.13.0/download -> once_cell-1.13.0.crate https://crates.io/api/v1/crates/openssl/0.10.41/download -> openssl-0.10.41.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.75/download -> openssl-sys-0.9.75.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/proc-macro2/1.0.40/download -> proc-macro2-1.0.40.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpassword/6.0.1/download -> rpassword-6.0.1.crate https://crates.io/api/v1/crates/rustfm-scrobble-proxy/1.1.3/download -> rustfm-scrobble-proxy-1.1.3.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/serde/1.0.147/download -> serde-1.0.147.crate https://crates.io/api/v1/crates/serde_derive/1.0.147/download -> serde_derive-1.0.147.crate https://crates.io/api/v1/crates/serde_json/1.0.87/download -> serde_json-1.0.87.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.2/download -> unicode-ident-1.0.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/wrapped-vec/0.3.0/download -> wrapped-vec-0.3.0.crate
 _eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9edb18c35663754d1ddac66166d4192d
+_md5_=a778d964410ecbeacde5ceff1571c1b4
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 0b85464b65c9..bd08184807a8 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.30.2.6563 b/metadata/md5-cache/media-tv/plex-media-server-1.30.2.6563
index 96ebfd4a060a..853d01824582 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.30.2.6563
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.30.2.6563
@@ -5,11 +5,11 @@ DESCRIPTION=Free media library that is intended for use with a plex client
 EAPI=8
 HOMEPAGE=https://www.plex.tv/
 INHERIT=readme.gentoo-r1 systemd unpacker
-KEYWORDS=-* ~amd64 ~arm64 ~x86
+KEYWORDS=-* amd64 ~arm64 ~x86
 LICENSE=Plex
 RDEPEND=acct-group/plex acct-user/plex
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.30.2.6563-3d4dc0cce/debian/plexmediaserver_1.30.2.6563-3d4dc0cce_amd64.deb ) arm64? ( https://downloads.plex.tv/plex-media-server-new/1.30.2.6563-3d4dc0cce/debian/plexmediaserver_1.30.2.6563-3d4dc0cce_arm64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.30.2.6563-3d4dc0cce/debian/plexmediaserver_1.30.2.6563-3d4dc0cce_i386.deb )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=6cc895ea6d76dc738078c13aea441aaa
+_md5_=6b4c8da1458a879629a089fcfd61ded8
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9d88ce5c4741..71c261c8d42b 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/mplayer-1.5_p20230215 b/metadata/md5-cache/media-video/mplayer-1.5_p20230215
index 0aa4028178bb..75257dd01c85 100644
--- a/metadata/md5-cache/media-video/mplayer-1.5_p20230215
+++ b/metadata/md5-cache/media-video/mplayer-1.5_p20230215
@@ -6,6 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.mplayerhq.hu/
 INHERIT=edo toolchain-funcs flag-o-matic
 IUSE=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 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec a52 aalib +alsa aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran video_cards_mga
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
@@ -13,4 +14,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/media-video/mplayer/mplayer-1.5_p20230215.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fbe47dc1a664647a3131ee8c75a489c4
+_md5_=c9bde1121083b81fc28886a47ac25022
diff --git a/metadata/md5-cache/media-video/mpv-0.35.1 b/metadata/md5-cache/media-video/mpv-0.35.1
index 483b3a37b43d..126d4ce78e45 100644
--- a/metadata/md5-cache/media-video/mpv-0.35.1
+++ b/metadata/md5-cache/media-video/mpv-0.35.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://mpv.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=edo flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
 IUSE=+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet vaapi vdpau vulkan wayland +xv zimg zlib lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=LGPL-2.1+ GPL-2+ BSD ISC MIT
 RDEPEND=media-libs/libass:=[fontconfig] media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) libplacebo? ( >=media-libs/libplacebo-4.202:=[opengl?,vulkan?] egl? ( media-libs/libplacebo[opengl] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( || ( media-libs/raspberrypi-userland-bin media-libs/raspberrypi-userland ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( cli libmpv ) egl? ( || ( X drm wayland ) ) libplacebo? ( || ( egl opengl vulkan ) ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) nvenc? ( || ( egl opengl vulkan ) ) opengl? ( || ( X aqua ) ) test? ( cli ) tools? ( cli ) uchardet? ( iconv ) vaapi? ( || ( X egl libplacebo wayland ) wayland? ( drm ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) libplacebo ) xv? ( X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.35.1.tar.gz -> mpv-0.35.1.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cdf500206cf14a65c219f439425a3b2d
+_md5_=bc51e078567c93343b0cc6aaf45a676a
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index c0c96cba6fc8..0f89e5503195 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ca2a5742e3c2e1a1de9f3a69f789c254
+_md5_=beaa08c94705e3f14f19a1609da8914a
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.63-r3 b/metadata/md5-cache/media-video/pipewire-0.3.63-r3
index c451f144e0a6..436a2127f4b7 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.63-r3
+++ b/metadata/md5-cache/media-video/pipewire-0.3.63-r3
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.63/pipewire-0.3.63.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b15a1e16cf0f0a73a9d45cfa43310159
+_md5_=9fd17bdfa115d642aac62c55dd6e216b
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.64-r2 b/metadata/md5-cache/media-video/pipewire-0.3.64-r2
index cce57da52e6d..fe8d86881046 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.64-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.64-r2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.64/pipewire-0.3.64.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=81bf6fb6f7082b54b95747dcfa05e541
+_md5_=5037abce086a99abea3175d9867f0c15
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.65-r3 b/metadata/md5-cache/media-video/pipewire-0.3.65-r3
index d0eddef918ea..e47cdd4be905 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.65-r3
+++ b/metadata/md5-cache/media-video/pipewire-0.3.65-r3
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.65/pipewire-0.3.65.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=227312d269f2f71a1222051d3aa8cfaf
+_md5_=a954aacbfa9616efe4cf5e0a2ce17a68
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.66-r1 b/metadata/md5-cache/media-video/pipewire-0.3.66-r1
index ca589fde1e5d..e6e03a87acbf 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.66-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.66-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.66/pipewire-0.3.66.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=a1ba54e4fa9ecd3b321dd1fd5d4b47d6
+_md5_=6cf70b0837de26bb0845e8d73ea752ee
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 33d29e82a4c0..6f2ef1ee2385 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) mo
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=a1ba54e4fa9ecd3b321dd1fd5d4b47d6
+_md5_=6cf70b0837de26bb0845e8d73ea752ee
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6cd41a145d01..295d3e836dc9 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/fail2ban-1.0.2-r1 b/metadata/md5-cache/net-analyzer/fail2ban-1.0.2-r1
index c488c8cbd914..c13e6ed06666 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-1.0.2-r1
+++ b/metadata/md5-cache/net-analyzer/fail2ban-1.0.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.fail2ban.org/
 INHERIT=bash-completion-r1 distutils-r1 systemd tmpfiles
 IUSE=selinux systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_9? ( || ( dev-python/python-systemd[python_targets_python3_9(-)] sys-apps/systemd[python(-),python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( || ( dev-python/python-systemd[python_targets_python3_10(-)] sys-apps/systemd[python(-),python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( || ( dev-python/python-systemd[python_targets_python3_11(-)] sys-apps/systemd[python(-),python_targets_python3_11(-)] ) ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/1.0.2.tar.gz -> fail2ban-1.0.2.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=492da03b872cf85964c99fc2fe810228
+_md5_=fe96c7e8c6d62b06a76140b91ad4d210
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-9999 b/metadata/md5-cache/net-analyzer/fail2ban-9999
index bef1e997e83b..1b6d930619a7 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-9999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -11,4 +11,4 @@ RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) syst
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=988774b110565bcdd0c191521fc760ea
+_md5_=66b18d0e038f9554a5ea4a2e9454c0b8
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.35.1 b/metadata/md5-cache/net-analyzer/netdata-1.35.1
deleted file mode 100644
index 1fcfb2cab8a3..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.35.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) 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_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=8
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10
-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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) 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_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/releases/download/v1.35.1/netdata-v1.35.1.tar.gz -> netdata-1.35.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a1a64fdddea39590dd8431b0f63b9a26
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.36.0 b/metadata/md5-cache/net-analyzer/netdata-1.36.0
deleted file mode 100644
index c2087ff87741..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.36.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) 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_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=8
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10
-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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) 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_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/releases/download/v1.36.0/netdata-v1.36.0.tar.gz -> netdata-1.36.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a1a64fdddea39590dd8431b0f63b9a26
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
deleted file mode 100644
index afb7d598c9e1..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=8
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64 ~riscv ~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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/releases/download/v1.36.1/netdata-v1.36.1.tar.gz -> netdata-1.36.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=14746af475a53d174b79bd9615f08f42
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.37.0 b/metadata/md5-cache/net-analyzer/netdata-1.37.0
deleted file mode 100644
index 35f84b65fce5..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.37.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=8
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64 ~riscv ~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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/releases/download/v1.37.0/netdata-v1.37.0.tar.gz -> netdata-1.37.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=14746af475a53d174b79bd9615f08f42
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.37.1 b/metadata/md5-cache/net-analyzer/netdata-1.37.1
deleted file mode 100644
index e0d480383627..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.37.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=8
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64 ~riscv ~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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/releases/download/v1.37.1/netdata-v1.37.1.tar.gz -> netdata-1.37.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=14746af475a53d174b79bd9615f08f42
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.38.0 b/metadata/md5-cache/net-analyzer/netdata-1.38.0
index d42644afe14f..7a2fd492b920 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.38.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.38.0
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mysqlclient[python_targets_python3_11(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-libs/stem[python_targets_python3_11(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~ppc64 ~riscv ~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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
+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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mysqlclient[python_targets_python3_11(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-libs/stem[python_targets_python3_11(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.38.0/netdata-v1.38.0.tar.gz -> netdata-1.38.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=14746af475a53d174b79bd9615f08f42
+_md5_=6b2c3ed6aaab6e55bb2606ff8a1c9bec
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 9ff7047e2fb2..00fcd1baccbf 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mysqlclient[python_targets_python3_11(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-libs/stem[python_targets_python3_11(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs git-r3
-IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-3+ MIT BSD
 PROPERTIES=live
-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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
+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 app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) mysql? ( python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mysqlclient[python_targets_python3_11(-)] ) ) postgres? ( python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) tor? ( python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-libs/stem[python_targets_python3_11(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) tor? ( python )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=090671afb2ba5b5a0867a06546c4f742
+_md5_=cffd45255d724cd0bcf5a6c7a3c6214e
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.10 b/metadata/md5-cache/net-analyzer/suricata-6.0.10
index bc693ca40dd6..d5c9f2c44232 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.10
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.10
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.10.tar.gz verify-sig? ( https://www.openinfosecfoundation.org/download/suricata-6.0.10.tar.gz.sig )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=0d16a06418ad0f002fa3a1b65c680bd1
+_md5_=8575f6e28f2eb77145b9718bd22e3b1b
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.29 b/metadata/md5-cache/net-analyzer/zabbix-5.0.29
deleted file mode 100644
index 7ff5df24934f..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.29
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/5.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.29.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.29-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=956ef8bb3ec53a40bc7b1f67973718cb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.30 b/metadata/md5-cache/net-analyzer/zabbix-5.0.30
index 4f400aa92fe8..9f1b704e5a88 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.30
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.30
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.30.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.30-go-deps.tar.xz )
 _eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=9358d93f2ea57f361f72233a92a98233
+_md5_=298122298ca64ce54e030cd444d5a26d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.10 b/metadata/md5-cache/net-analyzer/zabbix-6.0.10
deleted file mode 100644
index 48f5b0a35e6c..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.10.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.10-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=cb48f916e3859b09c67240213b520a16
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.11 b/metadata/md5-cache/net-analyzer/zabbix-6.0.11
deleted file mode 100644
index a38c0149beca..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.11
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.11.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.11-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=545121c5cefa9980aa4c7c857affb421
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.12 b/metadata/md5-cache/net-analyzer/zabbix-6.0.12
index 885b581078a2..5f0a358baa3e 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.12
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.12
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.12.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.12-go-deps.tar.xz )
 _eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=8ebbf39f97bd04c1cd9a0774eea08891
+_md5_=db11d917da5f7f812530bd5a6ad31dd6
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.4 b/metadata/md5-cache/net-analyzer/zabbix-6.2.4
deleted file mode 100644
index bc31c78bb45c..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.2.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.2
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.4.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.4-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=cb48f916e3859b09c67240213b520a16
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.5 b/metadata/md5-cache/net-analyzer/zabbix-6.2.5
deleted file mode 100644
index 846feb2f287a..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.2.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.2
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.5.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.5-go-deps.tar.xz )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=545121c5cefa9980aa4c7c857affb421
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.6 b/metadata/md5-cache/net-analyzer/zabbix-6.2.6
index 6e65dbe949a6..2485534fc6dc 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.2.6
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.2.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.2
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.6.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.6-go-deps.tar.xz )
 _eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=8ebbf39f97bd04c1cd9a0774eea08891
+_md5_=db11d917da5f7f812530bd5a6ad31dd6
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 2e6f9e2b7e25..75dca06c30c9 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/freeradius-3.0.26 b/metadata/md5-cache/net-dialup/freeradius-3.0.26
new file mode 100644
index 000000000000..125801b09f81
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.26
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=7
+HOMEPAGE=https://freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test firebird? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/FreeRADIUS/freeradius-server/archive/release_3_0_26.tar.gz -> freeradius-3.0.26.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=abb76326388851961671fc23753b7cff
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.1 b/metadata/md5-cache/net-dialup/freeradius-3.2.1
new file mode 100644
index 000000000000..0c86be64f1ea
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.2.1
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=8
+HOMEPAGE=https://freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=firebird? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_1/freeradius-server-3.2.1.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=870293cc160b353f7ac95c1f2c0c3e0e
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.2 b/metadata/md5-cache/net-dialup/freeradius-3.2.2
new file mode 100644
index 000000000000..05dfb0dada81
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/freeradius-3.2.2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install preinst prepare setup
+DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap net-misc/curl sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Highly configurable free RADIUS server
+EAPI=8
+HOMEPAGE=https://freeradius.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap net-misc/curl sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=firebird? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_2/freeradius-server-3.2.2.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d52aaa6ebab710fedcf142a6b6595550
diff --git a/metadata/md5-cache/net-dialup/minicom-2.8-r1 b/metadata/md5-cache/net-dialup/minicom-2.8-r1
index 4b3e95938521..ead4876c7fcd 100644
--- a/metadata/md5-cache/net-dialup/minicom-2.8-r1
+++ b/metadata/md5-cache/net-dialup/minicom-2.8-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://salsa.debian.org/minicom-team/minicom
 INHERIT=autotools
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= net-dialup/lrzsz
 SLOT=0
 SRC_URI=https://salsa.debian.org/minicom-team/minicom/-/archive/2.8/minicom-2.8.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=29e7a45e76d2d666aaf005b74eab8234
+_md5_=ed72651fb51f92a576ae3c22a97313e0
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5690c7f4e498..e9cb4b6e3322 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/bind-9.16.37 b/metadata/md5-cache/net-dns/bind-9.16.37
index 46ad665f850e..0fb249b72ed2 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.37
+++ b/metadata/md5-cache/net-dns/bind-9.16.37
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
 INHERIT=python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles
 IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.37/bind-9.16.37.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f861fd5ee337c000e590147d66ee6d9d
+_md5_=9fdcf27f259f26e8451c0aa522dca238
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.37-r1 b/metadata/md5-cache/net-dns/bind-tools-9.16.37-r1
index 09969ab5eca8..b8899518096f 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.37-r1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.37-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
 INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
 IUSE=+caps doc gssapi idn libedit readline test xml
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=>=dev-libs/libuv-1.42.0:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.37/bind-9.16.37.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5b13477037d780801119c56ec8de91e6
+_md5_=6145b91ac51812c4e582fc8e86f95b79
diff --git a/metadata/md5-cache/net-dns/knot-resolver-5.5.3 b/metadata/md5-cache/net-dns/knot-resolver-5.5.3
deleted file mode 100644
index 4ed239a52fb3..000000000000
--- a/metadata/md5-cache/net-dns/knot-resolver-5.5.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-knot-resolver ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) acct-group/knot-resolver acct-user/knot-resolver dev-db/lmdb:= dev-libs/libuv:= net-dns/knot:= net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) kresc? ( dev-libs/libedit ) nghttp2? ( net-libs/nghttp2:= ) systemd? ( sys-apps/systemd:= ) test? ( dev-util/cmocka )
-DESCRIPTION=A scaleable caching DNS resolver
-EAPI=8
-HOMEPAGE=https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver
-INHERIT=lua-single meson tmpfiles verify-sig
-IUSE=caps dnstap kresc nghttp2 systemd test +lua_single_target_luajit verify-sig
-KEYWORDS=amd64
-LICENSE=Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) acct-group/knot-resolver acct-user/knot-resolver dev-db/lmdb:= dev-libs/libuv:= net-dns/knot:= net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) kresc? ( dev-libs/libedit ) nghttp2? ( net-libs/nghttp2:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
-REQUIRED_USE=^^ ( lua_single_target_luajit )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://secure.nic.cz/files/knot-resolver/knot-resolver-5.5.3.tar.xz verify-sig? ( https://secure.nic.cz/files/knot-resolver/knot-resolver-5.5.3.tar.xz.asc )
-_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=e4521eed6dcbd38c34200e21861fec6a
diff --git a/metadata/md5-cache/net-dns/knot-resolver-5.6.0 b/metadata/md5-cache/net-dns/knot-resolver-5.6.0
index c64fd667f96e..b39b4e03ca17 100644
--- a/metadata/md5-cache/net-dns/knot-resolver-5.6.0
+++ b/metadata/md5-cache/net-dns/knot-resolver-5.6.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver
 INHERIT=lua-single meson tmpfiles verify-sig
 IUSE=caps dnstap kresc nghttp2 systemd test +lua_single_target_luajit verify-sig
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) acct-group/knot-resolver acct-user/knot-resolver dev-db/lmdb:= dev-libs/libuv:= net-dns/knot:= net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) kresc? ( dev-libs/libedit ) nghttp2? ( net-libs/nghttp2:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( lua_single_target_luajit )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/knot-resolver/knot-resolver-5.6.0.tar.xz verify-sig? ( https://secure.nic.cz/files/knot-resolver/knot-resolver-5.6.0.tar.xz.asc )
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c0a6e921871cb2f4c42429438b1c1d85
+_md5_=464ce056dc8a245de9e2cecc84d2e948
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.8 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.8
index 5b07043fd5e2..6b82e79f45de 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.8
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.8
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cwrap.org/resolv_wrapper.html
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.8.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b9ceb8ee9dcf6c7c221f812c923c39eb
+_md5_=9e0c73e5730211cc1867c62a15e338eb
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 183257bb5193..b06a8c4ae9e7 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/samba-4.15.13 b/metadata/md5-cache/net-fs/samba-4.15.13
index 0f12c167af75..2abbc73e4bfc 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.13
+++ b/metadata/md5-cache/net-fs/samba-4.15.13
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://samba.org/
 INHERIT=python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.4:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) addc? ( python json !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.15.13.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3e38d95369e2c5896b6fa18f605c3919
+_md5_=11897400fb8138c036f2ed81b3d49755
diff --git a/metadata/md5-cache/net-fs/samba-4.16.8 b/metadata/md5-cache/net-fs/samba-4.16.8
index f8187ba71cea..d75f8607e406 100644
--- a/metadata/md5-cache/net-fs/samba-4.16.8
+++ b/metadata/md5-cache/net-fs/samba-4.16.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://samba.org/
 INHERIT=python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
 IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.5.2:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.6.0:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) addc? ( json python !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.16.8.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=00dfa90199a4f02e297c528dc8b23a6e
+_md5_=c8939c361b07b4b8d8385884da87da77
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index e38851fe8d15..cb9a3d67c8f8 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.8 b/metadata/md5-cache/net-ftp/proftpd-1.3.8
index 9cde5138e039..fcf5c2803fad 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.8
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
 INHERIT=multilib systemd tmpfiles toolchain-funcs
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
 REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ab859e8af7165287ac077a7d09a3deac
+_md5_=c778c0ad6963332fb6162f070f17c9b5
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 3197ec01611c..f52fb82b86a0 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/element-desktop-bin-1.11.22 b/metadata/md5-cache/net-im/element-desktop-bin-1.11.22
deleted file mode 100644
index 8db021726c88..000000000000
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.11.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
-EAPI=8
-HOMEPAGE=https://element.io
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=optfeature unpacker xdg
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-db/sqlcipher dev-libs/expat dev-libs/glib:2 dev-libs/nettle dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.22_amd64.deb
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3b016ac973b1bf5ad05126dbfc466d59
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.11.23 b/metadata/md5-cache/net-im/element-desktop-bin-1.11.23
new file mode 100644
index 000000000000..9f0ce93d7e41
--- /dev/null
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.11.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
+EAPI=8
+HOMEPAGE=https://element.io
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=optfeature unpacker xdg
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-db/sqlcipher dev-libs/expat dev-libs/glib:2 dev-libs/nettle dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.23_amd64.deb
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3b016ac973b1bf5ad05126dbfc466d59
diff --git a/metadata/md5-cache/net-im/poezio-0.14 b/metadata/md5-cache/net-im/poezio-0.14
index f0bc177c7a44..0a0f2281cdd9 100644
--- a/metadata/md5-cache/net-im/poezio-0.14
+++ b/metadata/md5-cache/net-im/poezio-0.14
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DESCRIPTION=Console XMPP client that looks like most famous IRC clients
 EAPI=8
 HOMEPAGE=https://poez.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature xdg
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64
 LICENSE=GPL-3+
-RDEPEND=dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.14.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4138c2e374a0243cee7a05c5f7be439c
+_md5_=e5bfce5e3380935ae0d84bdf7372235c
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index f79489392d1e..3a3b995b8b6e 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/sphinx test? ( dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-python/sphinx test? ( dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DESCRIPTION=Console XMPP client that looks like most famous IRC clients
 EAPI=8
 HOMEPAGE=https://poez.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature xdg git-r3
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/aiodns[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/slixmpp-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=708f8c2d6c23412e0864d21331a0eeb0
+_md5_=412c69bfbc5789f3ddbe563610eab730
diff --git a/metadata/md5-cache/net-im/slack-4.27.156-r1 b/metadata/md5-cache/net-im/slack-4.27.156-r1
deleted file mode 100644
index e20a69620839..000000000000
--- a/metadata/md5-cache/net-im/slack-4.27.156-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DESCRIPTION=Team collaboration tool
-EAPI=8
-HOMEPAGE=https://slack.com
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop multilib-build optfeature pax-utils unpacker xdg
-IUSE=appindicator +seccomp suid wayland abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/mesa:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] sys-libs/glibc x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libdrm:0[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libxkbcommon:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] appindicator? ( dev-libs/libappindicator:3[abi_x86_64(-)?] )
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://downloads.slack-edge.com/releases/linux/4.27.156/prod/x64/slack-desktop-4.27.156-amd64.deb
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=28ae855e2c5ed6ff37dc3250835b55ad
diff --git a/metadata/md5-cache/net-im/slack-4.29.149 b/metadata/md5-cache/net-im/slack-4.29.149
new file mode 100644
index 000000000000..825b2d3b249e
--- /dev/null
+++ b/metadata/md5-cache/net-im/slack-4.29.149
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DESCRIPTION=Team collaboration tool
+EAPI=8
+HOMEPAGE=https://slack.com
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop multilib-build optfeature pax-utils unpacker xdg
+IUSE=appindicator +seccomp suid wayland abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=app-accessibility/at-spi2-atk:2[abi_x86_64(-)?] app-accessibility/at-spi2-core:2[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] dev-libs/wayland[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/mesa:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libdrm:0[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libxkbcommon:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] appindicator? ( dev-libs/libappindicator:3[abi_x86_64(-)?] )
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://downloads.slack-edge.com/releases/linux/4.29.149/prod/x64/slack-desktop-4.29.149-amd64.deb
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5107cee6ba72d98a99215cc929a135c6
diff --git a/metadata/md5-cache/net-im/spectrum2-2.1.3-r2 b/metadata/md5-cache/net-im/spectrum2-2.1.3-r2
new file mode 100644
index 000000000000..6b8a4018f073
--- /dev/null
+++ b/metadata/md5-cache/net-im/spectrum2-2.1.3-r2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= >=dev-libs/log4cxx-1.0.0:= dev-libs/jsoncpp:= dev-libs/openssl:= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DESCRIPTION=An open source instant messaging transport
+EAPI=8
+HOMEPAGE=https://www.spectrum.im
+INHERIT=cmake systemd tmpfiles
+IUSE=doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= >=dev-libs/log4cxx-1.0.0:= dev-libs/jsoncpp:= dev-libs/openssl:= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) virtual/tmpfiles
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( irc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.1.3.tar.gz -> spectrum2-2.1.3.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=53670e6e5d025cfd99ec4168f18a8a57
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-4.6.5 b/metadata/md5-cache/net-im/telegram-desktop-bin-4.6.5
new file mode 100644
index 000000000000..b4aa9e6e7da8
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-4.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=8
+HOMEPAGE=https://desktop.telegram.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop optfeature xdg
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=!net-im/telegram-desktop sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v4.6.5.tar.gz -> tdesktop-4.6.5.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.4.6.5.tar.xz )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	1a2157392a869265b2afcb63a26c12ac	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=22974026f47f127f70904d69fdf4c339
diff --git a/metadata/md5-cache/net-im/zoom-5.13.10.1208 b/metadata/md5-cache/net-im/zoom-5.13.10.1208
new file mode 100644
index 000000000000..27e833ce684d
--- /dev/null
+++ b/metadata/md5-cache/net-im/zoom-5.13.10.1208
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
+DEFINED_PHASES=install postinst postrm prepare setup
+DESCRIPTION=Video conferencing and web conferencing service
+EAPI=8
+HOMEPAGE=https://zoom.us/
+INHERIT=desktop linux-info readme.gentoo-r1 wrapper xdg-utils
+IUSE=bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=!games-engines/zoom >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/mit-krb5 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-libs/mesa[gbm(+)] media-sound/mpg123 net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc virtual/opengl x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm opencl? ( virtual/opencl ) pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 wayland? ( dev-qt/qtwayland ) )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://zoom.us/client/5.13.10.1208/zoom_x86_64.tar.xz -> zoom-5.13.10.1208_x86_64.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=26c132c3c064217afcc5a3c66063bb1b
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 514cd9a8ea21..b2560ff2a399 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/dccserver-0.5-r2 b/metadata/md5-cache/net-irc/dccserver-0.5-r2
index 66cb2f2b7a59..ccb29cf80f2b 100644
--- a/metadata/md5-cache/net-irc/dccserver-0.5-r2
+++ b/metadata/md5-cache/net-irc/dccserver-0.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Linux implementation of the mirc dccserver command
 EAPI=8
 HOMEPAGE=https://www.nih.at/dccserver/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ppc ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/libbsd
 SLOT=0
 SRC_URI=https://www.nih.at/dccserver/dccserver-0.5.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=09cd7fb91cb66adc209c77bf6e0e1fe9
+_md5_=556108dcb6f47f487140e4aa54752941
diff --git a/metadata/md5-cache/net-irc/hexchat-2.16.1 b/metadata/md5-cache/net-irc/hexchat-2.16.1
deleted file mode 100644
index 54ac9cd67dbb..000000000000
--- a/metadata/md5-cache/net-irc/hexchat-2.16.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=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 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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/python-cffi ) ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Graphical IRC client based on XChat
-EAPI=7
-HOMEPAGE=https://hexchat.github.io/
-INHERIT=lua-single meson mono-env python-single-r1 xdg
-IUSE=dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux
-LICENSE=GPL-2 plugin-fishlim? ( MIT )
-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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/python-cffi ) 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-3 lua_single_target_lua5-4 ) ) plugin-fishlim? ( ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.16.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	mono-env	87888393b1c1b882d0543087e28ec0b0	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2e826b9ab5682303b3f1fdc128556ede
diff --git a/metadata/md5-cache/net-irc/hexchat-2.16.1-r1 b/metadata/md5-cache/net-irc/hexchat-2.16.1-r1
index 49524e1c7222..679f6eee1399 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.16.1-r1
+++ b/metadata/md5-cache/net-irc/hexchat-2.16.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/glib-utils app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=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 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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/python-cffi ) ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/python-cffi ) ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=7
 HOMEPAGE=https://hexchat.github.io/
 INHERIT=flag-o-matic lua-single meson mono-env python-single-r1 xdg
-IUSE=dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux
+IUSE=dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux
 LICENSE=GPL-2 plugin-fishlim? ( MIT )
-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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/python-cffi ) 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-3 lua_single_target_lua5-4 ) ) plugin-fishlim? ( ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
+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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/python-cffi ) 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-3 lua_single_target_lua5-4 ) ) plugin-fishlim? ( ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.16.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	mono-env	87888393b1c1b882d0543087e28ec0b0	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=779a8e1d9073b0ee7f22481df33ec8dd
+_md5_=d29051001e9a300de591c14a6625dee2
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 7b8007b8966b..4f6b0eed9952 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/glib-utils app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/python-cffi ) ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/python-cffi ) ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=7
 HOMEPAGE=https://hexchat.github.io/
 INHERIT=flag-o-matic lua-single meson mono-env python-single-r1 xdg git-r3
-IUSE=dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10
+IUSE=dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-2 plugin-fishlim? ( MIT )
 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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/python-cffi ) 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-3 lua_single_target_lua5-4 ) ) plugin-fishlim? ( ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
+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 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/python-cffi ) 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-3 lua_single_target_lua5-4 ) ) plugin-fishlim? ( ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	mono-env	87888393b1c1b882d0543087e28ec0b0	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f34442ec9abf70ca1301bc2d3db063dd
+_md5_=8b26e3eb6e8fc9fdc18d8a7071ef72e2
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
index 44611c5e4338..80bcbe8b7d16 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=94bfdf01e2f9c037191df752c44c6fb8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 6b824d384612..78261ae40f43 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/grpc-1.52.1 b/metadata/md5-cache/net-libs/grpc-1.52.1
new file mode 100644
index 000000000000..f24c17d4d536
--- /dev/null
+++ b/metadata/md5-cache/net-libs/grpc-1.52.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-cpp/abseil-cpp-20220623.1*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-3.18.1:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= test? ( dev-cpp/benchmark dev-cpp/gflags )
+DESCRIPTION=Modern open source high performance RPC framework
+EAPI=8
+HOMEPAGE=https://www.grpc.io
+INHERIT=cmake
+IUSE=doc examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND==dev-cpp/abseil-cpp-20220623.1*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-3.18.1:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:=
+RESTRICT=test
+SLOT=0/30.152
+SRC_URI=https://github.com/grpc/grpc/archive/v1.52.1.tar.gz -> grpc-1.52.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d0e871ba4e8054e02e18452cc8025ce1
diff --git a/metadata/md5-cache/net-libs/ldns-1.8.3-r1 b/metadata/md5-cache/net-libs/ldns-1.8.3-r1
new file mode 100644
index 000000000000..96e909e29a63
--- /dev/null
+++ b/metadata/md5-cache/net-libs/ldns-1.8.3-r1
@@ -0,0 +1,17 @@
+BDEPEND=python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) >=dev-libs/openssl-1.1.1l-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(-)?,static-libs?] examples? ( net-libs/libpcap )
+DESCRIPTION=A library with the aim to simplify DNS programming in C
+EAPI=8
+HOMEPAGE=https://www.nlnetlabs.nl/projects/ldns/
+INHERIT=autotools python-single-r1 multilib-minimal
+IUSE=doc examples python static-libs python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) >=dev-libs/openssl-1.1.1l-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(-)?,static-libs?] examples? ( net-libs/libpcap ) !<net-dns/ldns-utils-1.8.0-r2
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=test
+SLOT=0/3
+SRC_URI=https://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ffe70a5b5a92d0542a92e8ca5eb1eaf4
diff --git a/metadata/md5-cache/net-libs/librsync-2.3.4 b/metadata/md5-cache/net-libs/librsync-2.3.4
index 89ff26486edd..af90b38748d4 100644
--- a/metadata/md5-cache/net-libs/librsync-2.3.4
+++ b/metadata/md5-cache/net-libs/librsync-2.3.4
@@ -5,10 +5,10 @@ DESCRIPTION=Remote delta-compression library
 EAPI=8
 HOMEPAGE=https://librsync.github.io/
 INHERIT=cmake
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0/2.2
 SRC_URI=https://github.com/librsync/librsync/archive/v2.3.4.tar.gz -> librsync-2.3.4.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=da5e08384bb8cfed6a5e72961ec94d24
+_md5_=ec510fe4ca8760e3e4e87a7f82c64cd5
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.14 b/metadata/md5-cache/net-libs/libvncserver-0.9.14
index 59ce248ebe60..5b4a07bdc19d 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.14
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.14
@@ -5,12 +5,12 @@ DESCRIPTION=library for creating vnc servers
 EAPI=8
 HOMEPAGE=https://libvnc.github.io/
 INHERIT=cmake
-IUSE=+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib
+IUSE=+24bpp +filetransfer +gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+ BSD MIT
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.2:0= ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) ) jpeg? ( media-libs/libjpeg-turbo:= ) lzo? ( dev-libs/lzo ) png? ( >=media-libs/libpng-1.6.10:0= ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) zlib? ( >=sys-libs/zlib-1.2.8-r1:0= )
-REQUIRED_USE=filetransfer? ( threads ) jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )
+REQUIRED_USE=filetransfer? ( threads ) jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) ) ssl? ( gnutls? ( gcrypt ) ) !ssl? ( gcrypt )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.14.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=35d6a20697a121b6594739bb3a88525e
+_md5_=d1e3a98734b7059f1a5d108da440215a
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.4.0 b/metadata/md5-cache/net-libs/socket_wrapper-1.4.0
index 67798a23691d..f7e9b0c3847a 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.4.0
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.4.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cwrap.org/socket_wrapper.html
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.4.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=74c9d9d8dc88695b583e3a59f8254af3
+_md5_=37077098fdca8ac83dd715f1ebeebadf
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3
index 165a5ccb84dd..6f07b037733e 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6047530e93c1bbf2eea3fb6ece8ab498
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r410
index 971b92b74dba..d788abe80469 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r410
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=486b6b797850e69e706e0f947161a985
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r500
index 01bcab36e9cc..126b1f58f8ca 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r500
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r500
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=5/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e419ea028cab6cdd53ea148ea590608d
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
index e26f5c6b11e8..dec3c3463470 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4be6be7754133baa14945971673e1d16
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
index c097d705af30..77c7048c2925 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e70857ef669ae84a44963d7a98612731
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
index 30794cbcd355..0b2f2dfbf463 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 DESCRIPTION=Open source web browser engine
@@ -14,5 +14,5 @@ REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua w
 RESTRICT=test
 SLOT=5/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=492a4ef4b2bbcdf14b61a2d6c62e77f7
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 8e4e0d73eb57..c66d962031d7 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/b4-0.12.1 b/metadata/md5-cache/net-mail/b4-0.12.1
new file mode 100644
index 000000000000..c5d1695de560
--- /dev/null
+++ b/metadata/md5-cache/net-mail/b4-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/dkimpy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/patatt-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility for fetching patchsets from public-inbox
+EAPI=8
+HOMEPAGE=https://pypi.org/project/b4/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-python/dkimpy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/patatt-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-filter-repo-2.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/b4-0.12.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=45b033da6c14675162d587035e47e383
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.5 b/metadata/md5-cache/net-mail/mailshears-0.0.5
index e0fc948b6a16..abdfadc27cbb 100644
--- a/metadata/md5-cache/net-mail/mailshears-0.0.5
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mailshears-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=aaf583f98e44baee8078e7aeefc2b968
diff --git a/metadata/md5-cache/net-mail/mailutils-3.14-r1 b/metadata/md5-cache/net-mail/mailutils-3.14-r1
deleted file mode 100644
index 3cd371a307ad..000000000000
--- a/metadata/md5-cache/net-mail/mailutils-3.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-DESCRIPTION=A useful collection of mail servers, clients, and filters
-EAPI=8
-HOMEPAGE=https://mailutils.org/
-INHERIT=autotools elisp-common flag-o-matic python-single-r1 toolchain-funcs
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
-LICENSE=GPL-3+ LGPL-3+
-RDEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) servers? ( tcpd ldap )
-SLOT=0
-SRC_URI=mirror://gnu/mailutils/mailutils-3.14.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=385b4c74006b07972fc1456bfbbfb4ac
diff --git a/metadata/md5-cache/net-mail/mailutils-3.15 b/metadata/md5-cache/net-mail/mailutils-3.15
index b54c2a69cf20..5e519270f909 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.15
+++ b/metadata/md5-cache/net-mail/mailutils-3.15
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mailutils.org/
 INHERIT=autotools elisp-common flag-o-matic python-single-r1 toolchain-funcs
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ LGPL-3+
 RDEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.15.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b340a3c64a6998bed4bf04095be834ea
+_md5_=052608d110682fc562ea3525cef6feab
diff --git a/metadata/md5-cache/net-mail/onionrouter-0.6.2 b/metadata/md5-cache/net-mail/onionrouter-0.6.2
deleted file mode 100644
index b84ab1283522..000000000000
--- a/metadata/md5-cache/net-mail/onionrouter-0.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=.onion discovery via SRV DNS lookups for use with postfix
-EAPI=7
-HOMEPAGE=https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/
-INHERIT=distutils-r1 systemd
-IUSE=test test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://pypi.io/packages/source/o/onionrouter/onionrouter-0.6.2.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c2e84777ec1e409939552d1b4c2b3826
diff --git a/metadata/md5-cache/net-mail/onionrouter-0.6.2-r1 b/metadata/md5-cache/net-mail/onionrouter-0.6.2-r1
new file mode 100644
index 000000000000..5a3344d9c1ff
--- /dev/null
+++ b/metadata/md5-cache/net-mail/onionrouter-0.6.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/pytest[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dnspython[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=.onion discovery via SRV DNS lookups for use with postfix
+EAPI=8
+HOMEPAGE=https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/
+INHERIT=distutils-r1 systemd
+IUSE=test test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dnspython[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://pypi.io/packages/source/o/onionrouter/onionrouter-0.6.2.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4c30cf3bd57f96526e110c9e76f4906e
diff --git a/metadata/md5-cache/net-mail/onionrouter-9999 b/metadata/md5-cache/net-mail/onionrouter-9999
index 005a54283066..2a94a2cc0006 100644
--- a/metadata/md5-cache/net-mail/onionrouter-9999
+++ b/metadata/md5-cache/net-mail/onionrouter-9999
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/pytest[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dnspython[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=.onion discovery via SRV DNS lookups for use with postfix
-EAPI=7
+EAPI=8
 HOMEPAGE=https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/
 INHERIT=distutils-r1 systemd git-r3
-IUSE=test test python_single_target_python3_9 python_single_target_python3_10
+IUSE=test test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dnspython[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c2e84777ec1e409939552d1b4c2b3826
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4c30cf3bd57f96526e110c9e76f4906e
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 7aa2c8200bac..7f5fddeb8330 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/anydesk-6.2.0-r1 b/metadata/md5-cache/net-misc/anydesk-6.2.0-r1
deleted file mode 100644
index b37a374daf69..000000000000
--- a/metadata/md5-cache/net-misc/anydesk-6.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Feature rich multi-platform remote desktop application
-EAPI=8
-HOMEPAGE=https://anydesk.com
-INHERIT=desktop optfeature systemd xdg-utils
-KEYWORDS=-* ~amd64
-LICENSE=AnyDesk-TOS BSD BSD-2 openssl ZLIB
-RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glu sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/libX11 x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://download.anydesk.com/linux/anydesk-6.2.0-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.2.0-amd64.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9ac26b40a513b60852c48a81effc2cf2
diff --git a/metadata/md5-cache/net-misc/anydesk-6.2.1 b/metadata/md5-cache/net-misc/anydesk-6.2.1
deleted file mode 100644
index 5f0d76991365..000000000000
--- a/metadata/md5-cache/net-misc/anydesk-6.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Feature rich multi-platform remote desktop application
-EAPI=8
-HOMEPAGE=https://anydesk.com
-INHERIT=desktop optfeature systemd xdg-utils
-KEYWORDS=-* ~amd64
-LICENSE=AnyDesk-TOS BSD BSD-2 openssl ZLIB
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glu media-libs/libglvnd sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/libX11 x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://download.anydesk.com/linux/anydesk-6.2.1-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.2.1-amd64.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8ef5686a07d83b7317852dc6a747927f
diff --git a/metadata/md5-cache/net-misc/anydesk-6.2.1-r1 b/metadata/md5-cache/net-misc/anydesk-6.2.1-r1
new file mode 100644
index 000000000000..7004aa09f120
--- /dev/null
+++ b/metadata/md5-cache/net-misc/anydesk-6.2.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Feature rich multi-platform remote desktop application
+EAPI=8
+HOMEPAGE=https://anydesk.com
+INHERIT=desktop optfeature systemd xdg-utils
+KEYWORDS=-* ~amd64
+LICENSE=AnyDesk-TOS BSD BSD-2 openssl ZLIB
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glu media-libs/libglvnd sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/libX11 x11-libs/libxcb x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://download.anydesk.com/linux/anydesk-6.2.1-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.2.1-amd64.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=646ae44b26cf2364bfb1c6266b594616
diff --git a/metadata/md5-cache/net-misc/asterisk-16.30.0 b/metadata/md5-cache/net-misc/asterisk-16.30.0
new file mode 100644
index 000000000000..16c85ea7aa89
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.30.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=8
+HOMEPAGE=https://www.asterisk.org/
+INHERIT=autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 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.30.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bcfd070d4b6380fe3a32190a53a62774
diff --git a/metadata/md5-cache/net-misc/asterisk-18.16.0 b/metadata/md5-cache/net-misc/asterisk-18.16.0
new file mode 100644
index 000000000000..52ee710d1bf1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.16.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=8
+HOMEPAGE=https://www.asterisk.org/
+INHERIT=autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 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.16.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4b0ff870ca44a454cc5d7fb8f7145663
diff --git a/metadata/md5-cache/net-misc/asterisk-20.1.0 b/metadata/md5-cache/net-misc/asterisk-20.1.0
new file mode 100644
index 000000000000..2b82a3633f19
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-20.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=8
+HOMEPAGE=https://www.asterisk.org/
+INHERIT=autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
+SLOT=0/20
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-20.1.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5d0a3904a895cf7288cfc44df613694b
diff --git a/metadata/md5-cache/net-misc/axel-2.17.11 b/metadata/md5-cache/net-misc/axel-2.17.11
index d6c633505d2b..e030836e7c7b 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.11
+++ b/metadata/md5-cache/net-misc/axel-2.17.11
@@ -4,9 +4,9 @@ DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
 IUSE=debug nls ssl
-KEYWORDS=amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.11/axel-2.17.11.tar.xz
-_md5_=9af391f570b2819e691021c10c0bacb3
+_md5_=ce9eca36076c2cabdbf3132740546fb7
diff --git a/metadata/md5-cache/net-misc/bgpq4-1.5 b/metadata/md5-cache/net-misc/bgpq4-1.5
deleted file mode 100644
index d281e040e7a6..000000000000
--- a/metadata/md5-cache/net-misc/bgpq4-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=prepare
-DESCRIPTION=Generate access-lists for various routers, maintained fork of bgpq3
-EAPI=8
-HOMEPAGE=https://github.com/bgp/bgpq4/
-INHERIT=autotools
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/bgp/bgpq4/archive/refs/tags/1.5.tar.gz -> bgpq4-1.5.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8d5f70f796b0133c8216ff0795e3ad3e
diff --git a/metadata/md5-cache/net-misc/bgpq4-1.8 b/metadata/md5-cache/net-misc/bgpq4-1.8
new file mode 100644
index 000000000000..ebde0a3da1ca
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bgpq4-1.8
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=prepare
+DESCRIPTION=Generate access-lists for various routers, maintained fork of bgpq3
+EAPI=8
+HOMEPAGE=https://github.com/bgp/bgpq4/
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/bgp/bgpq4/archive/refs/tags/1.8.tar.gz -> bgpq4-1.8.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0c2805d0afcfff2dc72b5ce3240164ae
diff --git a/metadata/md5-cache/net-misc/connman-1.42_pre20230116-r2 b/metadata/md5-cache/net-misc/connman-1.42_pre20230116-r2
new file mode 100644
index 000000000000..841cd0d14e32
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connman-1.42_pre20230116-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.16 net-libs/gnutls >=sys-apps/dbus-1.2.24 sys-libs/readline:0= nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wireguard? ( >=net-libs/libmnl-1.0.0:0= ) >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Provides a daemon for managing internet connections
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/network/connman/connman.git/
+INHERIT=autotools systemd tmpfiles
+IUSE=bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager +nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard wispr
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 net-libs/gnutls >=sys-apps/dbus-1.2.24 sys-libs/readline:0= nftables? ( >=net-libs/libnftnl-1.0.4:0= >=net-libs/libmnl-1.0.0:0= ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wireguard? ( >=net-libs/libmnl-1.0.0:0= ) bluetooth? ( net-wireless/bluez ) iptables? ( >=net-firewall/iptables-1.4.8 ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) ) virtual/tmpfiles
+REQUIRED_USE=^^ ( iptables nftables )
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-9971144ae862e83f1f5d8cb84c0b62f2542dcdec.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fa71d0775899d55d9eddde4c8bcd2d79
diff --git a/metadata/md5-cache/net-misc/dropbear-2020.81-r3 b/metadata/md5-cache/net-misc/dropbear-2020.81-r3
deleted file mode 100644
index af3c5c8a301a..000000000000
--- a/metadata/md5-cache/net-misc/dropbear-2020.81-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] >=dev-libs/libtommath-1.2.0 virtual/libcrypt zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) static? ( virtual/libcrypt[static-libs(+)] zlib? ( sys-libs/zlib[static-libs(+)] ) )
-DESCRIPTION=small SSH 2 client/server designed for small memory environments
-EAPI=7
-HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
-INHERIT=savedconfig pam
-IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT GPL-2
-RDEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] >=dev-libs/libtommath-1.2.0 virtual/libcrypt zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
-REQUIRED_USE=pam? ( !static )
-SLOT=0
-SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2020.81.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=be381b25e2382a302267dfa4438e68e1
diff --git a/metadata/md5-cache/net-misc/dropbear-2022.83 b/metadata/md5-cache/net-misc/dropbear-2022.83
index 27b4468b63a1..26bfeaccdc14 100644
--- a/metadata/md5-cache/net-misc/dropbear-2022.83
+++ b/metadata/md5-cache/net-misc/dropbear-2022.83
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
 INHERIT=savedconfig pam python-any-r1 verify-sig
 IUSE=bsdpty minimal multicall pam +shadow static +syslog test zlib savedconfig verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] >=dev-libs/libtommath-1.2.0 virtual/libcrypt zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 REQUIRED_USE=pam? ( !static )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.83.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.83.tar.bz2 verify-sig? ( https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.83.tar.bz2.asc https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.83.tar.bz2.asc )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f5032fd459461414d81ac1762984e5ff
+_md5_=e44f3d9c2705b8906b17032c32ee7b83
diff --git a/metadata/md5-cache/net-misc/dropbox-168.4.4802 b/metadata/md5-cache/net-misc/dropbox-168.4.4802
index baa66a498ef9..745168552180 100644
--- a/metadata/md5-cache/net-misc/dropbox-168.4.4802
+++ b/metadata/md5-cache/net-misc/dropbox-168.4.4802
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.dropbox.com/
 INHERIT=desktop pax-utils systemd xdg
 IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-168.4.4802.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-168.4.4802.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=89d0b954ab3cc637e603f62e60b32bff
+_md5_=5953c4837ec669603a5ae2dc04554571
diff --git a/metadata/md5-cache/net-misc/dropbox-cli-2023 b/metadata/md5-cache/net-misc/dropbox-cli-2023
new file mode 100644
index 000000000000..ae5e2af5b882
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-cli-2023
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DESCRIPTION=Cli interface for dropbox (python), part of nautilus-dropbox
+EAPI=8
+HOMEPAGE=https://www.dropbox.com/
+INHERIT=python-r1 bash-completion-r1
+IUSE=+gpg python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-misc/dropbox python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) gpg? ( app-crypt/gpgme[python] ) dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/dropbox-cli-2023.py.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7521f3165c5ee85c07e1658f69b438da
diff --git a/metadata/md5-cache/net-misc/htail-1.5 b/metadata/md5-cache/net-misc/htail-1.5
index 8ce1ff96a5a4..f3a111691ed5 100644
--- a/metadata/md5-cache/net-misc/htail-1.5
+++ b/metadata/md5-cache/net-misc/htail-1.5
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tail over HTTP
 EAPI=7
 HOMEPAGE=https://github.com/vpelletier/htail
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/h/htail/htail-1.5.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ec24a5c9c1ed814c7e951236d0988f59
+_md5_=d37625ad2f810e2a42c30977a6e286be
diff --git a/metadata/md5-cache/net-misc/icaclient-23.2.0.10 b/metadata/md5-cache/net-misc/icaclient-23.2.0.10
new file mode 100644
index 000000000000..eff0f32d2058
--- /dev/null
+++ b/metadata/md5-cache/net-misc/icaclient-23.2.0.10
@@ -0,0 +1,15 @@
+BDEPEND=hdx? ( >=media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare setup unpack
+DESCRIPTION=ICA Client for Citrix Presentation servers
+EAPI=8
+HOMEPAGE=https://www.citrix.com/
+INHERIT=desktop wrapper xdg-utils
+IUSE=l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=icaclient
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg media-libs/libpulse media-libs/libvorbis media-libs/mesa media-libs/speex net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux sys-libs/libcxx sys-libs/libcxxabi sys-libs/zlib virtual/krb5 virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXaw x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango hdx? ( >=media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 ) !hdx? ( !<media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+RESTRICT=mirror strip fetch
+SLOT=0
+SRC_URI=amd64? ( linuxx64-23.2.0.10.tar.gz ) x86? ( linuxx86-23.2.0.10.tar.gz )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6a9aeba0d9295cc8b6d7adfb253161d4
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.7 b/metadata/md5-cache/net-misc/mikutter-4.1.7
index dfd4aaff0814..a1198b89cc3e 100644
--- a/metadata/md5-cache/net-misc/mikutter-4.1.7
+++ b/metadata/md5-cache/net-misc/mikutter-4.1.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.1.7.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4359e975b69eea9e47baeafee4933588
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index 64e8b189a01b..012fb110000d 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=46a05265b3dc559c3e166e3f611cd3b0
diff --git a/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3 b/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
index 36b03081673c..d5544412370a 100644
--- a/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
+++ b/metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
@@ -6,6 +6,6 @@ INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=mirror://debian/pool/main/b/bsd-finger/bsd-finger_0.17.orig.tar.bz2
+SRC_URI=http://ftp.linux.org.uk/pub/linux/Networking/finger/bsd-finger-0.17.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ff5176e7d4424de1d2e4c04310dd8e7c
+_md5_=7b1d8bcd6f9f407e056e45bc86c5023b
diff --git a/metadata/md5-cache/net-misc/r8168-8.050.03 b/metadata/md5-cache/net-misc/r8168-8.050.03
deleted file mode 100644
index bc82ca8270e9..000000000000
--- a/metadata/md5-cache/net-misc/r8168-8.050.03
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=r8168 driver for Realtek 8111/8168 PCI-E NICs
-EAPI=8
-HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
-INHERIT=linux-info linux-mod
-IUSE=use-firmware dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.050.03.tar.bz2
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=685e2dcfdec820cf43f600d56e4e2248
diff --git a/metadata/md5-cache/net-misc/radvd-2.19-r2 b/metadata/md5-cache/net-misc/radvd-2.19-r2
index fe7e2cb558d9..31dcfa42fd73 100644
--- a/metadata/md5-cache/net-misc/radvd-2.19-r2
+++ b/metadata/md5-cache/net-misc/radvd-2.19-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install
 DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex test? ( dev-libs/check )
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=7
-HOMEPAGE=https://v6web.litech.org/radvd/
+HOMEPAGE=https://radvd.litech.org/
 INHERIT=readme.gentoo-r1 systemd toolchain-funcs
 IUSE=selinux test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://v6web.litech.org/radvd/dist/radvd-2.19.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=778fcb7f56d251ae17d2b9cf768c6e8f
+_md5_=420bc3916976592202f1e881f7cb3973
diff --git a/metadata/md5-cache/net-misc/radvd-2.19-r4 b/metadata/md5-cache/net-misc/radvd-2.19-r4
index 6e7c2e61e544..b6f3ea1305fe 100644
--- a/metadata/md5-cache/net-misc/radvd-2.19-r4
+++ b/metadata/md5-cache/net-misc/radvd-2.19-r4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install
 DEPEND=sys-devel/bison sys-devel/flex test? ( dev-libs/check )
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=8
-HOMEPAGE=https://v6web.litech.org/radvd/
+HOMEPAGE=https://radvd.litech.org/
 INHERIT=readme.gentoo-r1 systemd toolchain-funcs
 IUSE=selinux test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://v6web.litech.org/radvd/dist/radvd-2.19.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7fd82fb4bfe5bca77d41fc3717f7e9af
+_md5_=d9c779d9c2b550492fbe25bfb226f4c8
diff --git a/metadata/md5-cache/net-misc/radvd-2.19-r5 b/metadata/md5-cache/net-misc/radvd-2.19-r5
index 1cc7ccb9a601..01f112315a43 100644
--- a/metadata/md5-cache/net-misc/radvd-2.19-r5
+++ b/metadata/md5-cache/net-misc/radvd-2.19-r5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=test? ( dev-libs/check )
 DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=8
-HOMEPAGE=https://v6web.litech.org/radvd/
+HOMEPAGE=https://radvd.litech.org/
 INHERIT=autotools readme.gentoo-r1 systemd toolchain-funcs
 IUSE=selinux test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://v6web.litech.org/radvd/dist/radvd-2.19.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aa93e91ea801ef14bdec7f43b2aef3fe
+_md5_=b0dfa8aaf9bee0a5275731bd48a942eb
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.27 b/metadata/md5-cache/net-misc/remmina-1.4.27
deleted file mode 100644
index 98bfb3300679..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.27
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-INHERIT=cmake optfeature python-single-r1 xdg
-IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.27/Remmina-v1.4.27.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2238053303b9e8730890eb165c90af6b
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.29 b/metadata/md5-cache/net-misc/remmina-1.4.29
deleted file mode 100644
index 4c55a242d37a..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.29
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-INHERIT=cmake optfeature python-single-r1 xdg
-IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.29/Remmina-v1.4.29.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=abae799d2fa775ab372d595127691955
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.29-r1 b/metadata/md5-cache/net-misc/remmina-1.4.29-r1
deleted file mode 100644
index 82ec94ca8e55..000000000000
--- a/metadata/md5-cache/net-misc/remmina-1.4.29-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) spice? ( app-emulation/spice-protocol ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
-EAPI=7
-HOMEPAGE=https://remmina.org/
-INHERIT=cmake optfeature python-single-r1 xdg
-IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.29/Remmina-v1.4.29.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3e0b488b4e8a3b6d97bd94d0a5a7d46b
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.29-r2 b/metadata/md5-cache/net-misc/remmina-1.4.29-r2
index 771854f06a3a..e4edf564c68c 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.29-r2
+++ b/metadata/md5-cache/net-misc/remmina-1.4.29-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://remmina.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake optfeature python-single-r1 xdg
 IUSE=+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= x11-libs/gdk-pixbuf x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4.1 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.29/Remmina-v1.4.29.tar.bz2
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=91c58850d3441f431900e2c7effc480d
+_md5_=9883b41e8fada42f309962c1fac32dac
diff --git a/metadata/md5-cache/net-misc/streamlink-5.3.1 b/metadata/md5-cache/net-misc/streamlink-5.3.1
new file mode 100644
index 000000000000..ba167c9851b5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/streamlink-5.3.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] test? ( dev-python/mock[python_targets_python3_9(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_9(-)] dev-python/pytest-asyncio[python_targets_python3_9(-)] dev-python/requests-mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] test? ( dev-python/mock[python_targets_python3_10(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_10(-)] dev-python/pytest-asyncio[python_targets_python3_10(-)] dev-python/requests-mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=dev-python/versioningit-2.0.0[python_targets_python3_11(-)] test? ( dev-python/mock[python_targets_python3_11(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_11(-)] dev-python/pytest-asyncio[python_targets_python3_11(-)] dev-python/requests-mock[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/certifi[python_targets_python3_9(-)] >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/certifi[python_targets_python3_10(-)] >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/certifi[python_targets_python3_11(-)] >dev-python/requests-2.21.0[python_targets_python3_11(-)] dev-python/isodate[python_targets_python3_11(-)] >=dev-python/lxml-4.6.4[python_targets_python3_11(-)] dev-python/websocket-client[python_targets_python3_11(-)] dev-python/pycountry[python_targets_python3_11(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_11(-)] >dev-python/PySocks-1.5.7[python_targets_python3_11(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_11(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_11(-)] ) media-video/ffmpeg python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+),threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( dev-python/certifi[python_targets_python3_9(-)] >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/certifi[python_targets_python3_10(-)] >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/certifi[python_targets_python3_11(-)] >dev-python/requests-2.21.0[python_targets_python3_11(-)] dev-python/isodate[python_targets_python3_11(-)] >=dev-python/lxml-4.6.4[python_targets_python3_11(-)] dev-python/websocket-client[python_targets_python3_11(-)] dev-python/pycountry[python_targets_python3_11(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_11(-)] >dev-python/PySocks-1.5.7[python_targets_python3_11(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_11(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_11(-)] )
+DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
+EAPI=8
+HOMEPAGE=https://streamlink.github.io/
+INHERIT=distutils-r1
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 Apache-2.0
+RDEPEND=python_single_target_python3_9? ( dev-python/certifi[python_targets_python3_9(-)] >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] >=dev-python/lxml-4.6.4[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >dev-python/PySocks-1.5.7[python_targets_python3_9(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_9(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/certifi[python_targets_python3_10(-)] >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] >=dev-python/lxml-4.6.4[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >dev-python/PySocks-1.5.7[python_targets_python3_10(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_10(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/certifi[python_targets_python3_11(-)] >dev-python/requests-2.21.0[python_targets_python3_11(-)] dev-python/isodate[python_targets_python3_11(-)] >=dev-python/lxml-4.6.4[python_targets_python3_11(-)] dev-python/websocket-client[python_targets_python3_11(-)] dev-python/pycountry[python_targets_python3_11(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_11(-)] >dev-python/PySocks-1.5.7[python_targets_python3_11(-)] >=dev-python/urllib3-1.26.0[python_targets_python3_11(-)] >=dev-python/versioningit-2.0.0[python_targets_python3_11(-)] ) media-video/ffmpeg python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+),threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+),threads(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/streamlink/streamlink/releases/download/5.3.1/streamlink-5.3.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=50518820d6cc8fab36ce1b12bf09a02f
diff --git a/metadata/md5-cache/net-misc/stunnel-5.65-r2 b/metadata/md5-cache/net-misc/stunnel-5.65-r2
index 3b2e6e1466b8..7301d38c0abf 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.65-r2
+++ b/metadata/md5-cache/net-misc/stunnel-5.65-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.stunnel.org/index.html
 INHERIT=ssl-cert systemd tmpfiles
 IUSE=selinux stunnel3 tcpd ssl
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=acct-user/stunnel acct-group/stunnel dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-stunnel ) stunnel3? ( dev-lang/perl ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.stunnel.org/downloads/stunnel-5.65.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.65.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.65.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.65.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.65.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.65.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.65.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.65.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f96264ebb1367a4480d8a42f78cc9d6c
+_md5_=c2f964ec7e7873e121e6e8821d096210
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.13.1 b/metadata/md5-cache/net-misc/tigervnc-1.13.1
new file mode 100644
index 000000000000..f11b31466f38
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-1.13.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) drm? ( x11-libs/libdrm ) server? ( media-fonts/font-util x11-base/xorg-proto x11-libs/libxcvt x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrender x11-misc/util-macros opengl? ( media-libs/mesa ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Remote desktop viewer display system
+EAPI=8
+HOMEPAGE=https://tigervnc.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+IUSE=dri3 +drm gnutls java nls +opengl +server +viewer xinerama java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
+SLOT=0
+SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.13.1.tar.gz -> tigervnc-1.13.1.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=53fcff2bd21a383444d9ae1bd7bef3f7
diff --git a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1 b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1
new file mode 100644
index 000000000000..809b07a7db37
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Metapackage for the xorg module provided by tigervnc
+EAPI=8
+HOMEPAGE=https://tigervnc.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=metapackage
+RDEPEND=~net-misc/tigervnc-1.13.1[server] =x11-base/xorg-server-21.1*
+SLOT=0
+_md5_=2d31a197d54685c902e6206fefc4d37c
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0.3 b/metadata/md5-cache/net-misc/turbovnc-3.0.3
new file mode 100644
index 000000000000..2bcaa777448e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/turbovnc-3.0.3
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config server? ( media-libs/libjpeg-turbo:= sys-libs/pam sys-libs/zlib virtual/opengl x11-libs/libXau x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/pixman ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) viewer? ( media-libs/libjpeg-turbo:=[java] x11-libs/libXi !net-misc/tigervnc[viewer(+)] ) x11-libs/xtrans viewer? ( >=virtual/jdk-1.8:* ) server? ( app-arch/bzip2 media-libs/freetype x11-libs/libfontenc ) viewer? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A fast replacement for TigerVNC
+EAPI=8
+HOMEPAGE=https://www.turbovnc.org/
+INHERIT=cmake desktop java-pkg-opt-2 verify-sig
+IUSE=+server +ssl +viewer viewer verify-sig
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config server? ( media-libs/libjpeg-turbo:= sys-libs/pam sys-libs/zlib virtual/opengl x11-libs/libXau x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/pixman ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) viewer? ( media-libs/libjpeg-turbo:=[java] x11-libs/libXi !net-misc/tigervnc[viewer(+)] ) x11-apps/xkbcomp viewer? ( >=virtual/jre-1.8:* ) viewer? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( server viewer )
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/turbovnc/files/3.0.3/turbovnc-3.0.3.tar.gz/download -> turbovnc-3.0.3.tar.gz verify-sig? ( https://sourceforge.net/projects/turbovnc/files/3.0.3/turbovnc-3.0.3.tar.gz.sig/download -> turbovnc-3.0.3.tar.gz.sig )
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=11995df906d388e715f54229fc5cbaba
diff --git a/metadata/md5-cache/net-misc/ytfzf-2.5.5 b/metadata/md5-cache/net-misc/ytfzf-2.5.5
new file mode 100644
index 000000000000..2967d8405fc0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ytfzf-2.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Posix script to find and watch youtube videos from the terminal
+EAPI=8
+HOMEPAGE=https://github.com/pystardust/ytfzf/
+INHERIT=optfeature
+IUSE=X minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-misc/jq net-misc/curl[ssl] app-alternatives/awk !minimal? ( X? ( media-gfx/ueberzug ) app-shells/fzf media-video/mpv[lua] net-misc/yt-dlp )
+SLOT=0
+SRC_URI=https://github.com/pystardust/ytfzf/archive/refs/tags/v2.5.5.tar.gz -> ytfzf-2.5.5.tar.gz
+_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
+_md5_=26e11e5c670e8906563f39cd73f133b1
diff --git a/metadata/md5-cache/net-misc/ytmdl-2022.12.25 b/metadata/md5-cache/net-misc/ytmdl-2022.12.25
index d8354daa4832..8544d37f69c9 100644
--- a/metadata/md5-cache/net-misc/ytmdl-2022.12.25
+++ b/metadata/md5-cache/net-misc/ytmdl-2022.12.25
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple app to get songs from youtube in mp3 format
 EAPI=8
 HOMEPAGE=https://ytmdl.deepjyoti30.dev/
 INHERIT=bash-completion-r1 distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=net-misc/yt-dlp-2022.3.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ffmpeg-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itunespy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyDes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-musicbrainzngs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyxdg[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simber[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/spotipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/youtube-search-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ytmusicapi[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/downloader-cli[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=net-misc/yt-dlp-2022.3.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ffmpeg-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itunespy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyDes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-musicbrainzngs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxdg[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simber[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/spotipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/youtube-search-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ytmusicapi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/mutagen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/downloader-cli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/y/ytmdl/ytmdl-2022.12.25.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b439d8e29a53ac275c1f04d47494dd23
+_md5_=8ea77ab8ad72d05c1aba606f8d15f912
diff --git a/metadata/md5-cache/net-misc/ytmdl-2022.3.16 b/metadata/md5-cache/net-misc/ytmdl-2022.3.16
index 443717766b94..2c8c84d2dd6e 100644
--- a/metadata/md5-cache/net-misc/ytmdl-2022.3.16
+++ b/metadata/md5-cache/net-misc/ytmdl-2022.3.16
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple app to get songs from youtube in mp3 format
 EAPI=8
 HOMEPAGE=https://ytmdl.deepjyoti30.dev/
 INHERIT=bash-completion-r1 distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=net-misc/yt-dlp-2022.3.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ffmpeg-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itunespy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyDes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-musicbrainzngs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyxdg[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simber[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/spotipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/youtube-search-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ytmusicapi[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/downloader-cli[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=net-misc/yt-dlp-2022.3.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ffmpeg-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itunespy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyDes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-musicbrainzngs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxdg[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simber[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/spotipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/youtube-search-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ytmusicapi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/mutagen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/downloader-cli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/y/ytmdl/ytmdl-2022.3.16.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d92e4d0eb186e0a319d3e2bfdcba3c64
+_md5_=ae94aa2399e8633be9812774d01d8812
diff --git a/metadata/md5-cache/net-misc/ytmdl-2023.2.28 b/metadata/md5-cache/net-misc/ytmdl-2023.2.28
new file mode 100644
index 000000000000..b2e037ba38d5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ytmdl-2023.2.28
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple app to get songs from youtube in mp3 format
+EAPI=8
+HOMEPAGE=https://ytmdl.deepjyoti30.dev/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=net-misc/yt-dlp-2022.3.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ffmpeg-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itunespy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyDes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-musicbrainzngs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxdg[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simber[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/spotipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unidecode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/youtube-search-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ytmusicapi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/mutagen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/downloader-cli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/y/ytmdl/ytmdl-2023.2.28.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8ea77ab8ad72d05c1aba606f8d15f912
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 3c0d3cc4ca9c..925a2437c1db 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/canto-curses-0.9.9 b/metadata/md5-cache/net-news/canto-curses-0.9.9
index 9a2d14141707..f630c0170d08 100644
--- a/metadata/md5-cache/net-news/canto-curses-0.9.9
+++ b/metadata/md5-cache/net-news/canto-curses-0.9.9
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=net-news/canto-daemon-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses(+),threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=net-news/canto-daemon-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses(+),threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ncurses client for canto-daemon
 EAPI=8
 HOMEPAGE=https://codezen.org/canto-ng/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 PROPERTIES=test_network
-RDEPEND=>=net-news/canto-daemon-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses(+),threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=net-news/canto-daemon-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses(+),threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/themoken/canto-curses/archive/v0.9.9.tar.gz -> canto-curses-0.9.9.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8ef6fc952c0a162b23d5d9495ac7c129
+_md5_=2f2c15697171a29dbdd54c4600efc011
diff --git a/metadata/md5-cache/net-news/canto-daemon-0.9.8 b/metadata/md5-cache/net-news/canto-daemon-0.9.8
index 868c8c659a8b..14479220bd65 100644
--- a/metadata/md5-cache/net-news/canto-daemon-0.9.8
+++ b/metadata/md5-cache/net-news/canto-daemon-0.9.8
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-python/feedparser[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+),threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/feedparser[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+),threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Daemon part of Canto-NG RSS reader
 EAPI=8
 HOMEPAGE=https://codezen.org/canto-ng/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 PROPERTIES=test_network
-RDEPEND=dev-python/feedparser[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+),threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/feedparser[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+),threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/themoken/canto-next/archive/v0.9.8.tar.gz -> canto-daemon-0.9.8.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8ebae7767b40c123f36dfbd8b5a5721c
+_md5_=0d0acb84b4b81ce21008e432bef8ba90
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 9b0c80ba9572..a32fa9b76738 100644
Binary files a/metadata/md5-cache/net-nntp/Manifest.gz and b/metadata/md5-cache/net-nntp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.7.2 b/metadata/md5-cache/net-nntp/sabnzbd-3.7.2
deleted file mode 100644
index 464b6a7242dd..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.7.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/flaky[python_targets_python3_9(-)] >=dev-python/lxml-4.5.0[python_targets_python3_9(-)] dev-python/pkginfo[python_targets_python3_9(-)] dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-httpbin[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/selenium[python_targets_python3_9(-)] dev-python/werkzeug[python_targets_python3_9(-)] dev-python/xmltodict[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pkginfo[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flaky[python_targets_python3_11(-)] >=dev-python/lxml-4.5.0[python_targets_python3_11(-)] dev-python/pkginfo[python_targets_python3_11(-)] dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-httpbin[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/selenium[python_targets_python3_11(-)] dev-python/werkzeug[python_targets_python3_11(-)] dev-python/xmltodict[python_targets_python3_11(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
-DEFINED_PHASES=install postinst setup test
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] dev-python/tavalidate[python_targets_python3_9(-)] >=dev-python/tavern-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] dev-python/tavalidate[python_targets_python3_10(-)] >=dev-python/tavern-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] dev-python/tavalidate[python_targets_python3_11(-)] >=dev-python/tavern-2[python_targets_python3_11(-)] )
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=8
-HOMEPAGE=https://sabnzbd.org/
-INHERIT=optfeature python-single-r1 systemd
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] dev-python/tavalidate[python_targets_python3_9(-)] >=dev-python/tavern-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] dev-python/tavalidate[python_targets_python3_10(-)] >=dev-python/tavern-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] dev-python/tavalidate[python_targets_python3_11(-)] >=dev-python/tavern-2[python_targets_python3_11(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.7.2/SABnzbd-3.7.2-src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=15f13fb1c55587aae30fb5f859c8309b
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.7.2-r1 b/metadata/md5-cache/net-nntp/sabnzbd-3.7.2-r1
new file mode 100644
index 000000000000..90c2a50ed51d
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.7.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/flaky[python_targets_python3_9(-)] >=dev-python/lxml-4.5.0[python_targets_python3_9(-)] dev-python/pkginfo[python_targets_python3_9(-)] dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-httpbin[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/selenium[python_targets_python3_9(-)] dev-python/werkzeug[python_targets_python3_9(-)] dev-python/xmltodict[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pkginfo[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flaky[python_targets_python3_11(-)] >=dev-python/lxml-4.5.0[python_targets_python3_11(-)] dev-python/pkginfo[python_targets_python3_11(-)] dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-httpbin[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/selenium[python_targets_python3_11(-)] dev-python/werkzeug[python_targets_python3_11(-)] dev-python/xmltodict[python_targets_python3_11(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
+DEFINED_PHASES=install postinst setup test
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] ) test? ( python_single_target_python3_9? ( dev-python/tavalidate[python_targets_python3_9(-)] >=dev-python/tavern-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/tavalidate[python_targets_python3_10(-)] >=dev-python/tavern-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/tavalidate[python_targets_python3_11(-)] >=dev-python/tavern-2[python_targets_python3_11(-)] ) )
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=8
+HOMEPAGE=https://sabnzbd.org/
+INHERIT=optfeature python-single-r1 systemd
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] ) test? ( python_single_target_python3_9? ( dev-python/tavalidate[python_targets_python3_9(-)] >=dev-python/tavern-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/tavalidate[python_targets_python3_10(-)] >=dev-python/tavern-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/tavalidate[python_targets_python3_11(-)] >=dev-python/tavern-2[python_targets_python3_11(-)] ) ) >=app-arch/par2cmdline-0.4 net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.7.2/SABnzbd-3.7.2-src.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9cb26a075568482141fa35067bbe58be
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 7f837b1d9243..187a0741df3e 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/biglybt-3.2.0.0-r2 b/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
index 8dbb7ed4e45d..b83d94831c67 100644
--- a/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
+++ b/metadata/md5-cache/net-p2p/biglybt-3.2.0.0-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/swt:4.10 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/BiglySoftware/BiglyBT/archive/v3.2.0.0.tar.gz -> biglybt-3.2.0.0.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=815b473528ee126c7afb8385b68c1680
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.5.2 b/metadata/md5-cache/net-p2p/qbittorrent-4.5.2
new file mode 100644
index 000000000000..d4cf74da3d15
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.5.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/boost:= >=dev-libs/openssl-1.1.1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtxml:5 <net-libs/libtorrent-rasterbar-2:= >=sys-libs/zlib-1.2.11 dbus? ( dev-qt/qtdbus:5 ) gui? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=BitTorrent client in C++ and Qt
+EAPI=8
+HOMEPAGE=https://www.qbittorrent.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake multibuild systemd xdg
+IUSE=+dbus +gui webui
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= >=dev-libs/openssl-1.1.1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtxml:5 <net-libs/libtorrent-rasterbar-2:= >=sys-libs/zlib-1.2.11 dbus? ( dev-qt/qtdbus:5 ) gui? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=dbus? ( gui ) || ( gui webui )
+SLOT=0
+SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.5.2.tar.gz -> qbittorrent-4.5.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3f8759c9852177068cb9c99daf6eb63a
diff --git a/metadata/md5-cache/net-p2p/transmission-4.0.1-r1 b/metadata/md5-cache/net-p2p/transmission-4.0.1-r1
deleted file mode 100644
index b381be34e163..000000000000
--- a/metadata/md5-cache/net-p2p/transmission-4.0.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( gtk? ( sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
-DESCRIPTION=A fast, easy, and free BitTorrent client
-EAPI=8
-HOMEPAGE=https://transmissionbt.com/
-INHERIT=cmake flag-o-matic tmpfiles systemd xdg-utils
-IUSE=appindicator cli debug gtk nls mbedtls qt5 systemd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
-RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/transmission/transmission/releases/download/4.0.1/transmission-4.0.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1849f7b35efb40ba4ccf7a18e635ace2
diff --git a/metadata/md5-cache/net-p2p/transmission-4.0.1-r2 b/metadata/md5-cache/net-p2p/transmission-4.0.1-r2
new file mode 100644
index 000000000000..68a334e5a88f
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/transmission-4.0.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( gtk? ( sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
+DESCRIPTION=A fast, easy, and free BitTorrent client
+EAPI=8
+HOMEPAGE=https://transmissionbt.com/
+INHERIT=cmake flag-o-matic tmpfiles systemd xdg-utils
+IUSE=appindicator cli debug gtk nls mbedtls qt5 systemd test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
+RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/transmission/transmission/releases/download/4.0.1/transmission-4.0.1.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6fcfa53e82e7e80359a701ece389b7b7
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 694dbd5d105f..d7934965b452 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig nls? ( gtk? ( sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
+DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=8
 HOMEPAGE=https://transmissionbt.com/
@@ -8,8 +8,8 @@ INHERIT=cmake flag-o-matic tmpfiles systemd xdg-utils git-r3
 IUSE=appindicator cli debug gtk nls mbedtls qt5 systemd test
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
+RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1849f7b35efb40ba4ccf7a18e635ace2
+_md5_=6fcfa53e82e7e80359a701ece389b7b7
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 1aaf8a688c44..3f46a5ea90b9 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.17-r1 b/metadata/md5-cache/net-print/cups-filters-1.28.17-r1
new file mode 100644
index 000000000000..7408d415c01d
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.17-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.18.3 virtual/pkgconfig test? ( media-fonts/dejavu ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib exif? ( media-libs/libexif ) dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( media-libs/libjpeg-turbo:= ) ldap? ( net-nds/openldap:= ) pdf? ( app-text/mupdf:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:= ) zeroconf? ( net-dns/avahi[dbus] )
+DESCRIPTION=Cups filters
+EAPI=8
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
+INHERIT=perl-module systemd flag-o-matic
+IUSE=dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib exif? ( media-libs/libexif ) dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( media-libs/libjpeg-turbo:= ) ldap? ( net-nds/openldap:= ) pdf? ( app-text/mupdf:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:= ) zeroconf? ( net-dns/avahi[dbus] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenPrinting/cups-filters/releases/download/1.28.17/cups-filters-1.28.17.tar.xz https://www.openprinting.org/download/cups-filters/cups-filters-1.28.17.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5beb6b4991c3bded8165cd000e13e2a8
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index d4a2717033c3..0620704aaf8c 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/i2pd-2.46.1 b/metadata/md5-cache/net-vpn/i2pd-2.46.1
new file mode 100644
index 000000000000..673d12da363b
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/i2pd-2.46.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=acct-user/i2pd acct-group/i2pd dev-libs/boost:= dev-libs/openssl:0=[-bindist(-)] sys-libs/zlib upnp? ( net-libs/miniupnpc:= )
+DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
+EAPI=8
+HOMEPAGE=https://github.com/PurpleI2P/i2pd
+INHERIT=cmake toolchain-funcs systemd
+IUSE=cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening +upnp
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=acct-user/i2pd acct-group/i2pd dev-libs/boost:= dev-libs/openssl:0=[-bindist(-)] sys-libs/zlib upnp? ( net-libs/miniupnpc:= )
+SLOT=0
+SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.46.1.tar.gz -> i2pd-2.46.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e7f2d353998e705e3cca4bcaa698df69
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 49889d9d995e..723addea31cf 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/blueberry-1.4.7 b/metadata/md5-cache/net-wireless/blueberry-1.4.7
deleted file mode 100644
index b4a226cac909..000000000000
--- a/metadata/md5-cache/net-wireless/blueberry-1.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
-DESCRIPTION=A Bluetooth configuration tool
-EAPI=8
-HOMEPAGE=https://github.com/linuxmint/blueberry
-INHERIT=gnome2-utils python-single-r1 xdg-utils
-IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/blueberry/archive/1.4.7.tar.gz -> blueberry-1.4.7.tar.gz
-_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dabe5af7999466bb50bba8a64d46bbcc
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.4.8 b/metadata/md5-cache/net-wireless/blueberry-1.4.8
new file mode 100644
index 000000000000..6663fc98eb1e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/blueberry-1.4.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] dev-python/python3-xapp[python_targets_python3_11(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools >=sys-apps/util-linux-2.31_rc1 x11-libs/libnotify[introspection] x11-misc/wmctrl
+DESCRIPTION=A Bluetooth configuration tool
+EAPI=8
+HOMEPAGE=https://github.com/linuxmint/blueberry
+INHERIT=gnome2-utils python-single-r1 xdg-utils
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] dev-python/python3-xapp[python_targets_python3_11(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools >=sys-apps/util-linux-2.31_rc1 x11-libs/libnotify[introspection] x11-misc/wmctrl
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/blueberry/archive/1.4.8.tar.gz -> blueberry-1.4.8.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=216dc3050da3a0f26f99fac003251d10
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 04f2ffbe4262..d8cb95912ef9 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/kstars-3.6.1 b/metadata/md5-cache/sci-astronomy/kstars-3.6.1
deleted file mode 100644
index e5f7373ddaab..000000000000
--- a/metadata/md5-cache/sci-astronomy/kstars-3.6.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdatavis3d-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwebsockets-5.15.5:5 >=dev-qt/qtwidgets-5.15.5: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/kio-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/kplotting-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 sys-libs/zlib fits? ( sci-libs/cfitsio:= ) indi? ( sci-libs/gsl:= >=sci-libs/indilib-1.9.1 sci-libs/libnova:= >=sci-libs/stellarsolver-2.2 ) password? ( dev-libs/qtkeychain:= ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib:= ) dev-cpp/eigen:3 >=dev-qt/qtconcurrent-5.15.5:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Desktop Planetarium
-EAPI=8
-HOMEPAGE=https://apps.kde.org/kstars/ https://edu.kde.org/kstars/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm kde.org optfeature
-IUSE=fits indi +password raw wcs debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=>=dev-qt/qtdatavis3d-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwebsockets-5.15.5:5 >=dev-qt/qtwidgets-5.15.5: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/kio-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/kplotting-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 sys-libs/zlib fits? ( sci-libs/cfitsio:= ) indi? ( sci-libs/gsl:= >=sci-libs/indilib-1.9.1 sci-libs/libnova:= >=sci-libs/stellarsolver-2.2 ) password? ( dev-libs/qtkeychain:= ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib:= ) >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtpositioning-5.15.5:5 >=dev-qt/qtquickcontrols-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=indi? ( fits )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/kstars/kstars-3.6.1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=065f6b560263edea1fdceb48010256c6
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 227a8d60dd99..dbdf7bf18a5e 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/bc-gh-6.3.1 b/metadata/md5-cache/sci-calculators/bc-gh-6.3.1
new file mode 100644
index 000000000000..3e5ee0dab103
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/bc-gh-6.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure test
+DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( sys-libs/readline:= sys-libs/ncurses:= )
+DESCRIPTION=Implementation of POSIX bc with GNU extensions
+EAPI=8
+HOMEPAGE=https://git.gavinhoward.com/gavin/bc/ https://github.com/gavinhoward/bc/
+IUSE=libedit readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( sys-libs/readline:= sys-libs/ncurses:= )
+SLOT=0
+SRC_URI=https://github.com/gavinhoward/bc/releases/download/6.3.1/bc-6.3.1.tar.xz
+_md5_=cf035a84e3623937df148e751018c44b
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 91e8f2d4eaec..21d1b63be00a 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/chemex-2022.0.1-r1 b/metadata/md5-cache/sci-chemistry/chemex-2022.0.1-r1
deleted file mode 100644
index bb03c15cf486..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemex-2022.0.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] )
-DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
-EAPI=8
-HOMEPAGE=https://github.com/gbouvignies/chemex
-INHERIT=distutils-r1
-IUSE=test test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.0.1.tar.gz -> chemex-2022.0.1.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=36af9a222bdf212c884b7064d6025a64
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2022.1.0 b/metadata/md5-cache/sci-chemistry/chemex-2022.1.0
deleted file mode 100644
index ad609247b898..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemex-2022.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_9(-)] >=dev-python/numpy-1.23.4[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_9(-)] >=dev-python/rich-12.6.0[python_targets_python3_9(-)] >=dev-python/scipy-1.9.3[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)] >=dev-python/numpy-1.23.4[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_10(-)] >=dev-python/rich-12.6.0[python_targets_python3_10(-)] >=dev-python/scipy-1.9.3[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_9(-)] >=dev-python/numpy-1.23.4[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_9(-)] >=dev-python/rich-12.6.0[python_targets_python3_9(-)] >=dev-python/scipy-1.9.3[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)] >=dev-python/numpy-1.23.4[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_10(-)] >=dev-python/rich-12.6.0[python_targets_python3_10(-)] >=dev-python/scipy-1.9.3[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] )
-DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
-EAPI=8
-HOMEPAGE=https://github.com/gbouvignies/chemex
-INHERIT=distutils-r1
-IUSE=test test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_9(-)] >=dev-python/numpy-1.23.4[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_9(-)] >=dev-python/rich-12.6.0[python_targets_python3_9(-)] >=dev-python/scipy-1.9.3[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.1[python_targets_python3_10(-)] >=dev-python/numpy-1.23.4[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.11.0[python_targets_python3_10(-)] >=dev-python/rich-12.6.0[python_targets_python3_10(-)] >=dev-python/scipy-1.9.3[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.1.0.tar.gz -> chemex-2022.1.0.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=baa6d065a5d7949a7225fde3814f578a
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2022.3.0 b/metadata/md5-cache/sci-chemistry/chemex-2022.3.0
new file mode 100644
index 000000000000..ba29f2e65b45
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2022.3.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_9(-)] >=dev-python/numpy-1.24.1[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_9(-)] >=dev-python/rich-13.0.0[python_targets_python3_9(-)] >=dev-python/scipy-1.10.0[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_10(-)] >=dev-python/numpy-1.24.1[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_10(-)] >=dev-python/rich-13.0.0[python_targets_python3_10(-)] >=dev-python/scipy-1.10.0[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_11(-)] >=dev-python/numpy-1.24.1[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_11(-)] >=dev-python/rich-13.0.0[python_targets_python3_11(-)] >=dev-python/scipy-1.10.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_9(-)] >=dev-python/numpy-1.24.1[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_9(-)] >=dev-python/rich-13.0.0[python_targets_python3_9(-)] >=dev-python/scipy-1.10.0[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_10(-)] >=dev-python/numpy-1.24.1[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_10(-)] >=dev-python/rich-13.0.0[python_targets_python3_10(-)] >=dev-python/scipy-1.10.0[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_11(-)] >=dev-python/numpy-1.24.1[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_11(-)] >=dev-python/rich-13.0.0[python_targets_python3_11(-)] >=dev-python/scipy-1.10.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+INHERIT=distutils-r1
+IUSE=test test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_9(-)] >=dev-python/numpy-1.24.1[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_9(-)] >=dev-python/rich-13.0.0[python_targets_python3_9(-)] >=dev-python/scipy-1.10.0[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_10(-)] >=dev-python/numpy-1.24.1[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_10(-)] >=dev-python/rich-13.0.0[python_targets_python3_10(-)] >=dev-python/scipy-1.10.0[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.1.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.6.2[python_targets_python3_11(-)] >=dev-python/numpy-1.24.1[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-2.13.7[python_targets_python3_11(-)] >=dev-python/rich-13.0.0[python_targets_python3_11(-)] >=dev-python/scipy-1.10.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.3.0.tar.gz -> chemex-2022.3.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d44a4386c4166c3ccea3663e1fa52e9f
diff --git a/metadata/md5-cache/sci-chemistry/dssp-4.0.4 b/metadata/md5-cache/sci-chemistry/dssp-4.0.4
deleted file mode 100644
index 6a3b8ab6b168..000000000000
--- a/metadata/md5-cache/sci-chemistry/dssp-4.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/boost:=[zlib] >=sci-libs/libcifpp-2.0.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The protein secondary structure standard
-EAPI=8
-HOMEPAGE=https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/PDB-REDO/dssp
-INHERIT=cmake
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/boost:=[zlib] >=sci-libs/libcifpp-2.0.0
-SLOT=0
-SRC_URI=https://github.com/PDB-REDO/dssp/archive/refs/tags/4.0.4.tar.gz -> dssp-4.0.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9b60c6ac62e034d04793a15e17516aaa
diff --git a/metadata/md5-cache/sci-chemistry/dssp-4.2.2.1 b/metadata/md5-cache/sci-chemistry/dssp-4.2.2.1
new file mode 100644
index 000000000000..3d3279bf0500
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/dssp-4.2.2.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/boost:=[zlib] >=dev-libs/libmcfp-1.2.2 >=sci-libs/libcifpp-5.0.8 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=The protein secondary structure standard
+EAPI=8
+HOMEPAGE=https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/PDB-REDO/dssp
+INHERIT=cmake
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/boost:=[zlib] >=dev-libs/libmcfp-1.2.2 >=sci-libs/libcifpp-5.0.8
+SLOT=0
+SRC_URI=https://github.com/PDB-REDO/dssp/archive/refs/tags/v4.2.2.1.tar.gz -> dssp-4.2.2.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=672be11d9cf1f1162f4eef0f215b3a9a
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 1adc94d7de55..91560d788e1f 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/klayout-0.27.10 b/metadata/md5-cache/sci-electronics/klayout-0.27.10
index d0bf545edaf8..7c5837264ae7 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.27.10
+++ b/metadata/md5-cache/sci-electronics/klayout-0.27.10
@@ -12,5 +12,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[w
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0e7b6a6d62743f94f2f9fc16b9f5181b
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.27.12 b/metadata/md5-cache/sci-electronics/klayout-0.27.12
index d608ddc49f86..6a7ebc24f646 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.27.12
+++ b/metadata/md5-cache/sci-electronics/klayout-0.27.12
@@ -12,5 +12,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[w
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=617c93ea05e54bc8189f7a3768035874
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index 0fddec8c431d..e26d0579389d 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( ruby_targets_ruby27 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=617c93ea05e54bc8189f7a3768035874
diff --git a/metadata/md5-cache/sci-electronics/pulseview-0.4.2-r1 b/metadata/md5-cache/sci-electronics/pulseview-0.4.2-r1
index 69b9f3f1764f..525fe98b800d 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-0.4.2-r1
+++ b/metadata/md5-cache/sci-electronics/pulseview-0.4.2-r1
@@ -2,7 +2,7 @@ BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-u
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.5.1:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.5.2:= )
 DESCRIPTION=Qt based logic analyzer GUI for sigrok
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/PulseView
 INHERIT=cmake xdg-utils
 IUSE=+decode static
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.5.1:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.5.2:= )
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/pulseview/pulseview-0.4.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=20894a5ea2f1f3671ccac48d9c834212
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0d2c7fb282febef5225496d2542a15b3
diff --git a/metadata/md5-cache/sci-electronics/pulseview-9999 b/metadata/md5-cache/sci-electronics/pulseview-9999
index 498dc0bb4cc3..e349073ca309 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-9999
+++ b/metadata/md5-cache/sci-electronics/pulseview-9999
@@ -2,7 +2,7 @@ BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-u
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.6.0:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
 DESCRIPTION=Qt based logic analyzer GUI for sigrok
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/PulseView
 INHERIT=cmake xdg-utils git-r3
 IUSE=+decode static
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.6.0:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=64a00dad23a6cc59ac98863652366385
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3470d8ea5833b73cc1d415a24f1692d3
diff --git a/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.2-r1 b/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.2-r1
index df18e154f277..352debc96769 100644
--- a/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.2-r1
+++ b/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure postinst postrm prepare
 DEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:= ) virtual/pkgconfig
 DESCRIPTION=Command-line client for the sigrok logic analyzer software
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Sigrok-cli
 INHERIT=xdg-utils
 IUSE=+decode
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/sigrok-cli/sigrok-cli-0.7.2.tar.gz
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5f58df3c7b6c2134a1a02477972e9938
+_md5_=077d3b80fc81c05338c0541a0b46c71c
diff --git a/metadata/md5-cache/sci-electronics/sigrok-cli-9999 b/metadata/md5-cache/sci-electronics/sigrok-cli-9999
index 0394d5226956..591eb68879aa 100644
--- a/metadata/md5-cache/sci-electronics/sigrok-cli-9999
+++ b/metadata/md5-cache/sci-electronics/sigrok-cli-9999
@@ -2,7 +2,7 @@ BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patche
 DEFINED_PHASES=configure postinst postrm prepare unpack
 DEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:= ) virtual/pkgconfig
 DESCRIPTION=Command-line client for the sigrok logic analyzer software
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Sigrok-cli
 INHERIT=xdg-utils git-r3 autotools
 IUSE=+decode
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:= )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5f58df3c7b6c2134a1a02477972e9938
+_md5_=077d3b80fc81c05338c0541a0b46c71c
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 84dbe5e74931..b7db86ee9428 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/caffe2-1.13.1-r1 b/metadata/md5-cache/sci-libs/caffe2-1.13.1-r1
deleted file mode 100644
index 40e43c6d9bc2..000000000000
--- a/metadata/md5-cache/sci-libs/caffe2-1.13.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack >=sci-libs/onnx-1.12.0 sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers sci-libs/kineto python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] )
-DESCRIPTION=A deep learning framework
-EAPI=8
-HOMEPAGE=https://pytorch.org/
-INHERIT=python-single-r1 cmake flag-o-matic
-IUSE=cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack >=sci-libs/onnx-1.12.0 sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ffmpeg? ( opencv )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v1.13.1.tar.gz -> pytorch-1.13.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=573a854fb3f598df85a1c1365108577c
diff --git a/metadata/md5-cache/sci-libs/caffe2-1.13.1-r4 b/metadata/md5-cache/sci-libs/caffe2-1.13.1-r4
new file mode 100644
index 000000000000..73a9fe05ae4e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/caffe2-1.13.1-r4
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack >=sci-libs/onnx-1.12.0 sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 <dev-util/nvidia-cuda-toolkit-12:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) mpi? ( sys-cluster/openmpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) tensorpipe? ( sci-libs/tensorpipe ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen cuda? ( dev-libs/cutlass ) dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers sci-libs/kineto python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] )
+DESCRIPTION=A deep learning framework
+EAPI=8
+HOMEPAGE=https://pytorch.org/
+INHERIT=python-single-r1 cmake cuda flag-o-matic
+IUSE=cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack >=sci-libs/onnx-1.12.0 sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 <dev-util/nvidia-cuda-toolkit-12:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) mpi? ( sys-cluster/openmpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) tensorpipe? ( sci-libs/tensorpipe ) xnnpack? ( sci-libs/XNNPACK )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ffmpeg? ( opencv ) mpi? ( distributed ) tensorpipe? ( distributed )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v1.13.1.tar.gz -> pytorch-1.13.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d79f3ff0bb362a7706196b8ddafc6f73
diff --git a/metadata/md5-cache/sci-libs/gsl-2.7.1-r1 b/metadata/md5-cache/sci-libs/gsl-2.7.1-r1
deleted file mode 100644
index 46b300b8b30c..000000000000
--- a/metadata/md5-cache/sci-libs/gsl-2.7.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare test
-DEPEND=cblas-external? ( virtual/cblas:= )
-DESCRIPTION=The GNU Scientific Library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsl/
-INHERIT=autotools flag-o-matic toolchain-funcs
-IUSE=cblas-external +deprecated static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=cblas-external? ( virtual/cblas:= )
-SLOT=0/27
-SRC_URI=mirror://gnu/gsl/gsl-2.7.1.tar.gz https://dev.gentoo.org/~sam/distfiles/sci-libs/gsl/gsl-2.7-cblas.patch.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=abdb804c1384142f5facb215c5767983
diff --git a/metadata/md5-cache/sci-libs/gsl-2.7.1-r2 b/metadata/md5-cache/sci-libs/gsl-2.7.1-r2
new file mode 100644
index 000000000000..58214b476ce5
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/gsl-2.7.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare test
+DEPEND=cblas-external? ( virtual/cblas:= )
+DESCRIPTION=The GNU Scientific Library
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/gsl/
+INHERIT=autotools flag-o-matic toolchain-funcs
+IUSE=cblas-external +deprecated static-libs
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=cblas-external? ( virtual/cblas:= )
+SLOT=0/27
+SRC_URI=mirror://gnu/gsl/gsl-2.7.1.tar.gz https://dev.gentoo.org/~sam/distfiles/sci-libs/gsl/gsl-2.7-cblas.patch.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=19b05cabb4d7d04226e022ac5ab4a7ca
diff --git a/metadata/md5-cache/sci-libs/libbraiding-1.2 b/metadata/md5-cache/sci-libs/libbraiding-1.2
new file mode 100644
index 000000000000..9255b7b9960a
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libbraiding-1.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Expose the functionality of cbraid as a shared library
+EAPI=8
+HOMEPAGE=https://github.com/miguelmarco/libbraiding
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/miguelmarco/libbraiding/releases/download/1.2/libbraiding-1.2.tar.gz
+_md5_=fb40664ec7951652240d148d5ca36d38
diff --git a/metadata/md5-cache/sci-libs/libcifpp-5.0.8 b/metadata/md5-cache/sci-libs/libcifpp-5.0.8
new file mode 100644
index 000000000000..9800dc835dcb
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libcifpp-5.0.8
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=
+DESCRIPTION=Code to work with mmCIF and PDB files
+EAPI=8
+HOMEPAGE=https://github.com/PDB-REDO/libcifpp
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/boost:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PDB-REDO/libcifpp/archive/refs/tags/v5.0.8.tar.gz -> libcifpp-5.0.8.tar.gz https://dev.gentoo.org/~pacho/libcifpp/libcifpp-5.0.8-components.cif.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=68667b23e90b7aeb3d505b44efd83a34
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
deleted file mode 100644
index 5223f0deaa4e..000000000000
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.8:* ) python? ( >=dev-lang/swig-3.0.6 dev-python/numpy[python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_9(-)?] ) test? ( >=dev-libs/check-0.9.4 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Basic hardware drivers for logic analyzers and input/output file format support
-EAPI=7
-HOMEPAGE=https://sigrok.org/wiki/Libsigrok
-INHERIT=python-r1 java-pkg-opt-2 udev xdg-utils
-IUSE=+cxx ftdi java parport python serial static-libs test +udev usb python_targets_python3_9 java
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=0/4
-SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c9d11eea6aeca15a27134aaffdacb8ae
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
index 5f822d2e0c68..173824a74385 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.8:* ) python? ( >=dev-lang/swig-3.0.6 dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/check-0.9.4 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.8:* ) python? ( >=dev-lang/swig-3.0.6 dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-libs/check-0.9.4 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Basic hardware drivers for logic analyzers and input/output file format support
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Libsigrok
 INHERIT=autotools python-r1 java-pkg-opt-2 udev xdg-utils
-IUSE=bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb python_targets_python3_9 python_targets_python3_10 java
+IUSE=bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 java
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
-RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_9 python_targets_python3_10 ) )
+RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=90d4aa16ee0f27efba7a3b7f76af5993
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=aa0f13373f2fd281789895da6600765e
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index 06b9380fafd4..e87f558079e6 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) nettle? ( dev-libs/nettle:= ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.8:* ) python? ( >=dev-lang/swig-3.0.6 dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/check-0.9.4 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) nettle? ( dev-libs/nettle:= ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.8:* ) python? ( >=dev-lang/swig-3.0.6 dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-libs/check-0.9.4 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Basic hardware drivers for logic analyzers and input/output file format support
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Libsigrok
 INHERIT=python-r1 java-pkg-opt-2 udev xdg-utils git-r3 autotools
-IUSE=bluetooth +cxx ftdi hidapi java nettle parport python serial static-libs test +udev usb python_targets_python3_9 python_targets_python3_10 java
+IUSE=bluetooth +cxx ftdi hidapi java nettle parport python serial static-libs test +udev usb python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 java
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) nettle? ( dev-libs/nettle:= ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) nettle? ( dev-libs/nettle:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_9 python_targets_python3_10 ) )
+RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) nettle? ( dev-libs/nettle:= ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) nettle? ( dev-libs/nettle:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1043c393fa8f845cb182caa01431ef8c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2fa4331be94a804eda627dc4b06e3dd1
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3-r2 b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3-r2
index 5cf5b483e1bc..1d7039343ca2 100644
--- a/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3-r2
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3-r2
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-libs/glib-2.34.0
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.34.0
 DESCRIPTION=Provide (streaming) protocol decoding functionality
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
 INHERIT=autotools python-single-r1
-IUSE=static-libs python_single_target_python3_9 python_single_target_python3_10
+IUSE=static-libs python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-libs/glib-2.34.0
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.34.0
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.5.3.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=990e56b2065d26de9175299afdb97a0f
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5d3cb5cddc5ec6e8cb0a91e809dd75ee
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-9999 b/metadata/md5-cache/sci-libs/libsigrokdecode-9999
index 0e7515bb7d00..ae261642aa1c 100644
--- a/metadata/md5-cache/sci-libs/libsigrokdecode-9999
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup test unpack
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-libs/glib-2.34.0
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.34.0
 DESCRIPTION=Provide (streaming) protocol decoding functionality
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
 INHERIT=autotools python-single-r1 git-r3
-IUSE=static-libs python_single_target_python3_9 python_single_target_python3_10
+IUSE=static-libs python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-libs/glib-2.34.0
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.34.0
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/9999
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=647912d2292470951d9d8cac83b0a2e2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ab38c2e2f6b5a2da2be5b2f2f14b3e8d
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.5 b/metadata/md5-cache/sci-libs/vtk-9.2.5
index 161e567f2d8c..11307e3e1036 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.2.5
+++ b/metadata/md5-cache/sci-libs/vtk-9.2.5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9.2
 SRC_URI=https://www.vtk.org/files/release/9.2/VTK-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKDataFiles-9.2.5.tar.gz doc? ( https://www.vtk.org/files/release/9.2/vtkDocHtml-9.2.5.tar.gz ) examples? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz ) test? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	webapp	67df5bab481d0b9428f9ab7b3de690e4	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2204b3c7abb096bbafd1fb8fab2eeb53
+_md5_=f2a75bbb05b847e4eae3e1a9f91d6cad
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 3d92f89b872d..8ed93af7e8ae 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/hepmc-3.2.5_p20230225 b/metadata/md5-cache/sci-physics/hepmc-3.2.5_p20230225
new file mode 100644
index 000000000000..501c6ae45efd
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/hepmc-3.2.5_p20230225
@@ -0,0 +1,17 @@
+BDEPEND=root? ( sci-physics/root:= ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+DESCRIPTION=Event Record for Monte Carlo Generators
+EAPI=8
+HOMEPAGE=https://hepmc.web.cern.ch/hepmc/
+INHERIT=cmake python-single-r1
+IUSE=doc test examples python root python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://gitlab.cern.ch/hepmc/HepMC3/-/archive/e05d32ebac8705c0097e9e7d00ce815a205110db/HepMC3-e05d32ebac8705c0097e9e7d00ce815a205110db.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=55de4bee79a96b47d5c92333abbbbaa6
diff --git a/metadata/md5-cache/sci-physics/hepmc-9999 b/metadata/md5-cache/sci-physics/hepmc-9999
new file mode 100644
index 000000000000..a246651c17ed
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/hepmc-9999
@@ -0,0 +1,16 @@
+BDEPEND=root? ( sci-physics/root:= ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+DESCRIPTION=Event Record for Monte Carlo Generators
+EAPI=8
+HOMEPAGE=https://hepmc.web.cern.ch/hepmc/
+INHERIT=cmake python-single-r1 git-r3
+IUSE=doc test examples python root python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=3
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b89b83fe377062efad0a112e8e226907
diff --git a/metadata/md5-cache/sci-physics/root-6.26.08 b/metadata/md5-cache/sci-physics/root-6.26.08
index 6f0ac69506f3..4ca32f879d23 100644
--- a/metadata/md5-cache/sci-physics/root-6.26.08
+++ b/metadata/md5-cache/sci-physics/root-6.26.08
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6.26/08
 SRC_URI=https://root.cern/download/root_v6.26.08.source.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=30c414a1e6d2aa66a3bb634c48258a50
+_md5_=9e661f402c99843b60d67b184b19067f
diff --git a/metadata/md5-cache/sci-physics/root-6.26.9999 b/metadata/md5-cache/sci-physics/root-6.26.9999
index b67b208fad9e..0fd7712664e7 100644
--- a/metadata/md5-cache/sci-physics/root-6.26.9999
+++ b/metadata/md5-cache/sci-physics/root-6.26.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !o
 RESTRICT=test
 SLOT=6.26/9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=30c414a1e6d2aa66a3bb634c48258a50
+_md5_=9e661f402c99843b60d67b184b19067f
diff --git a/metadata/md5-cache/sci-physics/root-6.28.00 b/metadata/md5-cache/sci-physics/root-6.28.00
index 435102d48de8..e96c6370462a 100644
--- a/metadata/md5-cache/sci-physics/root-6.28.00
+++ b/metadata/md5-cache/sci-physics/root-6.28.00
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6/6.28.00
 SRC_URI=https://root.cern/download/root_v6.28.00.source.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=540eb582863da7af4d6cbac75d757caf
+_md5_=90a006eaa39f12576243e188197910cc
diff --git a/metadata/md5-cache/sci-physics/root-6.28.9999 b/metadata/md5-cache/sci-physics/root-6.28.9999
index 161368aa99c8..5c0470fb0b9d 100644
--- a/metadata/md5-cache/sci-physics/root-6.28.9999
+++ b/metadata/md5-cache/sci-physics/root-6.28.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !o
 RESTRICT=test
 SLOT=6/6.28.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=540eb582863da7af4d6cbac75d757caf
+_md5_=90a006eaa39f12576243e188197910cc
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index d14c22b108c5..ab6d46e07a40 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !o
 RESTRICT=test
 SLOT=6/9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=540eb582863da7af4d6cbac75d757caf
+_md5_=90a006eaa39f12576243e188197910cc
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 3562b2bd5510..4f5f18ce50fc 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/gcalc-3.1_rc1-r2 b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
index 48d63467274d..dcdb1d45b8a7 100644
--- a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
+++ b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://gcalc.net/files/GCalc-3.1-rc1.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
 _md5_=c7e5cc39217c49f76afad5deb4f69733
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 2614a17705a8..c1d7730472e0 100644
Binary files a/metadata/md5-cache/sec-keys/Manifest.gz and b/metadata/md5-cache/sec-keys/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6
new file mode 100644
index 000000000000..fe7f0ce01f89
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=10.1.6
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.6/KEYS -> openpgp-keys-apache-tomcat-10.1.6-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86
new file mode 100644
index 000000000000..ddd6a185f15d
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.86
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.86/KEYS -> openpgp-keys-apache-tomcat-8.5.86-KEYS.asc
+_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.72 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.72
new file mode 100644
index 000000000000..8a5e5ee70eae
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.72
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=9.0.72
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.72/KEYS -> openpgp-keys-apache-tomcat-9.0.72-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230207 b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230207
index a26f25b29d68..22226e8b49f9 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230207
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20230207
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by OpenSSL
 EAPI=8
 HOMEPAGE=https://www.openssl.net/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-8657ABB260F056B1E5190839D9C4D26D0E604491.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20230207-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc
-_md5_=7c699a53aec18245bf28ac57b32ee9cf
+_md5_=79dc78ab7cefda17bc778591193378d3
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 2abd25022893..c480d24eb816 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/accountsservice-22.08.8 b/metadata/md5-cache/sys-apps/accountsservice-22.08.8
deleted file mode 100644
index e850463713db..000000000000
--- a/metadata/md5-cache/sys-apps/accountsservice-22.08.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-libs/glib-2.63.5:2 sys-auth/polkit virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= )
-DESCRIPTION=D-Bus interfaces for querying and manipulating user account information
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
-INHERIT=meson python-any-r1 systemd
-IUSE=doc elogind gtk-doc +introspection selinux systemd test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.63.5:2 sys-auth/polkit virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) selinux? ( sec-policy/selinux-accountsd )
-REQUIRED_USE=^^ ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-22.08.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=05af1a2049a4889f41045ec9f85a26ea
diff --git a/metadata/md5-cache/sys-apps/accountsservice-22.08.8-r1 b/metadata/md5-cache/sys-apps/accountsservice-22.08.8-r1
new file mode 100644
index 000000000000..89d386eb260a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/accountsservice-22.08.8-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-libs/glib-2.63.5:2 sys-auth/polkit virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= )
+DESCRIPTION=D-Bus interfaces for querying and manipulating user account information
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
+INHERIT=meson python-any-r1 systemd
+IUSE=doc elogind gtk-doc +introspection selinux systemd test
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.63.5:2 sys-auth/polkit virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) selinux? ( sec-policy/selinux-accountsd )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-22.08.8.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=024a1e7457c41fa4151b3f165496664d
diff --git a/metadata/md5-cache/sys-apps/bat-0.22.1 b/metadata/md5-cache/sys-apps/bat-0.22.1
new file mode 100644
index 000000000000..31efb66eff42
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bat-0.22.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-libs/libgit2-1.1.0:=[threads] dev-libs/oniguruma:= sys-libs/zlib
+DESCRIPTION=cat(1) clone with syntax highlighting and Git integration
+EAPI=8
+HOMEPAGE=https://github.com/sharkdp/bat
+INHERIT=bash-completion-r1 cargo
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( MIT Apache-2.0 ) Apache-2.0 BSD-2 BSD CC0-1.0 LGPL-3+ MIT
+RDEPEND=>=dev-libs/libgit2-1.1.0:=[threads] dev-libs/oniguruma:= sys-libs/zlib !>app-backup/bacula-9.2[qt5]
+SLOT=0
+SRC_URI=https://github.com/sharkdp/bat/archive/v0.22.1.tar.gz -> bat-0.22.1.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.1.1/download -> ansi_colours-1.1.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bugreport/0.5.0/download -> bugreport-0.5.0.crate https://crates.io/api/v1/crates/bytemuck/1.7.3/download -> bytemuck-1.7.3.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.2.20/download -> clap-3.2.20.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/clircle/0.3.0/download -> clircle-0.3.0.crate https://crates.io/api/v1/crates/console/0.15.1/download -> console-0.15.1.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.3.0/download -> crc32fast-1.3.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/fancy-regex/0.7.1/download -> fancy-regex-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/git-version/0.3.5/download -> git-version-0.3.5.crate https://crates.io/api/v1/crates/git-version-macro/0.3.5/download -> git-version-macro-0.3.5.crate https://crates.io/api/v1/crates/git2/0.15.0/download -> git2-0.15.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.9/download -> globset-0.4.9.crate https://crates.io/api/v1/crates/grep-cli/0.1.6/download -> grep-cli-0.1.6.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.crate https://crates.io/api/v1/crates/libgit2-sys/0.14.0+1.5.0/download -> libgit2-sys-0.14.0+1.5.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/nix/0.24.2/download -> nix-0.24.2.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.13.1/download -> once_cell-1.13.1.crate https://crates.io/api/v1/crates/onig/6.3.1/download -> onig-6.3.1.crate https://crates.io/api/v1/crates/onig_sys/69.7.1/download -> onig_sys-69.7.1.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/path_abs/0.5.1/download -> path_abs-0.5.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/plist/1.3.1/download -> plist-1.3.1.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.4/download -> predicates-tree-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/quote/1.0.14/download -> quote-1.0.14.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rgb/0.8.31/download -> rgb-0.8.31.crate https://crates.io/api/v1/crates/rustversion/1.0.6/download -> rustversion-1.0.6.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/1.0.13/download -> semver-1.0.13.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde_derive/1.0.144/download -> serde_derive-1.0.144.crate https://crates.io/api/v1/crates/serde_json/1.0.74/download -> serde_json-1.0.74.crate https://crates.io/api/v1/crates/serde_yaml/0.8.24/download -> serde_yaml-0.8.24.crate https://crates.io/api/v1/crates/serial_test/0.6.0/download -> serial_test-0.6.0.crate https://crates.io/api/v1/crates/serial_test_derive/0.6.0/download -> serial_test_derive-0.6.0.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/std_prelude/0.2.12/download -> std_prelude-0.2.12.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/syntect/5.0.0/download -> syntect-5.0.0.crate https://crates.io/api/v1/crates/sys-info/0.9.1/download -> sys-info-0.9.1.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/termtree/0.2.3/download -> termtree-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.33/download -> thiserror-1.0.33.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.33/download -> thiserror-impl-1.0.33.crate https://crates.io/api/v1/crates/time/0.3.5/download -> time-0.3.5.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.1.0/download -> wild-2.1.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0a748c6d579f372df52f077041cd712e
diff --git a/metadata/md5-cache/sys-apps/bleachbit-4.4.2-r1 b/metadata/md5-cache/sys-apps/bleachbit-4.4.2-r1
new file mode 100644
index 000000000000..a3a95ad5cb34
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bleachbit-4.4.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mock[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) x11-libs/gtk+:3 python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] <dev-python/setuptools-65.7.1[python_targets_python3_11(-)] ) >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Clean junk to free disk space and to maintain privacy
+EAPI=8
+HOMEPAGE=https://www.bleachbit.org
+INHERIT=desktop distutils-r1 virtualx
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) x11-libs/gtk+:3 python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://download.bleachbit.org/bleachbit-4.4.2.tar.bz2
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=021046fbce0bd757566708239f891597
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.8.0 b/metadata/md5-cache/sys-apps/bubblewrap-0.8.0
new file mode 100644
index 000000000000..fedb7fd31857
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.8.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
+DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solution
+EAPI=8
+HOMEPAGE=https://github.com/containers/bubblewrap/
+INHERIT=linux-info meson
+IUSE=selinux suid
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.8.0/bubblewrap-0.8.0.tar.xz
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8e74873631a74b33cd123cfe282fdac1
diff --git a/metadata/md5-cache/sys-apps/fwupd-efi-1.4 b/metadata/md5-cache/sys-apps/fwupd-efi-1.4
index 61fc7e05305d..f81b5d2cb52f 100644
--- a/metadata/md5-cache/sys-apps/fwupd-efi-1.4
+++ b/metadata/md5-cache/sys-apps/fwupd-efi-1.4
@@ -4,11 +4,11 @@ DEPEND=sys-boot/gnu-efi
 DESCRIPTION=EFI executable for fwupd
 EAPI=8
 HOMEPAGE=https://fwupd.org
-INHERIT=meson python-any-r1
+INHERIT=meson python-any-r1 toolchain-funcs
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=!<sys-apps/fwupd-1.6.0
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd-efi/releases/download/1.4/fwupd-efi-1.4.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bca36699bc4a0462cc2adc94be25fe85
+_md5_=be317c6d315b23ce3e314b424269072f
diff --git a/metadata/md5-cache/sys-apps/grep-3.8_p20221230 b/metadata/md5-cache/sys-apps/grep-3.8_p20221230
deleted file mode 100644
index 8e8c128cb908..000000000000
--- a/metadata/md5-cache/sys-apps/grep-3.8_p20221230
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-grep ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] ) sparc? ( dev-libs/libsigsegv ) )
-DESCRIPTION=GNU regular expression matcher
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/grep/
-INHERIT=flag-o-matic verify-sig
-IUSE=+egrep-fgrep nls pcre static verify-sig
-LICENSE=GPL-3+
-RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
-REQUIRED_USE=static? ( !sparc )
-SLOT=0
-SRC_URI=https://meyering.net/grep/grep-3.8.11-908f.tar.xz verify-sig? ( https://meyering.net/grep/grep-3.8.11-908f.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=dc869a480b013bba0ccb66bb06bd0459
diff --git a/metadata/md5-cache/sys-apps/grep-3.8_p20230227 b/metadata/md5-cache/sys-apps/grep-3.8_p20230227
new file mode 100644
index 000000000000..2a5bb8cebeb8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/grep-3.8_p20230227
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-grep ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] ) sparc? ( dev-libs/libsigsegv ) )
+DESCRIPTION=GNU regular expression matcher
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/grep/
+INHERIT=flag-o-matic verify-sig
+IUSE=+egrep-fgrep nls pcre static verify-sig
+LICENSE=GPL-3+
+RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
+REQUIRED_USE=static? ( !sparc )
+SLOT=0
+SRC_URI=https://meyering.net/grep/grep-3.8.35-c860.tar.xz verify-sig? ( https://meyering.net/grep/grep-3.8.35-c860.tar.xz.sig )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=7125d47e3f7290df6447d22d236445b8
diff --git a/metadata/md5-cache/sys-apps/less-618_beta b/metadata/md5-cache/sys-apps/less-618_beta
deleted file mode 100644
index d9f6d634c206..000000000000
--- a/metadata/md5-cache/sys-apps/less-618_beta
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
-DESCRIPTION=Excellent text file viewer
-EAPI=8
-HOMEPAGE=http://www.greenwoodsoftware.com/less/
-INHERIT=autotools
-IUSE=pcre
-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-618-beta.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=88256faca6e878486cc53e9dd6c73a04
diff --git a/metadata/md5-cache/sys-apps/less-623_beta b/metadata/md5-cache/sys-apps/less-623_beta
deleted file mode 100644
index 1cf5c9cc5dfa..000000000000
--- a/metadata/md5-cache/sys-apps/less-623_beta
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5
-DEFINED_PHASES=configure install preinst prepare test
-DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:= pcre? ( dev-libs/libpcre2 )
-DESCRIPTION=Excellent text file viewer
-EAPI=8
-HOMEPAGE=http://www.greenwoodsoftware.com/less/
-INHERIT=autotools
-IUSE=pcre
-LICENSE=|| ( GPL-3 BSD-2 )
-RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:= pcre? ( dev-libs/libpcre2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.greenwoodsoftware.com/less/less-623-beta.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ed96011c0fe8532e7d8c52074cd04c85
diff --git a/metadata/md5-cache/sys-apps/less-629_beta b/metadata/md5-cache/sys-apps/less-629_beta
new file mode 100644
index 000000000000..0da341a78402
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/less-629_beta
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5
+DEFINED_PHASES=configure install preinst prepare test
+DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:= pcre? ( dev-libs/libpcre2 )
+DESCRIPTION=Excellent text file viewer
+EAPI=8
+HOMEPAGE=http://www.greenwoodsoftware.com/less/
+INHERIT=autotools
+IUSE=pcre
+LICENSE=|| ( GPL-3 BSD-2 )
+RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:= pcre? ( dev-libs/libpcre2 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.greenwoodsoftware.com/less/less-629-beta.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=eba16ef13255254a6da81cb81b015d3f
diff --git a/metadata/md5-cache/sys-apps/less-9999 b/metadata/md5-cache/sys-apps/less-9999
index 396b795c1e04..e1b6b1a76821 100644
--- a/metadata/md5-cache/sys-apps/less-9999
+++ b/metadata/md5-cache/sys-apps/less-9999
@@ -12,4 +12,4 @@ RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:= pcre? ( dev-libs/li
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ed96011c0fe8532e7d8c52074cd04c85
+_md5_=eba16ef13255254a6da81cb81b015d3f
diff --git a/metadata/md5-cache/sys-apps/lshw-02.19.2b_p20220831 b/metadata/md5-cache/sys-apps/lshw-02.19.2b_p20220831
new file mode 100644
index 000000000000..1c20fadad4f7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lshw-02.19.2b_p20220831
@@ -0,0 +1,16 @@
+BDEPEND=gtk? ( virtual/pkgconfig ) sqlite? ( virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DESCRIPTION=Hardware Lister
+EAPI=8
+HOMEPAGE=https://www.ezix.org/project/wiki/HardwareLiSter
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic plocale toolchain-funcs xdg
+IUSE=gtk sqlite static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-apps/hwdata gtk? ( x11-libs/gtk+:3 ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=static? ( !gtk !sqlite )
+SLOT=0
+SRC_URI=https://ezix.org/src/pkg/lshw/archive/42fef565731411a784101de614a54bff79d1858e.tar.gz -> lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=764470cd0da7a677fd156de5ab51546c
diff --git a/metadata/md5-cache/sys-apps/moar-1.12.0 b/metadata/md5-cache/sys-apps/moar-1.12.0
new file mode 100644
index 000000000000..5910e99a01a3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/moar-1.12.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A pager designed to do the right thing without any configuration
+EAPI=8
+HOMEPAGE=https://github.com/walles/moar
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=BSD-2 BSD MIT
+RDEPEND=!dev-lang/moarvm
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/walles/moar/archive/refs/tags/v1.12.0.tar.gz -> moar-1.12.0.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-apps/moar/moar-1.12.0-deps.tar.xz
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=c10fc1c90c4e26f38f30f26d4cb1751c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.20 b/metadata/md5-cache/sys-apps/pkgcore-0.12.20
new file mode 100644
index 000000000000..87c2006c895d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.20
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/flit_core-3.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.20.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=20fca59a6f529b3633f3e124c59f98fc
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.45.1-r2 b/metadata/md5-cache/sys-apps/portage-3.0.45.1-r2
new file mode 100644
index 000000000000..bd92a9dc5ea7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.45.1-r2
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[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[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=The package management and distribution system for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/coreutils-6.4 >=sys-apps/file-5.44-r3 )
+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-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=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_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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.11-r1:0=[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[bzip2(+),threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.45.1.tar.bz2
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=34b25d22a13c6dfae8d725205dfabe65
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 2394af730706..9410905dc68e 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=39f7fcf481d2ab0fb0317a5e56071227
+_md5_=90e74de82b5da5581a14987857661c40
diff --git a/metadata/md5-cache/sys-apps/systemd-253 b/metadata/md5-cache/sys-apps/systemd-253
deleted file mode 100644
index 46f8f589299b..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-253
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=http://systemd.io/
-INHERIT=bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-IUSE=acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v253/systemd-253.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c5bd5e26d670af858b05b1fe2991217e
diff --git a/metadata/md5-cache/sys-apps/systemd-253-r1 b/metadata/md5-cache/sys-apps/systemd-253-r1
new file mode 100644
index 000000000000..ccd0b66a755b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-253-r1
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=http://systemd.io/
+INHERIT=bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+IUSE=acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v253/systemd-253.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a8230ecee76013adf88766336a55aa49
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.38.1 b/metadata/md5-cache/sys-apps/util-linux-2.38.1
index fe4e9def81af..565397c4813d 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.38.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.38.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux
 INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript pam python-r1 multilib-minimal multiprocessing systemd verify-sig
 IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( 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(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) su? ( pam )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.sign )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=399d3db2df73d78b0db5ab1467ec6474
+_md5_=b1d02f9d4eda8bb4386d8c3f7c7d6ff9
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 4239e7d2f07c..b5018791e4f0 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/nss-pam-ldapd-0.9.12-r2 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.12-r2
index 93b60b2e6ba3..e9b77b8c16d7 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.12-r2
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.12-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://arthurdejong.org/nss-pam-ldapd/
 INHERIT=autotools python-r1 s6 systemd tmpfiles multilib-minimal
 IUSE=debug kerberos +pam pynslcd sasl test +utils python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-group/nslcd acct-user/nslcd 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(-)?] sasl? ( dev-libs/cyrus-sasl[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(-)?] ) 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(-)?] utils? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) pynslcd? ( dev-python/python-ldap[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-daemon[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !sys-auth/nss_ldap !sys-auth/pam_ldap virtual/tmpfiles
 REQUIRED_USE=utils? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) test? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) pynslcd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.12.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	s6	1871df76e59fa5c51359faaca02b385d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=54e004e384cd1b31943e6d598f9cbe3b
+_md5_=25bd10b8b29407feb2854fa2edda5b24
diff --git a/metadata/md5-cache/sys-auth/solo1-0.1.1-r1 b/metadata/md5-cache/sys-auth/solo1-0.1.1-r1
new file mode 100644
index 000000000000..7789fff382a8
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/solo1-0.1.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=CLI and Python library for SoloKeys Solo 1
+EAPI=8
+HOMEPAGE=https://github.com/solokeys/solo1-cli
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=Apache-2.0 MIT
+RDEPEND=>=dev-python/click-7.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ecdsa[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fido2:0/0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/intelhex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyserial[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyusb[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/s/solo1/solo1-0.1.1.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=aa75dd813bc61a1ed53ba4d06c46d115
diff --git a/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1 b/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
new file mode 100644
index 000000000000..3c8a6b17241b
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+DESCRIPTION=Utility to securely retrieve an SSH public key and install it locally
+EAPI=8
+HOMEPAGE=https://launchpad.net/ssh-import-id
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://launchpad.net/ssh-import-id/trunk/5.11/+download/ssh-import-id-5.11.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=166075949d17956338f61be112d096b6
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index f7fa79afbbb8..f62e2691b4b1 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/ndctl-76.1 b/metadata/md5-cache/sys-block/ndctl-76.1
new file mode 100644
index 000000000000..2432ce6c688d
--- /dev/null
+++ b/metadata/md5-cache/sys-block/ndctl-76.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/xmlto ) sys-devel/libtool virtual/pkgconfig virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=dev-libs/iniparser:0= dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= libtracefs? ( dev-libs/libtracefs:= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Helper tools and libraries for managing non-volatile memory on Linux
+EAPI=8
+HOMEPAGE=https://github.com/pmem/ndctl
+INHERIT=udev meson bash-completion-r1
+IUSE=doc libtracefs systemd test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT CC0-1.0
+RDEPEND=dev-libs/iniparser:0= dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= libtracefs? ( dev-libs/libtracefs:= ) systemd? ( sys-apps/systemd:= )
+RESTRICT=!test? ( test ) test
+SLOT=0/6
+SRC_URI=https://github.com/pmem/ndctl/archive/v76.1.tar.gz -> ndctl-76.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=3d4c0b4613b1208d3d4fb15baeef9490
diff --git a/metadata/md5-cache/sys-block/parted-3.5 b/metadata/md5-cache/sys-block/parted-3.5
index 25c3d00da5af..29d997df8d5c 100644
--- a/metadata/md5-cache/sys-block/parted-3.5
+++ b/metadata/md5-cache/sys-block/parted-3.5
@@ -1,15 +1,15 @@
-BDEPEND=nls? ( >=sys-devel/gettext-0.12.1-r2 ) verify-sig? ( sec-keys/openpgp-keys-bcl ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=nls? ( >=sys-devel/gettext-0.12.1-r2 ) verify-sig? ( sec-keys/openpgp-keys-bcl ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=>=sys-fs/e2fsprogs-1.27 sys-apps/util-linux device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-5.2:0= )
 DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parted/
-INHERIT=verify-sig
+INHERIT=autotools verify-sig
 IUSE=+debug device-mapper nls readline verify-sig
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=sys-fs/e2fsprogs-1.27 sys-apps/util-linux device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-5.2:0= )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.5.tar.xz verify-sig? ( mirror://gnu/parted/parted-3.5.tar.xz.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c210794b7472be0d3a5787e2dc913740
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=413d0b690076f0bc9fc2cccb082cb3c8
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.83 b/metadata/md5-cache/sys-block/tgt-1.0.83
deleted file mode 100644
index 0d45ecbe06fc..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.83
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-cluster/rdma-core )
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=7
-HOMEPAGE=http://stgt.sourceforge.net
-INHERIT=toolchain-funcs systemd
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-cluster/rdma-core ) dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/archive/v1.0.83.tar.gz -> tgt-1.0.83.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ff50f40adb5bd0243b62eb2aac08c494
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.84 b/metadata/md5-cache/sys-block/tgt-1.0.84
deleted file mode 100644
index bd9e05b68693..000000000000
--- a/metadata/md5-cache/sys-block/tgt-1.0.84
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-cluster/rdma-core )
-DESCRIPTION=Linux SCSI target framework (tgt)
-EAPI=7
-HOMEPAGE=http://stgt.sourceforge.net
-INHERIT=toolchain-funcs systemd
-IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-cluster/rdma-core ) dev-libs/libaio sys-apps/sg3_utils
-SLOT=0
-SRC_URI=https://github.com/fujita/tgt/archive/v1.0.84.tar.gz -> tgt-1.0.84.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a0940efe0468b84bbb7e362703bd6373
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.86 b/metadata/md5-cache/sys-block/tgt-1.0.86
index 377b573f8f13..59eeab6d750b 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.86
+++ b/metadata/md5-cache/sys-block/tgt-1.0.86
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://stgt.sourceforge.net
 INHERIT=toolchain-funcs systemd
 IUSE=fcoe fcp ibmvio infiniband rbd
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-cluster/rdma-core ) dev-libs/libaio sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://github.com/fujita/tgt/archive/v1.0.86.tar.gz -> tgt-1.0.86.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f29c203321b6202e16d9db2f443c336e
+_md5_=fa7b6281dc90d90133f67080d85f9594
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 2d0807ab8a48..9f25b1dafbcd 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/hpx-1.8.1 b/metadata/md5-cache/sys-cluster/hpx-1.8.1
index 40e1f5abe7e4..7f450ac669cf 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.8.1
+++ b/metadata/md5-cache/sys-cluster/hpx-1.8.1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.8.1.tar.gz -> hpx-1.8.1.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=70d96c3a2d20623c6472bf1727b8a81b
+_md5_=12afa16e84cc53277827d5e2b42d7019
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 036493c310f1..1655e3c86e29 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/clang-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
index 495de1533273..c6cf0602c70b 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=77df09abc2688e2dd9097d9bda100822
+_md5_=26c367d242e54669c25aac28cede3165
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-16.0.0_rc2
deleted file mode 100644
index e76862254699..000000000000
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_rc2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-16.0.0_rc2:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
-IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-16.0.0_rc2 sys-devel/clang-toolchain-symlinks:16
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-16.0.0_rc2:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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-devel/clang-common-16.0.0_rc2 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0_rc2[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=16/16
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e8fba527c0bc88fc719aace730830282
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
index 7d617c0ace97..e4110e908883 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=77df09abc2688e2dd9097d9bda100822
+_md5_=26c367d242e54669c25aac28cede3165
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230211 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230211
deleted file mode 100644
index 76d8a1b76be8..000000000000
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230211
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230211:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
-IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-17.0.0_pre20230211 sys-devel/clang-toolchain-symlinks:17
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-17.0.0_pre20230211:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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-devel/clang-common-17.0.0_pre20230211 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230211[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230211
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=231c45ca906f7121dc62b21be2f7ea93
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230218 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230218
deleted file mode 100644
index 68e370c8d46c..000000000000
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230218
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230218:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
-IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-17.0.0_pre20230218 sys-devel/clang-toolchain-symlinks:17
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-17.0.0_pre20230218:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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-devel/clang-common-17.0.0_pre20230218 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230218[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230218
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=231c45ca906f7121dc62b21be2f7ea93
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc2
deleted file mode 100644
index f06938415a5e..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_rc2 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=b4d8903ab2608fe3b404941de02fac40
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230211 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230211
deleted file mode 100644
index f699027c9320..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230211
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230211 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c8c0dd9d710e4a4a13ed2b914b9866d2
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230218 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230218
deleted file mode 100644
index 4747cd980a39..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230218
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230218 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c8c0dd9d710e4a4a13ed2b914b9866d2
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_rc2 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_rc2
deleted file mode 100644
index 938252a500c5..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize 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=~loong
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.0_rc2:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.0_rc2:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.0_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.0_rc2[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=sanitize? ( compiler-rt )
-SLOT=16
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4bde4e3ec743139da6bad5fb1f1b9c88
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230211 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230211
deleted file mode 100644
index ef39f49b4a5a..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230211
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-17.0.0_pre20230211:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.0_pre20230211:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230211[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-17.0.0_pre20230211[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=sanitize? ( compiler-rt )
-SLOT=17
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a2cbb671ba47f2c77b593a6e199d20d0
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230218 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230218
deleted file mode 100644
index 9f08b659cefd..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230218
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-17.0.0_pre20230218:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.0_pre20230218:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230218[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-17.0.0_pre20230218[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=sanitize? ( compiler-rt )
-SLOT=17
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a2cbb671ba47f2c77b593a6e199d20d0
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230225 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230225
new file mode 100644
index 000000000000..e28eaf7fcae4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230225
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+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 cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection
+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=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=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= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20230225/gcc-12-20230225.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-13.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-7.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	51f0678e2e1381b8304778eb5a6c85a3	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4b71fc1924353878d60a11d68a8fe985
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230226 b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230226
new file mode 100644
index 000000000000..7baaa9646362
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230226
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=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= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+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 cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection rust
+KEYWORDS=~loong
+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=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=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= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=13
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20230226/gcc-13-20230226.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-patches-8.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	51f0678e2e1381b8304778eb5a6c85a3	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1803c12ee7fa6419eebf5e127b4bd2b9
diff --git a/metadata/md5-cache/sys-devel/gettext-0.21.1 b/metadata/md5-cache/sys-devel/gettext-0.21.1
index 715cacbc7032..4e464a4c899b 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.21.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.21.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/gettext/
 INHERIT=java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs
 IUSE=acl +cxx doc emacs git java ncurses nls openmp static-libs 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 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=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(-)?] >=virtual/libintl-0-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(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
 _eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=d6c86e72d239c93c05822a452ab89081
+_md5_=c0662ecb5c3ef23b0cfe0d551563b902
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_rc2 b/metadata/md5-cache/sys-devel/lld-16.0.0_rc2
deleted file mode 100644
index 892df3fc05a2..000000000000
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.0_rc2[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.0_rc2[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-16.0.0_rc2[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-16.0.0_rc2[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=debug test zstd test verify-sig
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:16
-RDEPEND=~sys-devel/llvm-16.0.0_rc2[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=16/16
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230211 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230211
deleted file mode 100644
index 8fae2f67e41b..000000000000
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-17.0.0_pre20230211[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-17.0.0_pre20230211[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-17.0.0_pre20230211[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230211[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=debug test zstd test
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
-RDEPEND=~sys-devel/llvm-17.0.0_pre20230211[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230211
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230218 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230218
deleted file mode 100644
index 416072b88303..000000000000
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-17.0.0_pre20230218[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-17.0.0_pre20230218[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-17.0.0_pre20230218[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230218[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=debug test zstd test
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
-RDEPEND=~sys-devel/llvm-17.0.0_pre20230218[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230218
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
index b94350962ac2..724317923073 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cf0002658757642dda274a6d94c87f2a
+_md5_=e3fa1f37d07e819d02984749fe11bb78
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc2 b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc2
deleted file mode 100644
index fc014f71f935..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs flag-o-matic
-IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig 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=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:16 binutils-plugin? ( >=sys-devel/llvmgold-16 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=16/16
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c66f484d3faa6207f229330811256576
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
index 576bc81a3c71..2f49ad7200ea 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cf0002658757642dda274a6d94c87f2a
+_md5_=e3fa1f37d07e819d02984749fe11bb78
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230211 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230211
deleted file mode 100644
index 2d304127d08e..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230211
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs flag-o-matic
-IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230211
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cf0002658757642dda274a6d94c87f2a
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230218 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230218
deleted file mode 100644
index b957c9856638..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230218
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs flag-o-matic
-IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230218
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cf0002658757642dda274a6d94c87f2a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc2 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc2
deleted file mode 100644
index 1b9d88a0ccab..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-IUSE=verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c9d578123645e9827b6020e0dc4dd9b3
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230211 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230211
deleted file mode 100644
index a06b4e913d09..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230211
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230218 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230218
deleted file mode 100644
index 3705642a62f6..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230218
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/make-4.4 b/metadata/md5-cache/sys-devel/make-4.4
deleted file mode 100644
index d7c5f5641479..000000000000
--- a/metadata/md5-cache/sys-devel/make-4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=guile? ( >=dev-scheme/guile-1.8:= )
-DESCRIPTION=Standard tool to compile source trees
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/make/make.html
-INHERIT=flag-o-matic verify-sig
-IUSE=guile nls static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/make/make-4.4.tar.gz verify-sig? ( mirror://gnu/make/make-4.4.tar.gz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=b0bf2556259d9472e10bd43b18371490
diff --git a/metadata/md5-cache/sys-devel/make-4.4.0.90 b/metadata/md5-cache/sys-devel/make-4.4.0.90
deleted file mode 100644
index eca17fd2c2fc..000000000000
--- a/metadata/md5-cache/sys-devel/make-4.4.0.90
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=guile? ( >=dev-scheme/guile-1.8:= )
-DESCRIPTION=Standard tool to compile source trees
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/make/make.html
-INHERIT=flag-o-matic verify-sig
-IUSE=guile nls static verify-sig
-LICENSE=GPL-3+
-RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://alpha.gnu.org/gnu/make/make-4.4.0.90.tar.gz verify-sig? ( https://alpha.gnu.org/gnu/make/make-4.4.0.90.tar.gz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c5fc94c4f4d4a9eb1317263e26b27c48
diff --git a/metadata/md5-cache/sys-devel/make-4.4.0.91 b/metadata/md5-cache/sys-devel/make-4.4.0.91
deleted file mode 100644
index d36a26aa8e62..000000000000
--- a/metadata/md5-cache/sys-devel/make-4.4.0.91
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=guile? ( >=dev-scheme/guile-1.8:= )
-DESCRIPTION=Standard tool to compile source trees
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/make/make.html
-INHERIT=flag-o-matic verify-sig
-IUSE=guile nls static verify-sig
-LICENSE=GPL-3+
-RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://alpha.gnu.org/gnu/make/make-4.4.0.91.tar.gz verify-sig? ( https://alpha.gnu.org/gnu/make/make-4.4.0.91.tar.gz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=8d4012292b4929532e94d97990652d1a
diff --git a/metadata/md5-cache/sys-devel/make-4.4.1 b/metadata/md5-cache/sys-devel/make-4.4.1
new file mode 100644
index 000000000000..c868f341ec48
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/make-4.4.1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=guile? ( >=dev-scheme/guile-1.8:= )
+DESCRIPTION=Standard tool to compile source trees
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/make/make.html
+INHERIT=flag-o-matic verify-sig
+IUSE=guile nls static verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/make/make-4.4.1.tar.gz verify-sig? ( mirror://gnu/make/make-4.4.1.tar.gz.sig )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=8d4012292b4929532e94d97990652d1a
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 1e2c178b65cc..c615d50c37cc 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/sigrok-firmware-fx2lafw-0.1.7-r1 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.7-r1
index 0a0004f2d481..423a437c43a6 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.7-r1
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.7-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare unpack
 DEPEND=!binary? ( >=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)] )
 DESCRIPTION=Firmware for Cypress FX2 chips for use as simple logic analyzer hardware
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Fx2lafw
 IUSE=binary
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=binary? ( https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.7.tar.gz ) !binary? ( https://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7.tar.gz )
-_md5_=841adf2779564d37ddb9bf356544a654
+_md5_=eef0d6dce94fa2a5b0b07097d710a310
diff --git a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
index e18020270a4c..536ee91f7199 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
@@ -2,11 +2,11 @@ BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patche
 DEFINED_PHASES=install prepare unpack
 DEPEND=>=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]
 DESCRIPTION=Firmware for Cypress FX2 chips for use as simple logic analyzer hardware
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Fx2lafw
 INHERIT=git-r3 autotools
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=841adf2779564d37ddb9bf356544a654
+_md5_=eef0d6dce94fa2a5b0b07097d710a310
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 26724706fd16..1a315ee46a25 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/bcache-tools-1.1-r1 b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
index 79b732a2c191..1638838b37e6 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst postrm prepare
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) sys-apps/util-linux virtual/udev
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-apps/util-linux virtual/udev
 DESCRIPTION=Tools for bcache
 EAPI=8
 HOMEPAGE=https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/
 INHERIT=flag-o-matic python-r1 toolchain-funcs udev
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) sys-apps/util-linux virtual/udev
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-apps/util-linux virtual/udev
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-1.1.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=cb25e362704b78f8eab1d196ce17855c
+_md5_=4a6db365ef79a4a699fc72f2da93c48d
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-9999 b/metadata/md5-cache/sys-fs/bcache-tools-9999
index 3a2a85933e6a..60d57ad37afe 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-9999
+++ b/metadata/md5-cache/sys-fs/bcache-tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) sys-apps/util-linux virtual/udev
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-apps/util-linux virtual/udev
 DESCRIPTION=Tools for bcache
 EAPI=8
 HOMEPAGE=https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/
 INHERIT=flag-o-matic python-r1 toolchain-funcs udev git-r3
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) sys-apps/util-linux virtual/udev
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-apps/util-linux virtual/udev
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=ae6853747572a05fa1f0c1b2f8984bf8
+_md5_=7326e3ddac8cd191109b764e25d8b89b
diff --git a/metadata/md5-cache/sys-fs/lxcfs-5.0.2-r2 b/metadata/md5-cache/sys-fs/lxcfs-5.0.2-r2
deleted file mode 100644
index 06ce2f180660..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-5.0.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ) doc? ( sys-apps/help2man ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-fs/fuse:3
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=8
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
-INHERIT=cmake meson python-any-r1 systemd verify-sig
-IUSE=doc test verify-sig
-KEYWORDS=amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 LGPL-2+
-RDEPEND=sys-fs/fuse:3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=14daa9229c9b267ee450fb58d0f0c374
diff --git a/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r3 b/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r3
deleted file mode 100644
index 057b84b67500..000000000000
--- a/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-DESCRIPTION=Optional tools to help manage data in a mergerfs pool
-EAPI=8
-HOMEPAGE=https://github.com/trapexit/mergerfs-tools
-INHERIT=python-single-r1
-IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=ISC
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/mergerfs-tools/mergerfs-tools-0_p20210502.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bb15014d61433f962acedd1fd17caa8e
diff --git a/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r4 b/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r4
new file mode 100644
index 000000000000..89564cdfe634
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+DESCRIPTION=Optional tools to help manage data in a mergerfs pool
+EAPI=8
+HOMEPAGE=https://github.com/trapexit/mergerfs-tools
+INHERIT=python-single-r1
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=ISC
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/trapexit/mergerfs-tools/archive/ff4ef0355f699eb11f0d75471d3df44c303830a3.tar.gz -> mergerfs-tools-0_p20210502.gh.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9289b29095bcc1178a84faf825415f21
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.4 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.4
deleted file mode 100644
index 2405e8a6c0d9..000000000000
--- a/metadata/md5-cache/sys-fs/squashfs-tools-ng-1.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=A new set of tools for working with SquashFS images
-EAPI=7
-HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
-IUSE=lz4 +lzma lzo selinux +tools zstd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-3+ tools? ( GPL-3+ )
-RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzma? ( app-arch/xz-utils:= ) lzo? ( dev-libs/lzo:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
-SLOT=0
-SRC_URI=https://infraroot.at/pub/squashfs/squashfs-tools-ng-1.1.4.tar.xz
-_md5_=1aa4b8ac70836eb8a99ffb720212c99f
diff --git a/metadata/md5-cache/sys-fs/unionfs-fuse-3.3 b/metadata/md5-cache/sys-fs/unionfs-fuse-3.3
new file mode 100644
index 000000000000..2eed7c444f31
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/unionfs-fuse-3.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] ) ) )
+DEFINED_PHASES=compile install setup test
+DEPEND=sys-fs/fuse:3
+DESCRIPTION=Self-syncing tree-merging file system based on FUSE
+EAPI=8
+HOMEPAGE=https://github.com/rpodgorny/unionfs-fuse
+INHERIT=python-any-r1 toolchain-funcs
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD
+RDEPEND=sys-fs/fuse:3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rpodgorny/unionfs-fuse/archive/v3.3.tar.gz -> unionfs-fuse-3.3.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b1c9bc919cb980022c2fde9d9b7e288c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 68d7ce080a33..8d1c559431d6 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.302 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.302
index acafcd2bab03..c88498cd0414 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.302
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.302
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=hppa sparc
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.302
 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-313.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-313.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-313.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-313.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-313.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-313.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6877c3939eb8b9d3e2f6dc71ed981550
+_md5_=9bde15718527d6f02df8bcdefe549e29
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.304 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.304
deleted file mode 100644
index 4ee8e8006473..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.304
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.304
-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-315.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-315.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-315.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-315.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-315.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-315.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0dad2aa1783192fc804ab1b8b81c0b72
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.269 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.269
index a794084b44ec..6545d3b8e3d4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.269
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.269
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=hppa sparc
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.269
 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-268.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-268.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-268.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-268.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-268.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-268.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=60a07a5fdb91f00b7df1503b35468fd4
+_md5_=07c5ea9ccc0115d21941a2d07a4537fb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.271 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.271
deleted file mode 100644
index eba09aef291b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.271
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.271
-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-270.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-270.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-270.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-270.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-270.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-270.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=19fb1a3e95008db711815f7d8c47abbc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.163 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.163
index e00ef85f1294..60fb3db3c7ae 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.163
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.163
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=hppa sparc
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.163
 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-172.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-172.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-172.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-172.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-172.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-172.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c16c7d654c66c05aad164c6b911df3c5
+_md5_=838227465029495861734c2fd22db799
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.166 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.166
deleted file mode 100644
index 96e64a5a047b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.166
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.166
-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-175.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-175.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-175.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-175.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-175.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-175.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5c8fdf43d7e4b3bf7c3747baf8abf805
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.88 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.88
index a427d052865b..bfbdbe569ecc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.88
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.88
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=hppa sparc
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.15.88
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-92.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-92.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-92.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-92.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-92.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-92.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6b22fd838a622a294c1dca7f0594a97e
+_md5_=7fcb7aad2e1110440f54230712725d18
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.92 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.92
deleted file mode 100644
index ed4ab68c4944..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.92
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.15.92
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-96.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-96.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-96.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-96.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-96.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-96.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=086e45ba7928b3a73f084c2311bc9099
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.93 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.93
deleted file mode 100644
index ba5aa65fa585..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.93
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.15.93
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-97.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-97.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-97.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-97.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-97.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-97.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=553c68cb8bc0ecf5bc0da9945f0e8da8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.228 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.228
index 0ad40a9bc696..1ac333fd03fc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.228
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.228
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=hppa sparc
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.228
 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-233.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-233.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-233.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-233.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-233.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-233.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=543c295fcae3b89615f728077a56183b
+_md5_=050c4caf249ceee37c28af4427185a27
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.230 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.230
deleted file mode 100644
index a269cf36a7ab..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.230
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.230
-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-235.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-235.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-235.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-235.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-235.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-235.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3ee0012f5d34daa50b53733caa160a43
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.10
deleted file mode 100644
index 2513124b4052..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.1.10
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-12.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-12.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-12.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-12.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-12.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b745de63dbabe0c0a5bd47a26db380d9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.11 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.11
deleted file mode 100644
index 12e38e1f9112..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.1.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-13.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e86c50c5e09fc0e1a842fe3f60f8ab7c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1
index a37eb6e80bdc..0518ac7efef9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=6.2.1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-2.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7721a816fc6b948132f5a617c6baeca3
+_md5_=9a392485c5e2c3c6f61207f487e78a08
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-6.1 b/metadata/md5-cache/sys-kernel/linux-headers-6.1
index 03e746242ea9..df6f0a072bdb 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-6.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-6.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
 INHERIT=kernel-2
 IUSE=headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-kernel/linux-headers/gentoo-headers-6.1-0.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0f5524c7fc0e2f79eff1c8b5e897c47c
+_md5_=0d24601c02985b290c6a172e217fc572
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-6.2_p2 b/metadata/md5-cache/sys-kernel/pf-sources-6.2_p2
new file mode 100644
index 000000000000..c61a1f63fc22
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-6.2_p2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=8
+HOMEPAGE=https://pfkernel.natalenko.name/ https://dev.gentoo.org/~mpagano/genpatches/
+INHERIT=kernel-2 optfeature
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.2_p2
+SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v6.2-pf2.tar.gz -> linux-6.2-pf2.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.2-1.extras.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a50a62a63c0e644422bbe68863993a4f
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.15.95_p60 b/metadata/md5-cache/sys-kernel/rt-sources-5.15.95_p60
deleted file mode 100644
index 1b7f7e21dbbd..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.15.95_p60
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full Linux 5.15 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=8
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-INHERIT=kernel-2
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.15.95_p60
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.95.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.95-rt60.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.95-rt60.patch.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.15.96_p61 b/metadata/md5-cache/sys-kernel/rt-sources-5.15.96_p61
new file mode 100644
index 000000000000..69e83d6719bb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.15.96_p61
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full Linux 5.15 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=8
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+INHERIT=kernel-2
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15.96_p61
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.96.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.96-rt61.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.96-rt61.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a5db0a6cc2e0..5f07d5995763 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/compiler-rt-16.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc2
deleted file mode 100644
index a200e047c3ba..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.0*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=16
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7f1cfd6265c76cf75d7f4fcca558a9dc
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230211 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230211
deleted file mode 100644
index 47ae9aaac772..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230211
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-17.0.0*:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230218 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230218
deleted file mode 100644
index d3501e37dfa8..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230218
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-17.0.0*:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc2
deleted file mode 100644
index 5aa0a73446b0..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.0*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=16
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fce1412d6da5b3de84960351b38788f4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230211 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230211
deleted file mode 100644
index 7bd83ec2a615..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230211
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-17.0.0*:17 sys-libs/compiler-rt:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230218 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230218
deleted file mode 100644
index 0817f9de134e..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230218
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-17.0.0*:17 sys-libs/compiler-rt:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/glibc-2.36-r7 b/metadata/md5-cache/sys-libs/glibc-2.36-r7
index 782fd3b75333..f6682fb1b4d5 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.36-r7
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6d54e9cfff5e6d40c56b1a36593d269d
+_md5_=19958e589c266995de8a69778e84c37d
diff --git a/metadata/md5-cache/sys-libs/glibc-2.37 b/metadata/md5-cache/sys-libs/glibc-2.37
index c056ae417695..8efad8e14e7a 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.37
+++ b/metadata/md5-cache/sys-libs/glibc-2.37
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.37-patches-3.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9698f9bb2d6f808d42aa731df37bc04c
+_md5_=db516c64172240368c96d8814fc6f66a
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 32c395331272..7f6aa40ffa83 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fc50372e7eb38654ac9e63304107230
+_md5_=cd140db1e182c3e3372a7b90dbbd06b8
diff --git a/metadata/md5-cache/sys-libs/ldb-2.5.2 b/metadata/md5-cache/sys-libs/ldb-2.5.2
index 7d08f1921174..35c67c28fca0 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.5.2
+++ b/metadata/md5-cache/sys-libs/ldb-2.5.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://ldb.samba.org
 INHERIT=python-single-r1 waf-utils multilib-minimal
 IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.11.0[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:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) test? ( lmdb python )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.5.2
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.5.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=db1bca5fb625ebd43021a2247f0067df
+_md5_=77e4ee77a192f1a9532da066c5bdcfac
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.28-r1 b/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
new file mode 100644
index 000000000000..562defbbe5ef
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) test? ( python_single_target_python3_9? ( dev-libs/libbytesize[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/libbytesize[python,python_targets_python3_10(-)] ) sys-block/targetcli-fb ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+DESCRIPTION=A library for manipulating block devices
+EAPI=8
+HOMEPAGE=https://github.com/storaged-project/libblockdev
+INHERIT=autotools python-single-r1 xdg-utils
+IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) escrow? ( cryptsetup )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.28-1/libblockdev-2.28.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=36aa397ea52cb80421d488db99b893bb
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc2
deleted file mode 100644
index 43b646222ac4..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0_rc2[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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi 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 verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0_rc2[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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3b5d2a89f3ff0de6b78538deede4c459
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230211 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230211
deleted file mode 100644
index 372256469094..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230211[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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230211[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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230218 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230218
deleted file mode 100644
index cc18c1297b6f..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230218[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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230218[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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc2 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc2
deleted file mode 100644
index d633c46140c0..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang static-libs test 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 verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b954666ca4eb119a11c79056bb84e7da
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230211 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230211
deleted file mode 100644
index 3218ec36d344..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang static-libs test 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230218 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230218
deleted file mode 100644
index 03a961ac7c1b..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang static-libs test 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libnbd-1.14.1 b/metadata/md5-cache/sys-libs/libnbd-1.14.1
index 25d1169e7a2c..729c23a92f78 100644
--- a/metadata/md5-cache/sys-libs/libnbd-1.14.1
+++ b/metadata/md5-cache/sys-libs/libnbd-1.14.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/nbdkit/libnbd
 INHERIT=bash-completion-r1
 IUSE=fuse gnutls uri-support test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=fuse? ( sys-fs/fuse:3 ) gnutls? ( net-libs/gnutls:= ) uri-support? ( dev-libs/libxml2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libguestfs.org/libnbd/1.14-stable/libnbd-1.14.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5e3c6e1d998f5370f365fe726fcea518
+_md5_=ca8eeecfd3496338425487720e3afdff
diff --git a/metadata/md5-cache/sys-libs/libnvme-1.3 b/metadata/md5-cache/sys-libs/libnvme-1.3
deleted file mode 100644
index 53279da52403..000000000000
--- a/metadata/md5-cache/sys-libs/libnvme-1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/swig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/json-c:= dbus? ( sys-apps/dbus:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ssl? ( >=dev-libs/openssl-1.1:= ) uuid? ( sys-apps/util-linux:= )
-DESCRIPTION=C Library for NVM Express on Linux
-EAPI=8
-HOMEPAGE=https://github.com/linux-nvme/libnvme
-INHERIT=python-r1 meson
-IUSE=dbus python ssl +uuid python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/json-c:= dbus? ( sys-apps/dbus:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ssl? ( >=dev-libs/openssl-1.1:= ) uuid? ( sys-apps/util-linux:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/linux-nvme/libnvme/archive/refs/tags/v1.3.tar.gz -> libnvme-1.3.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5b7f5eaefcf53a517f723ed28392f2b8
diff --git a/metadata/md5-cache/sys-libs/libnvme-1.3-r1 b/metadata/md5-cache/sys-libs/libnvme-1.3-r1
new file mode 100644
index 000000000000..cc753e48b367
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libnvme-1.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/swig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/json-c:= dbus? ( sys-apps/dbus:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ssl? ( >=dev-libs/openssl-1.1:= ) uuid? ( sys-apps/util-linux:= )
+DESCRIPTION=C Library for NVM Express on Linux
+EAPI=8
+HOMEPAGE=https://github.com/linux-nvme/libnvme
+INHERIT=python-r1 meson
+IUSE=dbus python ssl +uuid python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/json-c:= dbus? ( sys-apps/dbus:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ssl? ( >=dev-libs/openssl-1.1:= ) uuid? ( sys-apps/util-linux:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+SLOT=0
+SRC_URI=https://github.com/linux-nvme/libnvme/archive/refs/tags/v1.3.tar.gz -> libnvme-1.3.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d5d0aeb523afc3768ead911db27ab0ad
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc2 b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc2
deleted file mode 100644
index d78433e2399e..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.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(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_rc2[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_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
-IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.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(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_rc2[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_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=daf52c08c30f40588169a0fc723248d1
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230211 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230211
deleted file mode 100644
index 0ffbfc5735d9..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.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(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230211[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_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
-IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.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(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230211[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_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0/17.0.0_pre20230211
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a0cdd8c99018970ca3b6ce691a94e76
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230218 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230218
deleted file mode 100644
index 7ee4cc2c0e01..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.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(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230218[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_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
-IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.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(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230218[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_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0/17.0.0_pre20230218
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a0cdd8c99018970ca3b6ce691a94e76
diff --git a/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1 b/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1
index ad2db04f710e..63ab92465363 100644
--- a/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1
+++ b/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=https://ieee1394.wiki.kernel.org/
 INHERIT=multilib-minimal
 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 ~loong ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e53b61e315062b695a982944752e8915
+_md5_=571b16d115f940b78217ee90b0da4fb4
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc2 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc2
deleted file mode 100644
index 79dd32f383d1..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang debug static-libs test 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 verify-sig
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc2/llvm-project-16.0.0rc2.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=18c4e40ac44a141aa1d0f2633a34cd9a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230211 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230211
deleted file mode 100644
index 414c1e0eacb1..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230211
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang debug static-libs test 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz -> llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230218 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230218
deleted file mode 100644
index cd35c20a0eb4..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230218
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang debug static-libs test 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz -> llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/minizip-ng-3.0.8 b/metadata/md5-cache/sys-libs/minizip-ng-3.0.8
index f6bdd3474b2d..630185ea27e6 100644
--- a/metadata/md5-cache/sys-libs/minizip-ng-3.0.8
+++ b/metadata/md5-cache/sys-libs/minizip-ng-3.0.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/zlib-ng/minizip-ng
 INHERIT=cmake
 IUSE=compat openssl test zstd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=ZLIB
 RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib-ng virtual/libiconv compat? ( !sys-libs/zlib[minizip] ) openssl? ( dev-libs/openssl:= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zlib-ng/minizip-ng/archive/refs/tags/3.0.8.tar.gz -> minizip-ng-3.0.8.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0fde41677f9527904310138781553587
+_md5_=7281834126c3286e162ecae912cee1b8
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.15 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.15
index 90b34b8ea932..e8df8c39480e 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.15
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.15
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cwrap.org/nss_wrapper.html
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.15.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=63927eb5d68009bc8520613954aa8ef3
+_md5_=98e7025db3426be11527c5c126871689
diff --git a/metadata/md5-cache/sys-libs/talloc-2.4.0 b/metadata/md5-cache/sys-libs/talloc-2.4.0
index f2952efb7945..f5bb523372cf 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.4.0
+++ b/metadata/md5-cache/sys-libs/talloc-2.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://talloc.samba.org/
 INHERIT=waf-utils python-single-r1 multilib-minimal
 IUSE=compat +python python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.4.0.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=2e028a02a65cbcc0d4b10267f5b3a549
+_md5_=25574d6d9fb017fc3043ea53908d8543
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.8 b/metadata/md5-cache/sys-libs/tdb-1.4.8
index 01e70eb593a6..59a83aac4982 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.4.8
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://tdb.samba.org/
 INHERIT=waf-utils multilib-minimal python-single-r1
 IUSE=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_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://samba.org/ftp/tdb/tdb-1.4.8.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=ec320db950dea98698e87973f356847d
+_md5_=088f1aa197cea88e0fa9c8d578027dac
diff --git a/metadata/md5-cache/sys-libs/tevent-0.14.1 b/metadata/md5-cache/sys-libs/tevent-0.14.1
index a90fa2b4a258..fbf74a00d616 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.14.1
+++ b/metadata/md5-cache/sys-libs/tevent-0.14.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://tevent.samba.org/
 INHERIT=waf-utils multilib-minimal python-single-r1
 IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.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(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=sys-libs/talloc-2.4.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://samba.org/ftp/tevent/tevent-0.14.1.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=c3efd1684b92d85bbd20b0d3fa76d228
+_md5_=a6762248be5785b641810d775544f95a
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.3.0 b/metadata/md5-cache/sys-libs/uid_wrapper-1.3.0
index ed3fdf346406..13b08d166b1d 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.3.0
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.3.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://cwrap.org/uid_wrapper.html
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.3.0.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.3.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=95e7101b808d0d038c58735f28bac465
+_md5_=eea5d863643a6b6d5186f9f78cf958d4
diff --git a/metadata/md5-cache/sys-libs/zlib-ng-2.0.6 b/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
index 9fd2a0648b42..6cc52045a24d 100644
--- a/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
+++ b/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/zlib-ng/zlib-ng
 INHERIT=cmake
 IUSE=compat cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4a cpu_flags_x86_pclmul cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx2 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=ZLIB
 RDEPEND=compat? ( !sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zlib-ng/zlib-ng/archive/2.0.6.tar.gz -> zlib-ng-2.0.6.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=62bec376fb2f149f90d16be3a09a1251
+_md5_=766d392a65aae81ed62672db00295ba0
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 1cb775ff5632..886fc126e9de 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/powertop-2.14 b/metadata/md5-cache/sys-power/powertop-2.14
deleted file mode 100644
index e2f2108af57b..000000000000
--- a/metadata/md5-cache/sys-power/powertop-2.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive >=sys-devel/gettext-0.20.2 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?]
-DESCRIPTION=tool to diagnose issues with power consumption and power management
-EAPI=7
-HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
-INHERIT=autotools linux-info
-IUSE=nls unicode X
-KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
-SLOT=0
-SRC_URI=https://github.com/fenrus75/powertop/archive/v2.14.tar.gz -> powertop-2.14.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6331ec8dcfd21c7cd725f3781bde3dd6
diff --git a/metadata/md5-cache/sys-power/powertop-2.15 b/metadata/md5-cache/sys-power/powertop-2.15
index f5cd32c0d9b2..64382f77d525 100644
--- a/metadata/md5-cache/sys-power/powertop-2.15
+++ b/metadata/md5-cache/sys-power/powertop-2.15
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
 INHERIT=autotools flag-o-matic linux-info
 IUSE=nls X
-KEYWORDS=amd64 arm ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/fenrus75/powertop/archive/v2.15.tar.gz -> powertop-2.15.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fa28ba25818ebd617c9011a5bcc06f7c
+_md5_=1b1b594bc31f8862e68f9ea714d1fecc
diff --git a/metadata/md5-cache/sys-power/switcheroo-control-2.6 b/metadata/md5-cache/sys-power/switcheroo-control-2.6
deleted file mode 100644
index 383f5949a611..000000000000
--- a/metadata/md5-cache/sys-power/switcheroo-control-2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=gtk-doc? ( dev-util/gtk-doc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ) dev-util/umockdev ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgudev-232:= sys-apps/systemd
-DESCRIPTION=D-Bus service to check the availability of dual-GPU
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/hadess/switcheroo-control/
-INHERIT=meson python-any-r1
-IUSE=gtk-doc test
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgudev-232:= sys-apps/systemd
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8282b4e474ca9ae14d9fc2c3da4cbd16
diff --git a/metadata/md5-cache/sys-power/switcheroo-control-2.6-r1 b/metadata/md5-cache/sys-power/switcheroo-control-2.6-r1
deleted file mode 100644
index 502f24ab974b..000000000000
--- a/metadata/md5-cache/sys-power/switcheroo-control-2.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen gtk-doc? ( dev-util/gtk-doc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ) dev-util/umockdev ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgudev-232:=
-DESCRIPTION=D-Bus service to check the availability of dual-GPU
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/hadess/switcheroo-control/
-INHERIT=meson python-any-r1 systemd
-IUSE=gtk-doc test
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgudev-232:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=61f3786c3aab2e06743fbb7d4fdd5948
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 16c502386816..c537ebba4261 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/bottom-0.6.8 b/metadata/md5-cache/sys-process/bottom-0.6.8
deleted file mode 100644
index 565e18988e1a..000000000000
--- a/metadata/md5-cache/sys-process/bottom-0.6.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=A graphical process/system monitor with a customizable interface
-EAPI=8
-HOMEPAGE=https://github.com/ClementTsang/bottom
-INHERIT=bash-completion-r1 cargo
-IUSE=+battery debug
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/addr2line/0.16.0/download -> addr2line-0.16.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.44/download -> anyhow-1.0.44.crate https://crates.io/api/v1/crates/assert_cmd/1.0.8/download -> assert_cmd-1.0.8.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-fs/1.5.0/download -> async-fs-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.4.0/download -> async-lock-2.4.0.crate https://crates.io/api/v1/crates/async-net/1.6.1/download -> async-net-1.6.1.crate https://crates.io/api/v1/crates/async-process/1.2.0/download -> async-process-1.2.0.crate https://crates.io/api/v1/crates/async-task/4.0.3/download -> async-task-4.0.3.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.61/download -> backtrace-0.3.61.crate https://crates.io/api/v1/crates/battery/0.7.8/download -> battery-0.7.8.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blocking/1.0.2/download -> blocking-1.0.2.crate https://crates.io/api/v1/crates/bottom/0.6.8/download -> bottom-0.6.8.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.71/download -> cc-1.0.71.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.2/download -> core-foundation-0.9.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.18.2/download -> crossterm-0.18.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.6.2/download -> crossterm_winapi-0.6.2.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/fastrand/1.5.0/download -> fastrand-1.5.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/futures/0.3.17/download -> futures-0.3.17.crate https://crates.io/api/v1/crates/futures-channel/0.3.17/download -> futures-channel-0.3.17.crate https://crates.io/api/v1/crates/futures-core/0.3.17/download -> futures-core-0.3.17.crate https://crates.io/api/v1/crates/futures-executor/0.3.17/download -> futures-executor-0.3.17.crate https://crates.io/api/v1/crates/futures-io/0.3.17/download -> futures-io-0.3.17.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.17/download -> futures-macro-0.3.17.crate https://crates.io/api/v1/crates/futures-sink/0.3.17/download -> futures-sink-0.3.17.crate https://crates.io/api/v1/crates/futures-task/0.3.17/download -> futures-task-0.3.17.crate https://crates.io/api/v1/crates/futures-timer/3.0.2/download -> futures-timer-3.0.2.crate https://crates.io/api/v1/crates/futures-util/0.3.17/download -> futures-util-0.3.17.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.25.0/download -> gimli-0.25.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heim/0.1.0-rc.1/download -> heim-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-common/0.1.0-rc.1/download -> heim-common-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-cpu/0.1.0-rc.1/download -> heim-cpu-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-disk/0.1.0-rc.1/download -> heim-disk-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-memory/0.1.0-rc.1/download -> heim-memory-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-net/0.1.0-rc.1/download -> heim-net-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-runtime/0.1.0-rc.1/download -> heim-runtime-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-sensors/0.1.0-rc.1/download -> heim-sensors-0.1.0-rc.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/instant/0.1.11/download -> instant-0.1.11.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.112/download -> libc-0.2.112.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/macaddr/1.0.1/download -> macaddr-1.0.1.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/nix/0.23.0/download -> nix-0.23.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.26.2/download -> object-0.26.2.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/polling/2.1.0/download -> polling-2.1.0.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates/2.0.3/download -> predicates-2.0.3.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.4/download -> predicates-tree-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.30/download -> proc-macro2-1.0.30.crate https://crates.io/api/v1/crates/procfs/0.11.0/download -> procfs-0.11.0.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.10/download -> signal-hook-0.3.10.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/smol/1.2.5/download -> smol-1.2.5.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.80/download -> syn-1.0.80.crate https://crates.io/api/v1/crates/sysinfo/0.23.0/download -> sysinfo-0.23.0.crate https://crates.io/api/v1/crates/termtree/0.2.1/download -> termtree-0.2.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.3.5/download -> time-0.3.5.crate https://crates.io/api/v1/crates/time-macros/0.2.3/download -> time-macros-0.2.3.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tui/0.14.0/download -> tui-0.14.0.crate https://crates.io/api/v1/crates/typed-builder/0.9.1/download -> typed-builder-0.9.1.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/uom/0.30.0/download -> uom-0.30.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0e312af1efa4a4a3b6a4c9b4a09ede3f
diff --git a/metadata/md5-cache/sys-process/bottom-0.8.0 b/metadata/md5-cache/sys-process/bottom-0.8.0
new file mode 100644
index 000000000000..c0c2660a0b4c
--- /dev/null
+++ b/metadata/md5-cache/sys-process/bottom-0.8.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A graphical process/system monitor with a customizable interface
+EAPI=8
+HOMEPAGE=https://github.com/ClementTsang/bottom
+INHERIT=bash-completion-r1 cargo
+IUSE=+battery debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/addr2line/0.19.0/download -> addr2line-0.19.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-fs/1.5.0/download -> async-fs-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-net/1.6.1/download -> async-net-1.6.1.crate https://crates.io/api/v1/crates/async-process/1.3.0/download -> async-process-1.3.0.crate https://crates.io/api/v1/crates/async-task/4.2.0/download -> async-task-4.2.0.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.67/download -> backtrace-0.3.67.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blocking/1.2.0/download -> blocking-1.2.0.crate https://crates.io/api/v1/crates/bottom/0.8.0/download -> bottom-0.8.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.12/download -> clap-3.1.12.crate https://crates.io/api/v1/crates/clap_complete/3.1.2/download -> clap_complete-3.1.2.crate https://crates.io/api/v1/crates/clap_lex/0.1.1/download -> clap_lex-0.1.1.crate https://crates.io/api/v1/crates/clap_mangen/0.1.6/download -> clap_mangen-0.1.6.crate https://crates.io/api/v1/crates/concat-string/1.0.1/download -> concat-string-1.0.1.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/const_format/0.2.30/download -> const_format-0.2.30.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.29/download -> const_format_proc_macros-0.2.29.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crossterm/0.25.0/download -> crossterm-0.25.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/ctrlc/3.2.4/download -> ctrlc-3.2.4.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fern/0.6.1/download -> fern-0.6.1.crate https://crates.io/api/v1/crates/filedescriptor/0.8.2/download -> filedescriptor-0.8.2.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/futures/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-timer/3.0.2/download -> futures-timer-3.0.2.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.27.0/download -> gimli-0.27.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heim/0.1.0-rc.1/download -> heim-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-common/0.1.0-rc.1/download -> heim-common-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-cpu/0.1.0-rc.1/download -> heim-cpu-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-disk/0.1.0-rc.1/download -> heim-disk-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-memory/0.1.0-rc.1/download -> heim-memory-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-net/0.1.0-rc.1/download -> heim-net-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-runtime/0.1.0-rc.1/download -> heim-runtime-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-sensors/0.1.0-rc.1/download -> heim-sensors-0.1.0-rc.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/kstring/2.0.0/download -> kstring-2.0.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/macaddr/1.0.1/download -> macaddr-1.0.1.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/mach2/0.4.1/download -> mach2-0.4.1.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nix/0.26.1/download -> nix-0.26.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.4.0/download -> ntapi-0.4.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.5/download -> num_threads-0.1.5.crate https://crates.io/api/v1/crates/nvml-wrapper/0.8.0/download -> nvml-wrapper-0.8.0.crate https://crates.io/api/v1/crates/nvml-wrapper-sys/0.6.0/download -> nvml-wrapper-sys-0.6.0.crate https://crates.io/api/v1/crates/object/0.30.2/download -> object-0.30.2.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/procfs/0.14.2/download -> procfs-0.14.2.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rayon/1.5.2/download -> rayon-1.5.2.crate https://crates.io/api/v1/crates/rayon-core/1.9.2/download -> rayon-core-1.9.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/roff/0.2.1/download -> roff-0.2.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustix/0.36.6/download -> rustix-0.36.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.82/download -> serde_json-1.0.82.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smol/1.2.5/download -> smol-1.2.5.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/starship-battery/0.7.9/download -> starship-battery-0.7.9.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/sysctl/0.5.2/download -> sysctl-0.5.2.crate https://crates.io/api/v1/crates/sysinfo/0.26.7/download -> sysinfo-0.26.7.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/tui/0.19.0/download -> tui-0.19.0.crate https://crates.io/api/v1/crates/typed-builder/0.10.0/download -> typed-builder-0.10.0.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.0/download -> unicode-segmentation-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/uom/0.30.0/download -> uom-0.30.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.44.0/download -> windows-0.44.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/wrapcenum-derive/0.4.0/download -> wrapcenum-derive-0.4.0.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=87310603f8f5f4c8c1955bf66e40731a
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1-r8 b/metadata/md5-cache/sys-process/fcron-3.2.1-r8
deleted file mode 100644
index eda7f187f10e..000000000000
--- a/metadata/md5-cache/sys-process/fcron-3.2.1-r8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux )
-DESCRIPTION=A command scheduler with extended capabilities over cron and anacron
-EAPI=7
-HOMEPAGE=http://fcron.free.fr/
-INHERIT=autotools cron flag-o-matic pam systemd user-info
-IUSE=audit debug pam selinux l10n_fr +mta +system-crontab readline
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
-SLOT=0
-SRC_URI=http://fcron.free.fr/archives/fcron-3.2.1.src.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9764387848e039a013c4e80439b7b29b
diff --git a/metadata/md5-cache/sys-process/fcron-3.3.1 b/metadata/md5-cache/sys-process/fcron-3.3.1
index 9653b2503da0..cda93f8ef221 100644
--- a/metadata/md5-cache/sys-process/fcron-3.3.1
+++ b/metadata/md5-cache/sys-process/fcron-3.3.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://fcron.free.fr/
 INHERIT=autotools cron flag-o-matic pam systemd user-info
 IUSE=audit debug pam selinux l10n_fr +mta +system-crontab readline
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.3.1.src.tar.gz -> fcron-3.3.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=48a18ec9b5d787ec26d8f6490add62de
+_md5_=69cf04bfa44a46b9548bc44b4501daca
diff --git a/metadata/md5-cache/sys-process/parallel-20230222 b/metadata/md5-cache/sys-process/parallel-20230222
new file mode 100644
index 000000000000..04615a119dcc
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20230222
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20230222.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20230222.tar.bz2.sig )
+_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=c2223950b39b3ed1450f9cd36ea3c205
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 269721318760..9e81b084c444 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/libiconv-0-r2 b/metadata/md5-cache/virtual/libiconv-0-r2
index 1af08c5f933b..6505b6afc17b 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r2
+++ b/metadata/md5-cache/virtual/libiconv-0-r2
@@ -3,8 +3,8 @@ DESCRIPTION=Virtual for the GNU conversion library
 EAPI=7
 INHERIT=multilib-build
 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 ~loong ~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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_musl? ( >=dev-libs/libiconv-1.14-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
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bf9424175d39727824e9dfaed9aba0d8
+_md5_=290bdc78890919ea9140e11865e86f2f
diff --git a/metadata/md5-cache/virtual/libintl-0-r2 b/metadata/md5-cache/virtual/libintl-0-r2
index 6ebd8b9bb6d0..f994221cce02 100644
--- a/metadata/md5-cache/virtual/libintl-0-r2
+++ b/metadata/md5-cache/virtual/libintl-0-r2
@@ -3,8 +3,8 @@ DESCRIPTION=Virtual for the GNU Internationalization Library
 EAPI=7
 INHERIT=multilib-build
 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 ~loong ~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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_musl? ( dev-libs/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(-)?] ) )
 SLOT=0
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e88c5f2d353049f3bb6823e80b1e5c7d
+_md5_=2874816251ced400a62749727e615338
diff --git a/metadata/md5-cache/virtual/pkgconfig-2-r1 b/metadata/md5-cache/virtual/pkgconfig-2-r1
index 6e72fb826052..4f1a98ee45f7 100644
--- a/metadata/md5-cache/virtual/pkgconfig-2-r1
+++ b/metadata/md5-cache/virtual/pkgconfig-2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the pkg-config implementation
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-util/pkgconf-1.3.7[pkg-config(+)]
 SLOT=0
-_md5_=ea41b65317e7d9da4dd49e5fbb78dcd6
+_md5_=289705126bd57d62a0ff3dd22cf0e873
diff --git a/metadata/md5-cache/virtual/ruby-ssl-11 b/metadata/md5-cache/virtual/ruby-ssl-11
index 5a617a92db13..d9f00b3754be 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-11
+++ b/metadata/md5-cache/virtual/ruby-ssl-11
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=38a7469bbf55e38d644109b28c8a58b4
diff --git a/metadata/md5-cache/virtual/ruby-ssl-12 b/metadata/md5-cache/virtual/ruby-ssl-12
index b33f0c3c6071..8c5b6d7b5cb1 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-12
+++ b/metadata/md5-cache/virtual/ruby-ssl-12
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0[ssl] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3cf13fc8371a8eb2c52ce22fa5e92891
diff --git a/metadata/md5-cache/virtual/rubygems-16 b/metadata/md5-cache/virtual/rubygems-16
index 34ee9009bc77..280ae7bf40b7 100644
--- a/metadata/md5-cache/virtual/rubygems-16
+++ b/metadata/md5-cache/virtual/rubygems-16
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d3492be3a7ad96b8ef36699353adfe67
diff --git a/metadata/md5-cache/virtual/rubygems-17 b/metadata/md5-cache/virtual/rubygems-17
index ef647b8467c2..a6fa19c7d2af 100644
--- a/metadata/md5-cache/virtual/rubygems-17
+++ b/metadata/md5-cache/virtual/rubygems-17
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby31? ( >=dev-ruby/rubygems-3.3.0[ruby_targets_ruby31] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 SLOT=0
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=9361c679a43863a842929ce04666a60a
diff --git a/metadata/md5-cache/virtual/rust-1.66.1 b/metadata/md5-cache/virtual/rust-1.66.1
index 32d77a786e7c..640fac436ef5 100644
--- a/metadata/md5-cache/virtual/rust-1.66.1
+++ b/metadata/md5-cache/virtual/rust-1.66.1
@@ -3,8 +3,8 @@ DESCRIPTION=Virtual for Rust language compiler
 EAPI=8
 INHERIT=multilib-build
 IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 RDEPEND=|| ( ~dev-lang/rust-1.66.1[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.66.1[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/llvm-15
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3bfa15eab5a4a21ca99ccc46457bd7c3
+_md5_=8b0e782f01666952125abeb523a09a6d
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 48ab2044b8bf..957905b91776 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/passenger-6.0.15 b/metadata/md5-cache/www-apache/passenger-6.0.15
index 1635c28c2dbd..9b43e53a2b09 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.15
+++ b/metadata/md5-cache/www-apache/passenger-6.0.15
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.15.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b52dabb6aa6cba4a2e8968e2736138d8
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.16 b/metadata/md5-cache/www-apache/passenger-6.0.16
index eaa2e61d9ddc..483d2103d7bc 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.16
+++ b/metadata/md5-cache/www-apache/passenger-6.0.16
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.16.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7ec2ac4388dcb6653c2cf8a7d62aa2dd
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.17 b/metadata/md5-cache/www-apache/passenger-6.0.17
index 7b1313be2db9..73ded270c652 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.17
+++ b/metadata/md5-cache/www-apache/passenger-6.0.17
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.17.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=587394d3528e1817b3a13270e7ee1df1
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 1ae251db53ca..9138a3f47a1b 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/icingaweb2-2.11.4 b/metadata/md5-cache/www-apps/icingaweb2-2.11.4
index 684b3d6264b2..079179db803e 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.11.4
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.11.4
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://www.icinga.org/
 INHERIT=depend.apache multilib
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) >=dev-libs/icinga-php-library-0.8.1 >=dev-libs/icinga-php-thirdparty-0.11.0 acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.11.4 -> icingaweb2-2.11.4.tar.gz
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=04d73d2857526d5a9ad09d5d450a535b
+_md5_=6a26c4b5d5b11d145367b322831c902d
diff --git a/metadata/md5-cache/www-apps/jekyll-4.2.2 b/metadata/md5-cache/www-apps/jekyll-4.2.2
index 3f25531d81c5..c12255d4dba1 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.2.2
+++ b/metadata/md5-cache/www-apps/jekyll-4.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.2.2.tar.gz -> jekyll-4.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0e468e382e0e8f411714c3d2ade0bbad
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0 b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
index c5947e9b85f8..01bcae34ae29 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v2.0.0.tar.gz -> jekyll-coffeescript-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=8014bad6313a9695001cc45544cfe085
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
index f366e4603826..75788a3b5b2f 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v2.2.0.tar.gz -> jekyll-sass-converter-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7ae74a7164aa5501b4b9b5c251957f74
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
index 6f1746a00c76..165d276c31f6 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v1.4.0.tar.gz -> jekyll-sitemap-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=43b748dd850cb3613d8f8289bdd099e3
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1 b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
index 3b5dff69a76f..4759acc58ea2 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v2.2.1.tar.gz -> jekyll-watch-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d90149d385e3f9535ef494b96ea01ab0
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.14 b/metadata/md5-cache/www-apps/nanoc-4.12.14
index 9bd1cf932ec5..030cdf660078 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.14
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.14.tar.gz -> nanoc-4.12.14.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2e8f9c50266e704630af4a7f491e0ec8
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.6 b/metadata/md5-cache/www-apps/nanoc-4.12.6
index 309a8655b4f6..d35713af28bf 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.6
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-4.12.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=01d53cf0a4199b8f451b0c95c8ee8981
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.7 b/metadata/md5-cache/www-apps/nanoc-4.12.7
index d48ef72d5255..5e965ff211ff 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.7
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-4.12.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=7f575f10ce6a80143b73e28482b77cec
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.9 b/metadata/md5-cache/www-apps/nanoc-4.12.9
index e5e9a242fa0d..84f5f2e8f82c 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.9
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.9.tar.gz -> nanoc-4.12.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2e8f9c50266e704630af4a7f491e0ec8
diff --git a/metadata/md5-cache/www-apps/nanoc-checking-1.0.2 b/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
index 11b36f2b1c65..216d151a0b25 100644
--- a/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-checking-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=680ad27436d9534df3de6d22d74329a1
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.14 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.14
index 490420e6ec22..873e1f073e90 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.14
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.14.tar.gz -> nanoc-4.12.14.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fe81825f9b7213757d31569392096357
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.6 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
index 68ea1a0e2c6d..620078f7c58d 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-4.12.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=21f853852290538c29f7428ca8d8fd3c
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.7 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.7
index 31ad37d24f66..635348febb7d 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.7
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-4.12.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fe81825f9b7213757d31569392096357
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.9 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.9
index a46ce3142b93..2fa982c0b62e 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.9
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.9.tar.gz -> nanoc-4.12.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fe81825f9b7213757d31569392096357
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.14 b/metadata/md5-cache/www-apps/nanoc-core-4.12.14
index b3c361bdd2d0..7cb0cfbb0dc0 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.14
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.14.tar.gz -> nanoc-core-4.12.14.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=537caa87aadb8dd297f36139334a7d28
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.6 b/metadata/md5-cache/www-apps/nanoc-core-4.12.6
index 3ddfd927cc0e..7ccf291ba210 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.6
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-core-4.12.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=23aa075660538e89141c50e215489836
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.7 b/metadata/md5-cache/www-apps/nanoc-core-4.12.7
index f56492f9683c..9588436a7a84 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.7
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.7.tar.gz -> nanoc-core-4.12.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=537caa87aadb8dd297f36139334a7d28
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.9 b/metadata/md5-cache/www-apps/nanoc-core-4.12.9
index b5f94c8f36c8..e554aac4d40d 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.9
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.9.tar.gz -> nanoc-core-4.12.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=537caa87aadb8dd297f36139334a7d28
diff --git a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2 b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
index bc15f285daf1..a4e85ce53604 100644
--- a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-deploying-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=ff642b5b4b7f9a8d185756c739748d9e
diff --git a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2 b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
index df927baf1721..8e49ac6d2185 100644
--- a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanoc-spec-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0a268e09a6ad903ab03c45d32e708e56
diff --git a/metadata/md5-cache/www-apps/nextcloud-24.0.7 b/metadata/md5-cache/www-apps/nextcloud-24.0.7
deleted file mode 100644
index 40ee19fb8938..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-24.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-admin/webapp-config
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=8
-HOMEPAGE=https://nextcloud.com/
-INHERIT=webapp
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=AGPL-3
-RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=24.0.7
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-24.0.7.tar.bz2
-_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=8dab4eaeb25722fa4ed2b527e58bbb0f
diff --git a/metadata/md5-cache/www-apps/nextcloud-24.0.8 b/metadata/md5-cache/www-apps/nextcloud-24.0.8
deleted file mode 100644
index 02f50626ce46..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-24.0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-admin/webapp-config
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=8
-HOMEPAGE=https://nextcloud.com/
-INHERIT=webapp
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=24.0.8
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-24.0.8.tar.bz2
-_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=b772ed2f135d04d9704fc6ae021cb982
diff --git a/metadata/md5-cache/www-apps/nextcloud-25.0.1 b/metadata/md5-cache/www-apps/nextcloud-25.0.1
deleted file mode 100644
index cb7012596be0..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-25.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-admin/webapp-config
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=8
-HOMEPAGE=https://nextcloud.com/
-INHERIT=webapp
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=25.0.1
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-25.0.1.tar.bz2
-_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=a8ff3c6c90e9b826aadbdf86b7422e3d
diff --git a/metadata/md5-cache/www-apps/nextcloud-25.0.2 b/metadata/md5-cache/www-apps/nextcloud-25.0.2
deleted file mode 100644
index 32cfd126837e..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-25.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-admin/webapp-config
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=8
-HOMEPAGE=https://nextcloud.com/
-INHERIT=webapp
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=25.0.2
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-25.0.2.tar.bz2
-_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=b772ed2f135d04d9704fc6ae021cb982
diff --git a/metadata/md5-cache/www-apps/nextcloud-25.0.3 b/metadata/md5-cache/www-apps/nextcloud-25.0.3
index 9ca4fab96fcc..d779ed5ceba6 100644
--- a/metadata/md5-cache/www-apps/nextcloud-25.0.3
+++ b/metadata/md5-cache/www-apps/nextcloud-25.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://nextcloud.com/
 INHERIT=webapp
 IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=AGPL-3
 RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=25.0.3
 SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-25.0.3.tar.bz2
 _eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=b772ed2f135d04d9704fc6ae021cb982
+_md5_=3cfb5e3ff3ece3e227b384a4844b6a8b
diff --git a/metadata/md5-cache/www-apps/nikola-8.2.3-r1 b/metadata/md5-cache/www-apps/nikola-8.2.3-r1
index 69cf75eda5f0..485de2aeaf1e 100644
--- a/metadata/md5-cache/www-apps/nikola-8.2.3-r1
+++ b/metadata/md5-cache/www-apps/nikola-8.2.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-python/docutils-0.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/docutils-0.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A static website and blog generator
 EAPI=8
 HOMEPAGE=https://getnikola.com/
 INHERIT=distutils-r1 optfeature pypi
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT Apache-2.0 CC0-1.0 public-domain
-RDEPEND=>=dev-python/docutils-0.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/doit-0.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.3.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mako-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/natsort-3.5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/piexif-1.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-1.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/unidecode-0.04.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yapsy-1.11.223[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cloudpickle[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/docutils-0.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/blinker-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/doit-0.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-3.3.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mako-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/natsort-3.5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/piexif-1.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-1.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unidecode-0.04.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yapsy-1.11.223[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[jpeg,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cloudpickle[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/N/Nikola/Nikola-8.2.3.tar.gz
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c9aef167f80ea8ec08971cca53b852e0
+_md5_=f0e7e70823702d4d34cc2b427bc8e5fd
diff --git a/metadata/md5-cache/www-apps/prowlarr-1.3.1.2796 b/metadata/md5-cache/www-apps/prowlarr-1.3.1.2796
new file mode 100644
index 000000000000..830f13b699f8
--- /dev/null
+++ b/metadata/md5-cache/www-apps/prowlarr-1.3.1.2796
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=An indexer manager/proxy to integrate with your various PVR apps
+EAPI=8
+HOMEPAGE=https://wiki.servarr.com/prowlarr
+INHERIT=systemd
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=GPL-3
+RDEPEND=acct-group/prowlarr acct-user/prowlarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.3.1.2796/Prowlarr.develop.1.3.1.2796.linux-core-x64.tar.gz ) arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.3.1.2796/Prowlarr.develop.1.3.1.2796.linux-core-arm.tar.gz ) arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.3.1.2796/Prowlarr.develop.1.3.1.2796.linux-core-arm64.tar.gz )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bb3477c653c14545b089db12b1be31f2
diff --git a/metadata/md5-cache/www-apps/readarr-0.1.4.1596 b/metadata/md5-cache/www-apps/readarr-0.1.4.1596
new file mode 100644
index 000000000000..17285936ac67
--- /dev/null
+++ b/metadata/md5-cache/www-apps/readarr-0.1.4.1596
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=An ebook and audiobook collection manager for Usenet and BitTorrent users
+EAPI=8
+HOMEPAGE=https://readarr.com/
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/readarr acct-user/readarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( https://github.com/Readarr/Readarr/releases/download/v0.1.4.1596/Readarr.develop.0.1.4.1596.linux-core-x64.tar.gz ) arm? ( https://github.com/Readarr/Readarr/releases/download/v0.1.4.1596/Readarr.develop.0.1.4.1596.linux-core-arm.tar.gz ) arm64? ( https://github.com/Readarr/Readarr/releases/download/v0.1.4.1596/Readarr.develop.0.1.4.1596.linux-core-arm64.tar.gz )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=234f51f450397e53bb8f9c1305b4f339
diff --git a/metadata/md5-cache/www-apps/redmine-4.2.9 b/metadata/md5-cache/www-apps/redmine-4.2.9
index ece92c158916..252977b0b0e3 100644
--- a/metadata/md5-cache/www-apps/redmine-4.2.9
+++ b/metadata/md5-cache/www-apps/redmine-4.2.9
@@ -12,5 +12,5 @@ RDEPEND=acct-group/redmine acct-user/redmine imagemagick? ( media-gfx/imagemagic
 REQUIRED_USE=|| ( ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://www.redmine.org/releases/redmine-4.2.9.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6e288f3ddbf8ec472aeb6d60a6bf0d3b
diff --git a/metadata/md5-cache/www-apps/redmine-5.0.4 b/metadata/md5-cache/www-apps/redmine-5.0.4
index 76c64a76d582..289d49d6a0a4 100644
--- a/metadata/md5-cache/www-apps/redmine-5.0.4
+++ b/metadata/md5-cache/www-apps/redmine-5.0.4
@@ -12,5 +12,5 @@ RDEPEND=acct-group/redmine acct-user/redmine imagemagick? ( media-gfx/imagemagic
 REQUIRED_USE=|| ( ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://www.redmine.org/releases/redmine-5.0.4.tar.gz
-_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=a38b22bb67e9ec5d10cbafb7b4e7c785
diff --git a/metadata/md5-cache/www-apps/rutorrent-4.0.2 b/metadata/md5-cache/www-apps/rutorrent-4.0.2
new file mode 100644
index 000000000000..361868aa4a00
--- /dev/null
+++ b/metadata/md5-cache/www-apps/rutorrent-4.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=ruTorrent is a front-end for the popular Bittorrent client rTorrent
+EAPI=8
+HOMEPAGE=https://github.com/Novik/ruTorrent
+INHERIT=webapp optfeature
+IUSE=vhosts
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2+ MIT
+RDEPEND=dev-lang/php[xml,gd] virtual/httpd-php app-admin/webapp-config
+SLOT=4.0.2
+SRC_URI=https://github.com/Novik/ruTorrent/archive/v4.0.2.tar.gz -> rutorrent-4.0.2.tar.gz
+_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=f22f9c050ae7b67d97c785753853d657
diff --git a/metadata/md5-cache/www-apps/rutorrent-9999 b/metadata/md5-cache/www-apps/rutorrent-9999
index 00c60cf4a06b..912216f296ae 100644
--- a/metadata/md5-cache/www-apps/rutorrent-9999
+++ b/metadata/md5-cache/www-apps/rutorrent-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst prepare prerm setup unpack
-DEPEND=dev-lang/php[xml,gd] app-admin/webapp-config
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
 DESCRIPTION=ruTorrent is a front-end for the popular Bittorrent client rTorrent
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/Novik/ruTorrent
-INHERIT=webapp git-r3
+INHERIT=webapp optfeature git-r3
 IUSE=vhosts
-LICENSE=GPL-2
+LICENSE=GPL-2+ MIT
 PROPERTIES=live
-RDEPEND=virtual/httpd-php app-admin/webapp-config
+RDEPEND=dev-lang/php[xml,gd] virtual/httpd-php app-admin/webapp-config
 SLOT=9999
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=04e8639b3f42cf3014f276dd87d674e9
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	optfeature	1a2157392a869265b2afcb63a26c12ac	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=f22f9c050ae7b67d97c785753853d657
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 7b7d952952d9..900cf3fcc120 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-102.8.0 b/metadata/md5-cache/www-client/firefox-102.8.0
index f031028a65b4..15fd0d7e6467 100644
--- a/metadata/md5-cache/www-client/firefox-102.8.0
+++ b/metadata/md5-cache/www-client/firefox-102.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Firefox Web Browser
 EAPI=8
 HOMEPAGE=https://www.mozilla.com/firefox
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
+INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
@@ -13,5 +13,5 @@ RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-vide
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/source/firefox-102.8.0esr.source.tar.xz -> firefox-102.8.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-09j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-09j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-09j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.8.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.8.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.8.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.8.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.8.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.8.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.8.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.8.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.8.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.8.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.8.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.8.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.8.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.8.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.8.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.8.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.8.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.8.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.8.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.8.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.8.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.8.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.8.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.8.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.8.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.8.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.8.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.8.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.8.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.8.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.8.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.8.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.8.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.8.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.8.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.8.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.8.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.8.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.8.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.8.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.8.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.8.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.8.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.8.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.8.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.8.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.8.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.8.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.8.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.8.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.8.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.8.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.8.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.8.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.8.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.8.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.8.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.8.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.8.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.8.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.8.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.8.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.8.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.8.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.8.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.8.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.8.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.8.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.8.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.8.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.8.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.8.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.8.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.8.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.8.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.8.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.8.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.8.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.8.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.8.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.8.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.8.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.8.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.8.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.8.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.8.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.8.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.8.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.8.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.8.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.8.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.8.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.8.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.8.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.8.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.8.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.8.0esr-xh.xpi )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7932ea1cf5234b3f063a4f5d9d10139c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=345f17799d30d476587b3c0f33521580
diff --git a/metadata/md5-cache/www-client/firefox-110.0 b/metadata/md5-cache/www-client/firefox-110.0
deleted file mode 100644
index 5ae8ae450f13..000000000000
--- a/metadata/md5-cache/www-client/firefox-110.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.9-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.16-r1:3.9[ncurses,sqlite,ssl] ) sys-devel/clang:15 sys-devel/llvm:15 clang? ( || ( sys-devel/lld:15 sys-devel/mold ) virtual/rust:0/llvm-15 pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) app-alternatives/awk app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig !clang? ( >=virtual/rust-1.65 ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) pgo? ( X? ( sys-devel/gettext x11-base/xorg-server[xvfb] x11-apps/xhost ) wayland? ( >=gui-libs/wlroots-0.15.1-r1[tinywl] x11-misc/xkeyboard-config ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.13-r7:2.1 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.87 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-72.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +X geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.87 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-72.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
-REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/110.0/source/firefox-110.0.source.tar.xz -> firefox-110.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-110-patches-01j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-110-patches-01j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-110-patches-01j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/af.xpi -> firefox-110.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ar.xpi -> firefox-110.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ast.xpi -> firefox-110.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/be.xpi -> firefox-110.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/bg.xpi -> firefox-110.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/br.xpi -> firefox-110.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ca.xpi -> firefox-110.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/cak.xpi -> firefox-110.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/cs.xpi -> firefox-110.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/cy.xpi -> firefox-110.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/da.xpi -> firefox-110.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/de.xpi -> firefox-110.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/dsb.xpi -> firefox-110.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/el.xpi -> firefox-110.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/en-CA.xpi -> firefox-110.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/en-GB.xpi -> firefox-110.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-AR.xpi -> firefox-110.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-ES.xpi -> firefox-110.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/et.xpi -> firefox-110.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/eu.xpi -> firefox-110.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fi.xpi -> firefox-110.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fr.xpi -> firefox-110.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-110.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-110.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gd.xpi -> firefox-110.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gl.xpi -> firefox-110.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/he.xpi -> firefox-110.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hr.xpi -> firefox-110.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hsb.xpi -> firefox-110.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hu.xpi -> firefox-110.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/id.xpi -> firefox-110.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/is.xpi -> firefox-110.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/it.xpi -> firefox-110.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ja.xpi -> firefox-110.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ka.xpi -> firefox-110.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/kab.xpi -> firefox-110.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/kk.xpi -> firefox-110.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ko.xpi -> firefox-110.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/lt.xpi -> firefox-110.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/lv.xpi -> firefox-110.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ms.xpi -> firefox-110.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-110.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/nl.xpi -> firefox-110.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-110.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-110.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pl.xpi -> firefox-110.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-110.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-110.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/rm.xpi -> firefox-110.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ro.xpi -> firefox-110.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ru.xpi -> firefox-110.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sk.xpi -> firefox-110.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sl.xpi -> firefox-110.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sq.xpi -> firefox-110.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sr.xpi -> firefox-110.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-110.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/th.xpi -> firefox-110.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/tr.xpi -> firefox-110.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/uk.xpi -> firefox-110.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/uz.xpi -> firefox-110.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/vi.xpi -> firefox-110.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-110.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-110.0-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ach.xpi -> firefox-110.0-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/an.xpi -> firefox-110.0-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/az.xpi -> firefox-110.0-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/bn.xpi -> firefox-110.0-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/bs.xpi -> firefox-110.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-110.0-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/eo.xpi -> firefox-110.0-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-CL.xpi -> firefox-110.0-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-MX.xpi -> firefox-110.0-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fa.xpi -> firefox-110.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ff.xpi -> firefox-110.0-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gn.xpi -> firefox-110.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-110.0-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-110.0-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-110.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ia.xpi -> firefox-110.0-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/km.xpi -> firefox-110.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/kn.xpi -> firefox-110.0-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/lij.xpi -> firefox-110.0-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/mk.xpi -> firefox-110.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/mr.xpi -> firefox-110.0-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/my.xpi -> firefox-110.0-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-110.0-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/oc.xpi -> firefox-110.0-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sco.xpi -> firefox-110.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/si.xpi -> firefox-110.0-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/son.xpi -> firefox-110.0-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/szl.xpi -> firefox-110.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ta.xpi -> firefox-110.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/te.xpi -> firefox-110.0-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/tl.xpi -> firefox-110.0-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/trs.xpi -> firefox-110.0-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ur.xpi -> firefox-110.0-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/xh.xpi -> firefox-110.0-xh.xpi )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ce5905742dc40487fcba90612341ac65
diff --git a/metadata/md5-cache/www-client/firefox-110.0.1 b/metadata/md5-cache/www-client/firefox-110.0.1
new file mode 100644
index 000000000000..74b11e0ddf34
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-110.0.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.9-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.16-r1:3.9[ncurses,sqlite,ssl] ) sys-devel/clang:15 sys-devel/llvm:15 clang? ( || ( sys-devel/lld:15 sys-devel/mold ) virtual/rust:0/llvm-15 pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) app-alternatives/awk app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig !clang? ( >=virtual/rust-1.65 ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) pgo? ( X? ( sys-devel/gettext x11-base/xorg-server[xvfb] x11-apps/xhost ) wayland? ( >=gui-libs/wlroots-0.15.1-r1[tinywl] x11-misc/xkeyboard-config ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.13-r7:2.1 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.87 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-72.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +X geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.87 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-72.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
+REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) screencast? ( wayland )
+SLOT=rapid
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/110.0.1/source/firefox-110.0.1.source.tar.xz -> firefox-110.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-110-patches-01j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-110-patches-01j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-110-patches-01j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/af.xpi -> firefox-110.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ar.xpi -> firefox-110.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ast.xpi -> firefox-110.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/be.xpi -> firefox-110.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/bg.xpi -> firefox-110.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/br.xpi -> firefox-110.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ca.xpi -> firefox-110.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/cak.xpi -> firefox-110.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/cs.xpi -> firefox-110.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/cy.xpi -> firefox-110.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/da.xpi -> firefox-110.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/de.xpi -> firefox-110.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-110.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/el.xpi -> firefox-110.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-110.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-110.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-110.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-110.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/et.xpi -> firefox-110.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/eu.xpi -> firefox-110.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fi.xpi -> firefox-110.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fr.xpi -> firefox-110.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-110.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-110.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gd.xpi -> firefox-110.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gl.xpi -> firefox-110.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/he.xpi -> firefox-110.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hr.xpi -> firefox-110.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-110.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hu.xpi -> firefox-110.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/id.xpi -> firefox-110.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/is.xpi -> firefox-110.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/it.xpi -> firefox-110.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ja.xpi -> firefox-110.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ka.xpi -> firefox-110.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/kab.xpi -> firefox-110.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/kk.xpi -> firefox-110.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ko.xpi -> firefox-110.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/lt.xpi -> firefox-110.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/lv.xpi -> firefox-110.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ms.xpi -> firefox-110.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-110.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/nl.xpi -> firefox-110.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-110.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-110.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pl.xpi -> firefox-110.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-110.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-110.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/rm.xpi -> firefox-110.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ro.xpi -> firefox-110.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ru.xpi -> firefox-110.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sk.xpi -> firefox-110.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sl.xpi -> firefox-110.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sq.xpi -> firefox-110.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sr.xpi -> firefox-110.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-110.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/th.xpi -> firefox-110.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/tr.xpi -> firefox-110.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/uk.xpi -> firefox-110.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/uz.xpi -> firefox-110.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/vi.xpi -> firefox-110.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-110.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-110.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ach.xpi -> firefox-110.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/an.xpi -> firefox-110.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/az.xpi -> firefox-110.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/bn.xpi -> firefox-110.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/bs.xpi -> firefox-110.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-110.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/eo.xpi -> firefox-110.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-110.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-110.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fa.xpi -> firefox-110.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ff.xpi -> firefox-110.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gn.xpi -> firefox-110.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-110.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-110.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-110.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ia.xpi -> firefox-110.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/km.xpi -> firefox-110.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/kn.xpi -> firefox-110.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/lij.xpi -> firefox-110.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/mk.xpi -> firefox-110.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/mr.xpi -> firefox-110.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/my.xpi -> firefox-110.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-110.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/oc.xpi -> firefox-110.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sco.xpi -> firefox-110.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/si.xpi -> firefox-110.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/son.xpi -> firefox-110.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/szl.xpi -> firefox-110.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ta.xpi -> firefox-110.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/te.xpi -> firefox-110.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/tl.xpi -> firefox-110.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/trs.xpi -> firefox-110.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ur.xpi -> firefox-110.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/xh.xpi -> firefox-110.0.1-xh.xpi )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=95117d640e9141031d24c12ec1aaf71f
diff --git a/metadata/md5-cache/www-client/firefox-bin-102.8.0 b/metadata/md5-cache/www-client/firefox-bin-102.8.0
index 683cf030f9a7..9a24909856a0 100644
--- a/metadata/md5-cache/www-client/firefox-bin-102.8.0
+++ b/metadata/md5-cache/www-client/firefox-bin-102.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Firefox Web Browser
 EAPI=8
 HOMEPAGE=https://www.mozilla.com/firefox
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop linux-info pax-utils xdg
+INHERIT=desktop linux-info optfeature pax-utils xdg
 IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
 KEYWORDS=-* amd64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
@@ -13,5 +13,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0
 RESTRICT=strip
 SLOT=esr
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/en-US/firefox-102.8.0esr.tar.bz2 -> firefox-bin_x86_64-102.8.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-i686/en-US/firefox-102.8.0esr.tar.bz2 -> firefox-bin_i686-102.8.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.8.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.8.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.8.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.8.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.8.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.8.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.8.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.8.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.8.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.8.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.8.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.8.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.8.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.8.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.8.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.8.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.8.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.8.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.8.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.8.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.8.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.8.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.8.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.8.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.8.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.8.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.8.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.8.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.8.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.8.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.8.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.8.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.8.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.8.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.8.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.8.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.8.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.8.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.8.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.8.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.8.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.8.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.8.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.8.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.8.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.8.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.8.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.8.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.8.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.8.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.8.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.8.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.8.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.8.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.8.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.8.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.8.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.8.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.8.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.8.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.8.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.8.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.8.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.8.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.8.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.8.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.8.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.8.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.8.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.8.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.8.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.8.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.8.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.8.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.8.0esr-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.8.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.8.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.8.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.8.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.8.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.8.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.8.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.8.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.8.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.8.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.8.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.8.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.8.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.8.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.8.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.8.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.8.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.8.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.8.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.8.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.8.0esr-zh-TW.xpi )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=354e4c6d9cb07fd1163df9a5fcd20214
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=97177c27d89fd5e03d99cfbca80bec89
diff --git a/metadata/md5-cache/www-client/firefox-bin-110.0 b/metadata/md5-cache/www-client/firefox-bin-110.0
deleted file mode 100644
index 8c4717e1a186..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-110.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst setup unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop linux-info pax-utils xdg
-IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib 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:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=rapid
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-US/firefox-110.0.tar.bz2 -> firefox-bin_x86_64-110.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-US/firefox-110.0.tar.bz2 -> firefox-bin_i686-110.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ach.xpi -> firefox-110.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/af.xpi -> firefox-110.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/an.xpi -> firefox-110.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ar.xpi -> firefox-110.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ast.xpi -> firefox-110.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/az.xpi -> firefox-110.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/be.xpi -> firefox-110.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/bg.xpi -> firefox-110.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/bn.xpi -> firefox-110.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/br.xpi -> firefox-110.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/bs.xpi -> firefox-110.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-110.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ca.xpi -> firefox-110.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/cak.xpi -> firefox-110.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/cs.xpi -> firefox-110.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/cy.xpi -> firefox-110.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/da.xpi -> firefox-110.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/de.xpi -> firefox-110.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/dsb.xpi -> firefox-110.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/el.xpi -> firefox-110.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/en-CA.xpi -> firefox-110.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/en-GB.xpi -> firefox-110.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/eo.xpi -> firefox-110.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-AR.xpi -> firefox-110.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-CL.xpi -> firefox-110.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-ES.xpi -> firefox-110.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/es-MX.xpi -> firefox-110.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/et.xpi -> firefox-110.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/eu.xpi -> firefox-110.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fa.xpi -> firefox-110.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ff.xpi -> firefox-110.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fi.xpi -> firefox-110.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fr.xpi -> firefox-110.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-110.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-110.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gd.xpi -> firefox-110.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gl.xpi -> firefox-110.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gn.xpi -> firefox-110.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-110.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/he.xpi -> firefox-110.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-110.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hr.xpi -> firefox-110.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hsb.xpi -> firefox-110.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hu.xpi -> firefox-110.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-110.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ia.xpi -> firefox-110.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/id.xpi -> firefox-110.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/is.xpi -> firefox-110.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/it.xpi -> firefox-110.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ja.xpi -> firefox-110.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ka.xpi -> firefox-110.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/kab.xpi -> firefox-110.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/kk.xpi -> firefox-110.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/km.xpi -> firefox-110.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/kn.xpi -> firefox-110.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ko.xpi -> firefox-110.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/lij.xpi -> firefox-110.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/lt.xpi -> firefox-110.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/lv.xpi -> firefox-110.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/mk.xpi -> firefox-110.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/mr.xpi -> firefox-110.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ms.xpi -> firefox-110.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/my.xpi -> firefox-110.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-110.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-110.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/nl.xpi -> firefox-110.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-110.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/oc.xpi -> firefox-110.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-110.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pl.xpi -> firefox-110.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-110.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-110.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/rm.xpi -> firefox-110.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ro.xpi -> firefox-110.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ru.xpi -> firefox-110.0-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sco.xpi -> firefox-110.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/si.xpi -> firefox-110.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sk.xpi -> firefox-110.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sl.xpi -> firefox-110.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/son.xpi -> firefox-110.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sq.xpi -> firefox-110.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sr.xpi -> firefox-110.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-110.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ta.xpi -> firefox-110.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/te.xpi -> firefox-110.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/th.xpi -> firefox-110.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/tl.xpi -> firefox-110.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/tr.xpi -> firefox-110.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/trs.xpi -> firefox-110.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/uk.xpi -> firefox-110.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/ur.xpi -> firefox-110.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/uz.xpi -> firefox-110.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/vi.xpi -> firefox-110.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/xh.xpi -> firefox-110.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-110.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-110.0-zh-TW.xpi )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=68cbd81c81d513b87b67681f59b9bd5f
diff --git a/metadata/md5-cache/www-client/firefox-bin-110.0.1 b/metadata/md5-cache/www-client/firefox-bin-110.0.1
new file mode 100644
index 000000000000..4c04fb535a76
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-110.0.1
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop linux-info optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib 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:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=rapid
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/en-US/firefox-110.0.1.tar.bz2 -> firefox-bin_x86_64-110.0.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-i686/en-US/firefox-110.0.1.tar.bz2 -> firefox-bin_i686-110.0.1.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ach.xpi -> firefox-110.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/af.xpi -> firefox-110.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/an.xpi -> firefox-110.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ar.xpi -> firefox-110.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ast.xpi -> firefox-110.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/az.xpi -> firefox-110.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/be.xpi -> firefox-110.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/bg.xpi -> firefox-110.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/bn.xpi -> firefox-110.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/br.xpi -> firefox-110.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/bs.xpi -> firefox-110.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-110.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ca.xpi -> firefox-110.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/cak.xpi -> firefox-110.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/cs.xpi -> firefox-110.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/cy.xpi -> firefox-110.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/da.xpi -> firefox-110.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/de.xpi -> firefox-110.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-110.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/el.xpi -> firefox-110.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-110.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-110.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/eo.xpi -> firefox-110.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-110.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-110.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-110.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-110.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/et.xpi -> firefox-110.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/eu.xpi -> firefox-110.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fa.xpi -> firefox-110.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ff.xpi -> firefox-110.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fi.xpi -> firefox-110.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fr.xpi -> firefox-110.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-110.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-110.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gd.xpi -> firefox-110.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gl.xpi -> firefox-110.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gn.xpi -> firefox-110.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-110.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/he.xpi -> firefox-110.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-110.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hr.xpi -> firefox-110.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-110.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hu.xpi -> firefox-110.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-110.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ia.xpi -> firefox-110.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/id.xpi -> firefox-110.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/is.xpi -> firefox-110.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/it.xpi -> firefox-110.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ja.xpi -> firefox-110.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ka.xpi -> firefox-110.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/kab.xpi -> firefox-110.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/kk.xpi -> firefox-110.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/km.xpi -> firefox-110.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/kn.xpi -> firefox-110.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ko.xpi -> firefox-110.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/lij.xpi -> firefox-110.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/lt.xpi -> firefox-110.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/lv.xpi -> firefox-110.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/mk.xpi -> firefox-110.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/mr.xpi -> firefox-110.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ms.xpi -> firefox-110.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/my.xpi -> firefox-110.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-110.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-110.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/nl.xpi -> firefox-110.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-110.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/oc.xpi -> firefox-110.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-110.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pl.xpi -> firefox-110.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-110.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-110.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/rm.xpi -> firefox-110.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ro.xpi -> firefox-110.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ru.xpi -> firefox-110.0.1-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sco.xpi -> firefox-110.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/si.xpi -> firefox-110.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sk.xpi -> firefox-110.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sl.xpi -> firefox-110.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/son.xpi -> firefox-110.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sq.xpi -> firefox-110.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sr.xpi -> firefox-110.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-110.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ta.xpi -> firefox-110.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/te.xpi -> firefox-110.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/th.xpi -> firefox-110.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/tl.xpi -> firefox-110.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/tr.xpi -> firefox-110.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/trs.xpi -> firefox-110.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/uk.xpi -> firefox-110.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/ur.xpi -> firefox-110.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/uz.xpi -> firefox-110.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/vi.xpi -> firefox-110.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/xh.xpi -> firefox-110.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-110.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/110.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-110.0.1-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6c3f45567d09154f57717d871a81cade
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre11 b/metadata/md5-cache/www-client/lynx-2.9.0_pre11
index 000bd55895af..5529c3d48220 100644
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre11
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://lynx.invisible-island.net/
 INHERIT=verify-sig
 IUSE=brotli bzip2 cjk gnutls idn nls ssl verify-sig
-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=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( dev-libs/libgcrypt:= >=net-libs/gnutls-2.6.4:= ) )
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.11.tar.bz2 verify-sig? ( https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.11.tar.bz2.asc )
 _eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=d0826626d1e518fe6150d73cd10cabf7
+_md5_=0fea1ce063724324a3a0fcddc6f7f7ff
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 2f00370835e1..5d64f9166d63 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.22 b/metadata/md5-cache/www-misc/urlwatch-2.22
deleted file mode 100644
index 83b81d772e79..000000000000
--- a/metadata/md5-cache/www-misc/urlwatch-2.22
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/docutils[python_targets_python3_9(-)?] dev-python/pycodestyle[python_targets_python3_9(-)?] ) doc? ( || ( ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_9(-)?] dev-python/cssselect[python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_9(-)?] dev-python/minidb[python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_9(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A tool for monitoring webpages for updates
-EAPI=7
-HOMEPAGE=https://thp.io/2008/urlwatch/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?] dev-python/cssselect[python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_9(-)?] dev-python/minidb[python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_9(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.22.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5c8f262aac87bfbd9a6d341dc6b3b6c7
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.25 b/metadata/md5-cache/www-misc/urlwatch-2.25
index f52b1f533487..ef169b94da9a 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.25
+++ b/metadata/md5-cache/www-misc/urlwatch-2.25
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jq[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cssselect[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/minidb-2.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jq[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cssselect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/minidb-2.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A tool for monitoring webpages for updates
 EAPI=8
-HOMEPAGE=https://thp.io/2008/urlwatch/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9 python_targets_python3_10
+HOMEPAGE=https://thp.io/2008/urlwatch/ https://github.com/thp/urlwatch/ https://pypi.org/project/urlwatch/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cssselect[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/minidb-2.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cssselect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/minidb-2.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.25.tar.gz
-_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0292033f6056b4b6dee9b2eff748e460
+SRC_URI=https://files.pythonhosted.org/packages/source/u/urlwatch/urlwatch-2.25.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4b696a67b685cb0c545083d962b1285b
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index c961c9caa453..e039c40e6de7 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/adsf-1.4.6-r1 b/metadata/md5-cache/www-servers/adsf-1.4.6-r1
index 0a97f439811e..ac0f2b043803 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.6-r1
+++ b/metadata/md5-cache/www-servers/adsf-1.4.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.6.tar.gz -> adsf-1.4.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2256ec29195e6352d6e7ed311bfe37f2
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.6-r1 b/metadata/md5-cache/www-servers/h2o-2.2.6-r1
index 6dceef33f541..718ff95a2582 100644
--- a/metadata/md5-cache/www-servers/h2o-2.2.6-r1
+++ b/metadata/md5-cache/www-servers/h2o-2.2.6-r1
@@ -1,6 +1,6 @@
 BDEPEND=libh2o? ( virtual/pkgconfig ) mruby? ( sys-devel/bison virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl !sci-libs/libh2o sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= mruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) )
+DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl !sci-libs/libh2o sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0= mruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) )
 DESCRIPTION=H2O - the optimized HTTP/1, HTTP/2 server
 EAPI=8
 HOMEPAGE=https://h2o.examp1e.net/
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=acct-group/h2o acct-user/h2o dev-lang/perl !sci-libs/libh2o sys-libs/zlib libh2o? ( dev-libs/libuv ) dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/h2o/h2o/archive/v2.2.6.tar.gz -> h2o-2.2.6.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e49e9aca8445da28d2e7ff91f92dd8e6
diff --git a/metadata/md5-cache/www-servers/h2o-9999 b/metadata/md5-cache/www-servers/h2o-9999
index b0a5ba09ad41..7cbac6ad2451 100644
--- a/metadata/md5-cache/www-servers/h2o-9999
+++ b/metadata/md5-cache/www-servers/h2o-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl dev-libs/openssl:0= !sci-libs/libh2o sys-libs/libcap sys-libs/zlib libh2o? ( app-arch/brotli dev-libs/libuv ) mruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison )
+DEPEND=acct-group/h2o acct-user/h2o dev-lang/perl dev-libs/openssl:0= !sci-libs/libh2o sys-libs/libcap sys-libs/zlib libh2o? ( app-arch/brotli dev-libs/libuv ) mruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:3.1 ) virtual/rubygems || ( dev-libs/onigmo dev-libs/oniguruma ) sys-devel/bison )
 DESCRIPTION=H2O - the optimized HTTP/1, HTTP/2 server
 EAPI=8
 HOMEPAGE=https://h2o.examp1e.net/
@@ -10,5 +10,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=acct-group/h2o acct-user/h2o dev-lang/perl dev-libs/openssl:0= !sci-libs/libh2o sys-libs/libcap sys-libs/zlib libh2o? ( app-arch/brotli dev-libs/libuv )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=148b78d0d30edf0a592a42478e153c84
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.68 b/metadata/md5-cache/www-servers/lighttpd-1.4.68
index 9d02d98fe89e..49d6c66c9246 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.68
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.68
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 INHERIT=lua-single meson readme.gentoo-r1 systemd tmpfiles
 IUSE=+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/lighttpd acct-user/lighttpd virtual/libcrypt:= brotli? ( app-arch/brotli:= ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) pcre? ( dev-libs/libpcre2 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:= ) system-xxhash? ( dev-libs/xxhash ) unwind? ( sys-libs/libunwind:= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) mysql? ( dbi ) postgres? ( dbi ) sqlite? ( dbi ) webdav? ( sqlite )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.68.tar.xz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1ec76f3aab087fe3b977576f6d2542f5
+_md5_=6265da3d7787e8351ea87b7643305cd9
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.29.0-r1 b/metadata/md5-cache/www-servers/nginx-unit-1.29.0-r1
new file mode 100644
index 000000000000..b29ad5ad5a13
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.29.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+DESCRIPTION=Dynamic web and application server
+EAPI=8
+HOMEPAGE=https://unit.nginx.org
+INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
+IUSE=perl python ruby php7-4 php8-0 php8-1 ssl python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0= acct-user/nginx-unit acct-group/nginx-unit
+REQUIRED_USE=|| ( perl python ruby php7-4 php8-0 php8-1 ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://unit.nginx.org/download/unit-1.29.0.tar.gz -> nginx-unit-1.29.0.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bf4b65fa0af485ce1f51fdcd42c559ea
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.29.1 b/metadata/md5-cache/www-servers/nginx-unit-1.29.1
new file mode 100644
index 000000000000..c2406d7c3d5a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.29.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+DESCRIPTION=Dynamic web and application server
+EAPI=8
+HOMEPAGE=https://unit.nginx.org
+INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
+IUSE=perl python ruby php7-4 php8-0 php8-1 ssl python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0= acct-user/nginx-unit acct-group/nginx-unit
+REQUIRED_USE=|| ( perl python ruby php7-4 php8-0 php8-1 ssl ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://unit.nginx.org/download/unit-1.29.1.tar.gz -> nginx-unit-1.29.1.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6451223762687aa25fc345a7cc3bce1f
diff --git a/metadata/md5-cache/www-servers/puma-5.6.4 b/metadata/md5-cache/www-servers/puma-5.6.4
index d12f5818fa4b..3c2f12e2878d 100644
--- a/metadata/md5-cache/www-servers/puma-5.6.4
+++ b/metadata/md5-cache/www-servers/puma-5.6.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.6.4.tar.gz -> puma-5.6.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3b122c2ae98fe936c2fa259afc59a85e
diff --git a/metadata/md5-cache/www-servers/puma-5.6.5 b/metadata/md5-cache/www-servers/puma-5.6.5
index 495bcb4db7cc..f0bf8077eda8 100644
--- a/metadata/md5-cache/www-servers/puma-5.6.5
+++ b/metadata/md5-cache/www-servers/puma-5.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.6.5.tar.gz -> puma-5.6.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=5c86fe7ed018821bbe504d17aeab4ad9
diff --git a/metadata/md5-cache/www-servers/puma-6.0.0 b/metadata/md5-cache/www-servers/puma-6.0.0
index 7a316dd3e4f4..a89a5d6cd0c9 100644
--- a/metadata/md5-cache/www-servers/puma-6.0.0
+++ b/metadata/md5-cache/www-servers/puma-6.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v6.0.0.tar.gz -> puma-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=75d77df7eba9b6ded44abdecdbd565fa
diff --git a/metadata/md5-cache/www-servers/puma-6.0.1 b/metadata/md5-cache/www-servers/puma-6.0.1
index ce2afc15cab2..31b912a07b60 100644
--- a/metadata/md5-cache/www-servers/puma-6.0.1
+++ b/metadata/md5-cache/www-servers/puma-6.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v6.0.1.tar.gz -> puma-6.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=75d77df7eba9b6ded44abdecdbd565fa
diff --git a/metadata/md5-cache/www-servers/puma-6.0.2 b/metadata/md5-cache/www-servers/puma-6.0.2
index 540910d0696a..8823e09fcf04 100644
--- a/metadata/md5-cache/www-servers/puma-6.0.2
+++ b/metadata/md5-cache/www-servers/puma-6.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v6.0.2.tar.gz -> puma-6.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=abfe0c282bfe5e5ad8f9b40bda74adf3
diff --git a/metadata/md5-cache/www-servers/puma-6.1.0 b/metadata/md5-cache/www-servers/puma-6.1.0
index 536b9b03f0d6..7edf487b0c0c 100644
--- a/metadata/md5-cache/www-servers/puma-6.1.0
+++ b/metadata/md5-cache/www-servers/puma-6.1.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v6.1.0.tar.gz -> puma-6.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2a4fd7456e85ca72ab49f51a24d5d9da
diff --git a/metadata/md5-cache/www-servers/thin-1.8.1 b/metadata/md5-cache/www-servers/thin-1.8.1
index 19604ed9ea72..af1d8f0a4021 100644
--- a/metadata/md5-cache/www-servers/thin-1.8.1
+++ b/metadata/md5-cache/www-servers/thin-1.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.8.1.tar.gz -> thin-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=782c59f9bd200d700bba09d21cec9e63
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.6 b/metadata/md5-cache/www-servers/tomcat-10.1.6
new file mode 100644
index 000000000000..1f859fc0a2a7
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.6
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.6:10.1.6 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.6/src/apache-tomcat-10.1.6-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.6/src/apache-tomcat-10.1.6-src.tar.gz.asc )
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=e91c4d3e4e6684d3549025c602d4258c
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.86 b/metadata/md5-cache/www-servers/tomcat-8.5.86
new file mode 100644
index 000000000000..da390eea3610
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.86
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.86:8.5.86 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.86/src/apache-tomcat-8.5.86-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.86/src/apache-tomcat-8.5.86-src.tar.gz.asc )
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=ed7c6e6000a402477e1db78346fad3f4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.72 b/metadata/md5-cache/www-servers/tomcat-9.0.72
new file mode 100644
index 000000000000..81023424d412
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.72
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.72:9.0.72 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.72/src/apache-tomcat-9.0.72-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.72/src/apache-tomcat-9.0.72-src.tar.gz.asc )
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=ac98482c27318a2166fc19b2fd274756
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
index 45456950d060..03095b83c559 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio 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_9 python_targets_python3_10 ) ) python-asyncio? ( 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	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=3ff0c3c7dff13e092a38dd9538f0330a
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 445ad3a75b58..40639a73ba86 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.27.1 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.27.1
new file mode 100644
index 000000000000..7b6b70c32f67
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.27.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c:=[curl] sci-libs/gsl:= media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind:= ) valgrind? ( dev-util/valgrind ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) man? ( dev-python/docutils ) overlay? ( >=dev-util/peg-0.1.18 x11-base/xorg-proto ) video_cards_intel? ( sys-devel/bison sys-devel/flex )
+DESCRIPTION=Intel GPU userland tools
+EAPI=8
+HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
+INHERIT=meson python-any-r1
+IUSE=chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c:=[curl] sci-libs/gsl:= media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind:= ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) doc? ( tests ) runner? ( tests )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.27.1.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0366cb9ceb50bb370dec8133e9b70753
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999 b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
index 5c59cebcf1d6..a5c54d817cf3 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
@@ -1,16 +1,16 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c:=[curl] sci-libs/gsl:= media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind:= ) valgrind? ( dev-util/valgrind ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) man? ( dev-python/docutils ) overlay? ( >=dev-util/peg-0.1.18 x11-base/xorg-proto ) video_cards_intel? ( sys-devel/bison sys-devel/flex )
 DESCRIPTION=Intel GPU userland tools
-EAPI=7
+EAPI=8
 HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
 INHERIT=git-r3 meson python-any-r1
 IUSE=chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c:=[curl] sci-libs/gsl:= media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind:= ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) doc? ( tests )
+REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) ) doc? ( tests ) runner? ( tests )
 RESTRICT=test
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=687332040726f2cf48697d1c88cbe309
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0366cb9ceb50bb370dec8133e9b70753
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 96de875144fe..079b2597a0ed 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.6 b/metadata/md5-cache/x11-base/xorg-server-21.1.6
deleted file mode 100644
index aac639eaa737..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.6
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
-DESCRIPTION=X.Org X servers
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-INHERIT=flag-o-matic xorg-3 meson
-IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
-RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0/21.1.6
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.6.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=d810d563394bf444d6359c7dff340148
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.7 b/metadata/md5-cache/x11-base/xorg-server-21.1.7
index 0952d99c391f..0064d8d2dd84 100644
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.7
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 INHERIT=flag-o-matic xorg-3 meson
 IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
 RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/21.1.7
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=8ca2f02e7aff3faa43d915032b8a3fb8
+_md5_=76136d5d84dbe2ae64f4ff907c11b8be
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.7 b/metadata/md5-cache/x11-base/xwayland-22.1.7
deleted file mode 100644
index 8ee640cb8f04..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.7.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fc7ea351ee8bdebc781d540e919f18da
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 6ef7ce111a2f..37f984bcfeeb 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.07 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.07
deleted file mode 100644
index 65987241614e..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.07
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=8
-HOMEPAGE=https://developer.nvidia.com/vulkan-driver
-INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland dist-kernel driver
-KEYWORDS=-* ~amd64
-LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-REQUIRED_USE=kernel-open? ( driver )
-SLOT=0/vulkan
-SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5254707-linux -> NVIDIA-Linux-x86_64-525.47.07.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.85.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.85.05.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/525.47.07.tar.gz -> open-gpu-kernel-modules-525.47.07.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=df230c6517eaa2b00c025b8848b2b351
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.11 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.11
new file mode 100644
index 000000000000..6670d203279c
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.47.11
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=8
+HOMEPAGE=https://developer.nvidia.com/vulkan-driver
+INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
+IUSE=+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland dist-kernel driver
+KEYWORDS=-* ~amd64
+LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
+RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+REQUIRED_USE=kernel-open? ( driver )
+SLOT=0/vulkan
+SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5254711-linux -> NVIDIA-Linux-x86_64-525.47.11.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.89.02.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/525.47.11.tar.gz -> open-gpu-kernel-modules-525.47.11.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_md5_=7715a3f8ad53b3b360b9ddcdc197cd7f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.89.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.89.02
index 07deb4d1e3c9..cb55c699ec3c 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.89.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.89.02
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
 IUSE=+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland dist-kernel driver
-KEYWORDS=-* ~amd64 ~arm64
+KEYWORDS=-* amd64 ~arm64
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/525
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/525.89.02/NVIDIA-Linux-x86_64-525.89.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/525.89.02/NVIDIA-Linux-aarch64-525.89.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.89.02.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-525.89.02.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=6a97ef5b1ee336f49a95576596173182
+_md5_=70b98bb30dc0ebf4f6f4d4d0bdbecb79
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-530.30.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-530.30.02
new file mode 100644
index 000000000000..27489de56345
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-530.30.02
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=8
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
+IUSE=+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland dist-kernel driver
+LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
+RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+REQUIRED_USE=kernel-open? ( driver )
+SLOT=0/530
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/530.30.02/NVIDIA-Linux-x86_64-530.30.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/530.30.02/NVIDIA-Linux-aarch64-530.30.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-530.30.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-530.30.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-530.30.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-530.30.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-530.30.02.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-530.30.02.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_md5_=7c13bc4ac189b39785276d473bb0ce9b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-23.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-23.0.0
new file mode 100644
index 000000000000..12b708e6a922
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-23.0.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
+DEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+DESCRIPTION=Accelerated Open Source driver for AMDGPU cards
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu
+INHERIT=xorg-3
+IUSE=udev
+KEYWORDS=~amd64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d594392da077c1ccd08dc6e48e18c78a
+_md5_=6138570688c6b38961ddc02680cd0e88
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 28d726a7a53d..b79b866e0979 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/cairo-1.17.8 b/metadata/md5-cache/x11-libs/cairo-1.17.8
new file mode 100644
index 000000000000..608b8ca3667d
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/cairo-1.17.8
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/lzo-2.06-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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/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/libxcb-1.9.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(-)?] ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A vector graphics library with cross-device output support
+EAPI=8
+HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
+INHERIT=meson-multilib
+IUSE=X aqua debug +glib gtk-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 MPL-1.1 )
+RDEPEND=>=dev-libs/lzo-2.06-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/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(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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/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/libxcb-1.9.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(-)?] )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.8/cairo-1.17.8.tar.bz2
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e156c7e6fa98078f4e4f91b371bed9d8
diff --git a/metadata/md5-cache/x11-libs/libgxim-0.5.0 b/metadata/md5-cache/x11-libs/libgxim-0.5.0
index 3e6e13e59d23..155c8ae85252 100644
--- a/metadata/md5-cache/x11-libs/libgxim-0.5.0
+++ b/metadata/md5-cache/x11-libs/libgxim-0.5.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=|| ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 x11-libs/libX11
 DESCRIPTION=GObject-based XIM protocol library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/libgxim/downloads/libgxim-0.5.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=29d3f018fbe89b40717f0b2f03dee505
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-0.2.1 b/metadata/md5-cache/x11-libs/libtinynotify-0.2.1
index 009c937f061e..c3c7eabf3a95 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-0.2.1
+++ b/metadata/md5-cache/x11-libs/libtinynotify-0.2.1
@@ -2,12 +2,12 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DEPEND=sys-apps/dbus:0=
 DESCRIPTION=A lightweight implementation of Desktop Notification Spec
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/libtinynotify/
-IUSE=debug static-libs
+EAPI=8
+HOMEPAGE=https://github.com/projg2/libtinynotify/
+IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/dbus:0=
 SLOT=0
-SRC_URI=https://github.com/mgorny/libtinynotify/releases/download/libtinynotify-0.2.1/libtinynotify-0.2.1.tar.bz2
-_md5_=57255d7efd4e089e7d87f24c1c0e2f6b
+SRC_URI=https://github.com/projg2/libtinynotify/releases/download/libtinynotify-0.2.1/libtinynotify-0.2.1.tar.bz2
+_md5_=70c981a1a2134d6e04270c84d253c464
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-9999 b/metadata/md5-cache/x11-libs/libtinynotify-9999
deleted file mode 100644
index 0f458936cbfe..000000000000
--- a/metadata/md5-cache/x11-libs/libtinynotify-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=sys-apps/dbus:0=
-DESCRIPTION=A lightweight implementation of Desktop Notification Spec
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/libtinynotify/
-INHERIT=autotools git-r3
-IUSE=debug static-libs
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=sys-apps/dbus:0=
-SLOT=0
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c0fc90cd8ac5e4e84582448536557b0e
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1-r1 b/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1-r1
index afa7632da968..e8f56581d7be 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1-r1
+++ b/metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1-r1
@@ -1,13 +1,12 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc )
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DEPEND=x11-libs/libtinynotify:=
 DESCRIPTION=Common CLI routines for tinynotify-send & sw-notify-send
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/tinynotify-send/
-IUSE=doc
+HOMEPAGE=https://github.com/projg2/tinynotify-send/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify:=
 SLOT=0
-SRC_URI=https://github.com/mgorny/tinynotify-send/releases/download/tinynotify-send-1.2.1/tinynotify-send-1.2.1.tar.bz2
-_md5_=727b21520886ba22c577a9379b0f4cdf
+SRC_URI=https://github.com/projg2/tinynotify-send/releases/download/tinynotify-send-1.2.1/tinynotify-send-1.2.1.tar.bz2
+_md5_=c8bf814bb807b448dcf64cfb6e6a0c6f
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1-r1 b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1-r1
index 686afc8561de..58670332f41a 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1-r1
+++ b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-0.1-r1
@@ -1,13 +1,12 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc )
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DEPEND=sys-process/procps:= x11-libs/libtinynotify:=
 DESCRIPTION=A system-wide notifications module for libtinynotify
 EAPI=8
-HOMEPAGE=https://github.com/mgorny/libtinynotify-systemwide/
-IUSE=doc
+HOMEPAGE=https://github.com/projg2/libtinynotify-systemwide/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-process/procps:= x11-libs/libtinynotify:=
 SLOT=0
-SRC_URI=https://github.com/mgorny/libtinynotify-systemwide/releases/download/libtinynotify-systemwide-0.1/libtinynotify-systemwide-0.1.tar.bz2
-_md5_=89b7c343bdc6fad620eb86ef945e7cdd
+SRC_URI=https://github.com/projg2/libtinynotify-systemwide/releases/download/libtinynotify-systemwide-0.1/libtinynotify-systemwide-0.1.tar.bz2
+_md5_=7eb4f94064c6ee98fc836dd6f188475e
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6d55d60fcc2a..00fd273664ad 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/lightdm-gtk-greeter-2.0.7-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
index 0b51ecb00af7..4e1777d84a65 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.7-r1
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
 SLOT=0
-SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.7/+download/lightdm-gtk-greeter-2.0.7.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
+SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.7/+download/lightdm-gtk-greeter-2.0.7.tar.gz branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=133692613fc7126919a80d6f259de227
+_md5_=8a7d3550bf6b955a4cfe72c063727851
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
index eabee6a4b3dd..f0365119827c 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
 SLOT=0
-SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
+SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=aa1446bfc938f27e56df29c6f7ce1128
+_md5_=df38491c0738064bb5e24dfa5e7a4333
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8-r1 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8-r1
new file mode 100644
index 000000000000..4b3a6dfd2ec6
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool dev-util/xfce4-dev-tools sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 appindicator? ( dev-libs/ayatana-ido dev-libs/libayatana-indicator:3 )
+DESCRIPTION=LightDM GTK+ Greeter
+EAPI=8
+HOMEPAGE=https://github.com/Xubuntu/lightdm-gtk-greeter
+INHERIT=autotools xdg-utils
+IUSE=appindicator branding
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
+RDEPEND=x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 appindicator? ( dev-libs/ayatana-ido dev-libs/libayatana-indicator:3 ) x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
+SLOT=0
+SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6f1530b24ba6b80431453c735d04f3fa
diff --git a/metadata/md5-cache/x11-misc/polybar-3.6.3-r2 b/metadata/md5-cache/x11-misc/polybar-3.6.3-r2
index f032a169dda4..aba3c649ebf0 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.6.3-r2
+++ b/metadata/md5-cache/x11-misc/polybar-3.6.3-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/polybar/polybar
 INHERIT=cmake python-single-r1
 IUSE=alsa curl doc i3wm ipc mpd network pulseaudio python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( x11-base/xcb-proto[python_targets_python3_9(-)] ) python_single_target_python3_10? ( x11-base/xcb-proto[python_targets_python3_10(-)] ) python_single_target_python3_11? ( x11-base/xcb-proto[python_targets_python3_11(-)] ) dev-libs/libuv:= media-libs/fontconfig media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:= x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) doc? ( dev-python/sphinx ) i3wm? ( dev-libs/jsoncpp:= || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/polybar/polybar/releases/download/3.6.3/polybar-3.6.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=293e1e9ad9a7efc2f7a696c661ae58fb
+_md5_=b5f6824c012013b14f14cdd79ae8a3d3
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.6 b/metadata/md5-cache/x11-misc/qt5ct-1.6
new file mode 100644
index 000000000000..72d530205b68
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
+DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.6.tar.bz2
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=43f2686ac231078f8f4e3d445a1467ea
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.7 b/metadata/md5-cache/x11-misc/qt5ct-1.7
new file mode 100644
index 000000000000..380d1305a74f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
+DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.7.tar.bz2
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=43f2686ac231078f8f4e3d445a1467ea
diff --git a/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109 b/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109
index 8eabdf7fc21d..4438833bdf7c 100644
--- a/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109
+++ b/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.thregr.org/~wavexx/software/screenkey/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
 IUSE=appindicator python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/fontawesome x11-libs/gtk+:3[X,introspection] x11-misc/slop appindicator? ( dev-libs/libayatana-appindicator ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/screenkey/screenkey/-/archive/7bdba66574244061c6e1934c4f204d02d570f182/screenkey-7bdba66574244061c6e1934c4f204d02d570f182.tar.bz2 -> screenkey-1.5_p20230109.tar.bz2
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c591c706ed12db3fcda1bde157ebae7c
+_md5_=e71921e41ecead1923d1457a206d645c
diff --git a/metadata/md5-cache/x11-misc/slim-1.3.6-r5 b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
index c7b6c19b8e3d..cedace3786ab 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.6-r5
+++ b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/slim.berlios/
 INHERIT=cmake pam systemd
 IUSE=branding pam
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 PDEPEND=branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/libXrandr media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg pam? ( sys-libs/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/slim.berlios/slim-1.3.6.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c075ffabab70c22aa4ac03df70d11d54
+_md5_=f375aa26eccce9348019d5d45b0f65f1
diff --git a/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1 b/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1
index d659af9f7e97..5f7f1fcaba7c 100644
--- a/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1
+++ b/metadata/md5-cache/x11-misc/sw-notify-send-1.2.1
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure
-DEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-1.2.1 x11-libs/libtinynotify-systemwide:0= virtual/pkgconfig
+DEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-1.2.1 x11-libs/libtinynotify-systemwide:0=
 DESCRIPTION=A system-wide variant of tinynotify-send
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/tinynotify-send/
+EAPI=8
+HOMEPAGE=https://github.com/projg2/tinynotify-send/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-1.2.1 x11-libs/libtinynotify-systemwide:0=
 SLOT=0
-SRC_URI=https://github.com/mgorny/tinynotify-send/releases/download/tinynotify-send-1.2.1/tinynotify-send-1.2.1.tar.bz2
-_md5_=5fa48eee664ed5ab29386fef57c9eb30
+SRC_URI=https://github.com/projg2/tinynotify-send/releases/download/tinynotify-send-1.2.1/tinynotify-send-1.2.1.tar.bz2
+_md5_=c30728229bf5298e5558b1054c2eb3c2
diff --git a/metadata/md5-cache/x11-misc/sw-notify-send-9999 b/metadata/md5-cache/x11-misc/sw-notify-send-9999
deleted file mode 100644
index 83c715b4d4d6..000000000000
--- a/metadata/md5-cache/x11-misc/sw-notify-send-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure prepare unpack
-DEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide:0= dev-util/gtk-doc virtual/pkgconfig
-DESCRIPTION=A system-wide variant of tinynotify-send
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/tinynotify-send/
-INHERIT=autotools git-r3
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide:0=
-SLOT=0
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7cb89c23156b3c0e4e0d4df248d6da49
diff --git a/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1 b/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
index e0c19a199fdd..5ae8c957256e 100644
--- a/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
+++ b/metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure postinst postrm
-DEPEND=app-eselect/eselect-notify-send x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-1.2.1 virtual/pkgconfig
+DEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-1.2.1
 DESCRIPTION=A notification sending utility (using libtinynotify)
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/tinynotify-send/
+EAPI=8
+HOMEPAGE=https://github.com/projg2/tinynotify-send/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=app-eselect/eselect-notify-send x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-1.2.1
+RDEPEND=x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-1.2.1 app-eselect/eselect-notify-send
 SLOT=0
-SRC_URI=https://github.com/mgorny/tinynotify-send/releases/download/tinynotify-send-1.2.1/tinynotify-send-1.2.1.tar.bz2
-_md5_=c7d4d2f000f31bfe886564e301d904b7
+SRC_URI=https://github.com/projg2/tinynotify-send/releases/download/tinynotify-send-1.2.1/tinynotify-send-1.2.1.tar.bz2
+_md5_=bb2047090248f331bbfea2b1a394f5f9
diff --git a/metadata/md5-cache/x11-misc/tinynotify-send-9999 b/metadata/md5-cache/x11-misc/tinynotify-send-9999
deleted file mode 100644
index eac27b8a2fff..000000000000
--- a/metadata/md5-cache/x11-misc/tinynotify-send-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare unpack
-DEPEND=app-eselect/eselect-notify-send x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999 dev-util/gtk-doc virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A notification sending utility (using libtinynotify)
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/tinynotify-send/
-INHERIT=autotools git-r3
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=app-eselect/eselect-notify-send x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-9999
-SLOT=0
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=90f65de3b4c3fdd8fb412553687a29f6
diff --git a/metadata/md5-cache/x11-misc/xclip-0.13 b/metadata/md5-cache/x11-misc/xclip-0.13
index 38b95aaf68d1..79087936f028 100644
--- a/metadata/md5-cache/x11-misc/xclip-0.13
+++ b/metadata/md5-cache/x11-misc/xclip-0.13
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=Copy data from standard input to X clipboard
 EAPI=8
 HOMEPAGE=https://github.com/astrand/xclip
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=https://github.com/astrand/xclip/archive/0.13.tar.gz -> xclip-0.13.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=73032fbb122db7c0032aac8cc1876e44
+_md5_=67aa531a5a9b5ee2bd636891b9fc125a
diff --git a/metadata/md5-cache/x11-misc/xclip-9999 b/metadata/md5-cache/x11-misc/xclip-9999
index c4e418c1162f..a7dafc49895d 100644
--- a/metadata/md5-cache/x11-misc/xclip-9999
+++ b/metadata/md5-cache/x11-misc/xclip-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-base/xorg-proto x11-libs/libXt
 DESCRIPTION=Copy data from standard input to X clipboard
 EAPI=8
 HOMEPAGE=https://github.com/astrand/xclip
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8eb6336770c9e3651002460b7a131eaa
+_md5_=faa10e1ce5fa6bb23e89625932a0d943
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.38 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
new file mode 100644
index 000000000000..5514ed3e4e8e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
@@ -0,0 +1,12 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-libs/libxslt sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=X keyboard configuration database
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
+INHERIT=meson python-any-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.38.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=077109571759e8bc65893f356f3fe651
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-21.1.7.1 b/metadata/md5-cache/x11-misc/xvfb-run-21.1.7.1
new file mode 100644
index 000000000000..f066f401f26c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xvfb-run-21.1.7.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-util/patchutils
+DESCRIPTION=Run a command in a virtual X server environment
+EAPI=8
+HOMEPAGE=https://packages.debian.org/sid/xvfb
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
+SLOT=0
+SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_21.1.7-1.diff.gz
+_md5_=78415546f91d5e8837e8d88329bc8477
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 9d181581d173..41a323892ce7 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1-r2 b/metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1-r2
index 435d99c64e28..8929370aae19 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1-r2
+++ b/metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/philipl/pidgin-indicator
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools xdg
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libayatana-appindicator net-im/pidgin[gtk] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/philipl/pidgin-indicator/releases/download/1.0.1/pidgin-indicator-1.0.1.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c19f554028e196547998316d31d605d3
+_md5_=31f39b708c00c52a64a2f8d48eb71c01
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 26b2b55294a0..d59548bbecba 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/kitty-0.27.1 b/metadata/md5-cache/x11-terms/kitty-0.27.1
index 32b5d851a20c..7dc7a5ad3b22 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.27.1
+++ b/metadata/md5-cache/x11-terms/kitty-0.27.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://sw.kovidgoyal.net/kitty/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg verify-sig
 IUSE=+X test wayland python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 verify-sig
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3 ZLIB Apache-2.0 BSD MIT
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= net-libs/librsync:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.27.1 ~x11-terms/kitty-terminfo-0.27.1 X? ( x11-libs/libX11 ) wayland? ( dev-libs/wayland ) !sci-mathematics/kissat
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( X wayland ) test? ( X wayland )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.27.1/kitty-0.27.1.tar.xz https://dev.gentoo.org/~ionen/distfiles/kitty-0.27.1-vendor.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.27.1/kitty-0.27.1.tar.xz.sig )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b454370c1e9300078c3a29ceb52ec0c4
+_md5_=379f1567ae9c2549411ba053f1ed36bf
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.27.1 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.27.1
index 6bbc215f58fd..73c3508a6b3d 100644
--- a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.27.1
+++ b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.27.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Shell integration scripts for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.27.1/kitty-0.27.1.tar.xz
-_md5_=140b3218cf09db3f6268357064ed6125
+_md5_=14f1d1f3455c8b72a6e5198b7ca241c8
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.27.1 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.27.1
index 1c3e5fbb10cb..c6a2f1e5424b 100644
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.27.1
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.27.1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.27.1/kitty-0.27.1.tar.xz
-_md5_=8e8f1db545678335a7636902dc4e029e
+_md5_=1271db4a43bedbc8e4a058c3a7ccaf6a
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.1-r1 b/metadata/md5-cache/x11-terms/terminator-2.1.1-r1
deleted file mode 100644
index 7d511fdd9553..000000000000
--- a/metadata/md5-cache/x11-terms/terminator-2.1.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext test? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libnotify[introspection] ) verify-sig? ( sec-keys/openpgp-keys-terminator ) test? ( dev-libs/glib:2 dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] gnome-base/gsettings-desktop-schemas[introspection] x11-libs/gtk+:3 x11-libs/vte:2.91[introspection] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DESCRIPTION=Multiple GNOME terminals in one window
-EAPI=8
-HOMEPAGE=https://github.com/gnome-terminator/terminator
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 optfeature verify-sig virtualx xdg
-IUSE=test test python_targets_python3_9 python_targets_python3_10 verify-sig test
-KEYWORDS=amd64 ~ppc ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] gnome-base/gsettings-desktop-schemas[introspection] x11-libs/gtk+:3 x11-libs/vte:2.91[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-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	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0712cdd0c9536b86c502b31fd8cfff28
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.2 b/metadata/md5-cache/x11-terms/terminator-2.1.2
index edaf95792aae..d9ea7709acd4 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.2
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.2
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/gnome-terminator/terminator
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature verify-sig virtualx xdg
 IUSE=test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig test
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] gnome-base/gsettings-desktop-schemas[introspection] x11-libs/gtk+:3 x11-libs/vte:2.91[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.2/terminator-2.1.2.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.2/terminator-2.1.2.tar.gz.asc )
 _eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9e8d059adf201ab58d0026a59b4f8e60
+_md5_=8cd37aabf706a6774f73289caff90f87
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index c11a9f23cf68..67bff3147fb3 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/papirus-icon-theme-20221201 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20221201
deleted file mode 100644
index 6e19931568bc..000000000000
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20221201
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DESCRIPTION=Free and open source SVG icon theme
-EAPI=8
-HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20221201.tar.gz -> papirus-icon-theme-20221201.tar.gz
-_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2a50318f055c91d976121ec4ba7701f1
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20230301 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20230301
new file mode 100644
index 000000000000..148efae067b8
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20230301
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DESCRIPTION=Free and open source SVG icon theme
+EAPI=8
+HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=xdg
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20230301.tar.gz -> papirus-icon-theme-20230301.tar.gz
+_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5ca88d96d111ea2ca45eb833092ccb44
diff --git a/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r7 b/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r7
index b59eb97ef589..d96b7d51a4e5 100644
--- a/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r7
+++ b/metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r7
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=SLiM (Simple Login Manager) themes pack
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/slim.berlios/
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-misc/slim
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/project/slim.berlios/slim-1.2.3-themepack1a.tar.gz mirror://sourceforge/project/slim.berlios/slim-gentoo-simple.tar.bz2 mirror://gentoo/slim-archlinux.tar.gz mirror://sourceforge/project/slim.berlios/slim-debian-moreblue.tar.bz2 mirror://sourceforge/project/slim.berlios/slim-fingerprint.tar.gz mirror://sourceforge/project/slim.berlios/slim-flat.tar.gz mirror://sourceforge/project/slim.berlios/slim-lunar-0.4.tar.bz2 mirror://sourceforge/project/slim.berlios/slim-previous.tar.gz mirror://sourceforge/project/slim.berlios/slim-rainbow.tar.gz mirror://sourceforge/project/slim.berlios/slim-rear-window.tar.gz mirror://sourceforge/project/slim.berlios/slim-scotland-road.tar.gz mirror://sourceforge/project/slim.berlios/slim-subway.tar.gz mirror://sourceforge/project/slim.berlios/slim-wave.tar.gz mirror://sourceforge/project/slim.berlios/slim-zenwalk.tar.gz mirror://sourceforge/project/slim.berlios/slim-archlinux-simple.tar.gz mirror://sourceforge/project/slim.berlios/slim-lake.tar.gz mirror://gentoo/slim-gentoo-1.0.tar.bz2 http://www.xfce-look.org/CONTENT/content-files/48605-xfce-g-box-slim-0.1.tar.gz http://www.konstantinhansen.de/source/slim_themes/gentoo_10_purple/gentoo_10_purple.tar.bz2 -> gentoo_10_purple-r1.tar.bz2 http://www.konstantinhansen.de/source/slim_themes/gentoo_10_blue/gentoo_10_blue.tar.bz2 -> gentoo_10_blue-r1.tar.bz2 http://www.konstantinhansen.de/source/slim_themes/gentoo_10_dark/gentoo_10_dark.tar.bz2 -> gentoo_10_dark-r1.tar.bz2
-_md5_=89e96c1b06f911cbbdd007a412069982
+_md5_=c5536e17473da846bf714953d3ea81a7
diff --git a/metadata/md5-cache/x11-themes/ubuntu-wallpapers-22.10.3 b/metadata/md5-cache/x11-themes/ubuntu-wallpapers-22.10.3
index b3477d8243b2..029019416ae4 100644
--- a/metadata/md5-cache/x11-themes/ubuntu-wallpapers-22.10.3
+++ b/metadata/md5-cache/x11-themes/ubuntu-wallpapers-22.10.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Ubuntu wallpapers
 EAPI=8
 HOMEPAGE=https://launchpad.net/ubuntu/+source/ubuntu-wallpapers
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-wallpapers/ubuntu-wallpapers_22.10.3.orig.tar.gz
-_md5_=bfc125ec1b8984d7c9d1ed74c0acc573
+_md5_=2d249870f8725f75fbb080d9c205f7bb
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 1fac72a1d0e1..c710b8738a19 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/subtle-0.11.3244-r1 b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
index e325efd90c34..bbe1df53a598 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=49a1326fcd33328d94a226525b20afa0
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 3e0b2eaf4980..01ed29c22f21 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2
new file mode 100644
index 000000000000..99f1079b5767
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/glib-2.68.0:2 >=x11-libs/gtk+-3.22:3[wayland?,X?] >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.14.0:= >=xfce-base/xfconf-4.10:= sound? ( >=media-libs/libcanberra-0.30[gtk3] ) wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
+DESCRIPTION=Notification daemon for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/notifyd/start https://gitlab.xfce.org/apps/xfce4-notifyd/
+INHERIT=xdg-utils
+IUSE=sound wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/glib-2.68.0:2 >=x11-libs/gtk+-3.22:3[wayland?,X?] >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.14.0:= >=xfce-base/xfconf-4.10:= sound? ( >=media-libs/libcanberra-0.30[gtk3] ) wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.8/xfce4-notifyd-0.8.2.tar.bz2
+_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7ab04a604dc2b235af2e6a4a4e9d2b13
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d9eaa37e08af..2d4ec5b1defa 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Feb 2023 20:09:59 +0000
+Thu, 02 Mar 2023 05:10:02 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 2c834eb606f3..e09d676e0c01 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -806,6 +806,11 @@
       <name>Anthony G. Basile</name>
       <role>AMD64, ARM, X86, MIPS, PPC</role>
     </member>
+    <member>
+      <email>ceamac@gentoo.org</email>
+      <name>Viorel Munteanu</name>
+      <role>Bugs</role>
+    </member>
     <member>
       <email>jsmolic@gentoo.org</email>
       <name>Jakov Smolić</name>
@@ -3608,6 +3613,10 @@
       <email>blueness@gentoo.org</email>
       <name>Anthony G. Basile</name>
     </member>
+    <member>
+      <email>ceamac@gentoo.org</email>
+      <name>Viorel Munteanu</name>
+    </member>
     <member>
       <email>jmbsvicetto@gentoo.org</email>
       <name>Jorge Manuel B. S. Vicetto</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index bab361a819b5..b51b2dc9241c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Feb 25 08:09:58 PM UTC 2023
+Thu Mar  2 05:10:01 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b94ac7874ca7..cea1260486f7 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Feb 2023 20:30:01 +0000
+Thu, 02 Mar 2023 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 523d2224b713..831af073ad23 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-51d3b989250067c832d4700b3cf330986a8e1019 1677355530 2023-02-25T20:05:30+00:00
+37ee174421b6f5279221551a764a9a05cbaa098a 1677720563 2023-03-02T01:29:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6f7210154718..9f67dcacb9e9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1677355801 Sat 25 Feb 2023 08:10:01 PM UTC
+1677733801 Thu 02 Mar 2023 05:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d9eaa37e08af..ece81897432e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 25 Feb 2023 20:09:59 +0000
+Thu, 02 Mar 2023 05:10:01 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 7c0f09d8d061..7978d9e69c65 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
index 2cdb64c1521b..5814f14e5026 100644
--- a/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 779449fafb84..ed94d18e70a8 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 4f2ebb055b5c..be4a6104cdd4 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,6 +1 @@
-DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3516f7ff2a6fda77829433398986bc564b377362097ea7c2595ac01911a817be124c9f0ba560dd00ae5001a080da7 SHA512 43cbf099841fe2547b7de56610f811e55fdf2e9af3dc18fde818e09de1125a7f8d57f6a16f2dee8ea4b9e6f2683959549810a1ea7f8f7b5007eb7069bfddb477
-DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961cafe060d285fcd63f968c5f33cd2c4393288c44262eb12665c6471d757d65a9a2406c7d80997736ada6189ba1c8450 SHA512 1748c5f6ea392b6cfc6b761632bc632422fb6910f53fb26a796003cdc0048f28ab550daa0658a6d5de5fec65b0a5aae8f44f68ec65c19f06b11eda6fd337c8d4
-DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d
-DIST netdata-1.37.0.tar.gz 25151327 BLAKE2B 7e83df21e50d721d7e8a226fbc4470972393ab086fa575298b36f5699dfa4fffa406ce8a532661b1adfb7b5755e69c227f85f7c36e96f3cc585004082c25eda2 SHA512 7234d8b414df6674e612718085f446b1321833772d2d28e01da13f1d296b772e5dc73bf39495ab9a8db7f3118f3053000c16d6b17fe2a28e8340cef0d208d4bf
-DIST netdata-1.37.1.tar.gz 25160143 BLAKE2B 9efd0edeb6d2d76338c98c794c4e81a00a951e40e9fe4682030f04c28b1a9895bac0c06a695b055ce94cbf1fb55c516364daec026759134a590e645a2c380ca6 SHA512 fa60f11b79c89fb8b1d825c7d395b294f291e6b72acb1c9b47212c145ca2e6c28b9370ebdbb1c8666884e2b714e2fd8ba498ffc6b428361b93471e4d555cdfa7
 DIST netdata-1.38.0.tar.gz 25433888 BLAKE2B 06c311a43658767ca3948dd68c64a4ad42d25b392d4146ff04946f3301afad73731329d43806bc93311f3450a0f4d1357de97565c01abbc5324f25abe5c27823 SHA512 228d08639162ea158c583350139cd2d5513c72cc29abf94e87af9f21e89516a47994c78c4cea15866089e29617e9e2d73103d34613e0eec0e81beb9aa23fc0cd
diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild
deleted file mode 100644
index 43f41d50852d..000000000000
--- a/net-analyzer/netdata/netdata-1.35.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python{3_9,3_10} )
-
-inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-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 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-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
-	app-alternatives/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	cloud? ( dev-libs/protobuf:= )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	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_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ppc64; then
-		# bundled dlib does not support vsx on big-endian
-		# https://github.com/davisking/dlib/issues/397
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--without-bundled-protobuf \
-		$(use_enable cloud) \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		--disable-exporting-kinesis \
-		$(use_enable lto lto) \
-		$(use_enable mongodb exporting-mongodb) \
-		$(use_enable prometheus exporting-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_compile() {
-	emake clean
-	default
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use nfacct ; then
-		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
-	fi
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-
-	if use ipmi ; then
-	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild
deleted file mode 100644
index 43f41d50852d..000000000000
--- a/net-analyzer/netdata/netdata-1.36.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python{3_9,3_10} )
-
-inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-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 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-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
-	app-alternatives/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	cloud? ( dev-libs/protobuf:= )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	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_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ppc64; then
-		# bundled dlib does not support vsx on big-endian
-		# https://github.com/davisking/dlib/issues/397
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--without-bundled-protobuf \
-		$(use_enable cloud) \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		--disable-exporting-kinesis \
-		$(use_enable lto lto) \
-		$(use_enable mongodb exporting-mongodb) \
-		$(use_enable prometheus exporting-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_compile() {
-	emake clean
-	default
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use nfacct ; then
-		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
-	fi
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-
-	if use ipmi ; then
-	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
deleted file mode 100644
index 2b50034f9888..000000000000
--- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python{3_9,3_10} )
-
-inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-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 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-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
-	app-alternatives/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4:=
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv:=
-	cloud? ( dev-libs/protobuf:= )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl:=
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		app-arch/snappy:=
-		dev-libs/protobuf:=
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ppc64; then
-		# bundled dlib does not support vsx on big-endian
-		# https://github.com/davisking/dlib/issues/397
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--without-bundled-protobuf \
-		$(use_enable cloud) \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		--disable-exporting-kinesis \
-		$(use_enable lto lto) \
-		$(use_enable mongodb exporting-mongodb) \
-		$(use_enable prometheus exporting-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_compile() {
-	emake clean
-	default
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use nfacct ; then
-		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
-	fi
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-
-	if use ipmi ; then
-	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild
deleted file mode 100644
index 2b50034f9888..000000000000
--- a/net-analyzer/netdata/netdata-1.37.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python{3_9,3_10} )
-
-inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-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 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-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
-	app-alternatives/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4:=
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv:=
-	cloud? ( dev-libs/protobuf:= )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl:=
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		app-arch/snappy:=
-		dev-libs/protobuf:=
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ppc64; then
-		# bundled dlib does not support vsx on big-endian
-		# https://github.com/davisking/dlib/issues/397
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--without-bundled-protobuf \
-		$(use_enable cloud) \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		--disable-exporting-kinesis \
-		$(use_enable lto lto) \
-		$(use_enable mongodb exporting-mongodb) \
-		$(use_enable prometheus exporting-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_compile() {
-	emake clean
-	default
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use nfacct ; then
-		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
-	fi
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-
-	if use ipmi ; then
-	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.37.1.ebuild b/net-analyzer/netdata/netdata-1.37.1.ebuild
deleted file mode 100644
index 2b50034f9888..000000000000
--- a/net-analyzer/netdata/netdata-1.37.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python{3_9,3_10} )
-
-inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-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 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-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
-	app-alternatives/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4:=
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv:=
-	cloud? ( dev-libs/protobuf:= )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl:=
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		app-arch/snappy:=
-		dev-libs/protobuf:=
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ppc64; then
-		# bundled dlib does not support vsx on big-endian
-		# https://github.com/davisking/dlib/issues/397
-		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--without-bundled-protobuf \
-		$(use_enable cloud) \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		--disable-exporting-kinesis \
-		$(use_enable lto lto) \
-		$(use_enable mongodb exporting-mongodb) \
-		$(use_enable prometheus exporting-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_compile() {
-	emake clean
-	default
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use nfacct ; then
-		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
-	fi
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-
-	if use ipmi ; then
-	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.38.0.ebuild b/net-analyzer/netdata/netdata-1.38.0.ebuild
index 2b50034f9888..592170b449c3 100644
--- a/net-analyzer/netdata/netdata-1.38.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.38.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python{3_9,3_10} )
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
 
 inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
 
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 3d8927777fee..3c4c45f78a89 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python{3_9,3_10} )
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
 
 inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
 
@@ -135,8 +135,8 @@ src_install() {
 
 	fowners -Rc root:netdata /usr/share/${PN}
 
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
+	newinitd system/openrc/init.d/netdata ${PN}
+	systemd_dounit system/systemd/netdata.service
 	insinto /etc/netdata
 	doins system/netdata.conf
 }
diff --git a/net-analyzer/suricata/suricata-6.0.10.ebuild b/net-analyzer/suricata/suricata-6.0.10.ebuild
index 69445880fb19..697b19988894 100644
--- a/net-analyzer/suricata/suricata-6.0.10.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.10.ebuild
@@ -119,6 +119,7 @@ src_configure() {
 	if use debug; then
 		myeconfargs+=( $(use_enable debug) )
 		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		QA_FLAGS_IGNORED="usr/bin/${PN}"
 		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
 	else
 		econf ${myeconfargs[@]}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 0edca27187e1..83079ba83e3f 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,22 +1,12 @@
 DIST zabbix-4.0.44.tar.gz 17713321 BLAKE2B 1f75f99430846cfc029d5e541ede7ef8c019a42af0ab6d70be3170052b723877ca54f6554cd9a29f7f436fb6e9d5ffd02913a1b12ad45a2a8ed00432738e5660 SHA512 223d6fdd352e5731487797d839c1741209eae79af78a058d3ba29e5a9eaab5cbf91072ad827bdd676696d3ea518c638d7fd515bff2a257aef3a7ad38f41b3cb6
-DIST zabbix-5.0.29-go-deps.tar.xz 34421032 BLAKE2B 35809df9e2d9186813ec079d31206bccd8e4bf6da0376e1e87a65ccb17345bc3f8e81820cbad7700ab2596ede4fe604867337b89d74ac3254eeccacc128a4708 SHA512 6553612cc1b7a01cd6b43378f7a5e15fd99245ecc23d1345a0a780ba506073ac2b8b68e96599f56ea7a01052d74b14f6e2f29ca9a97d71748fe285583531f82d
-DIST zabbix-5.0.29.tar.gz 21471836 BLAKE2B e38f3b7c38900d80ca0497326f9979e793d04fd34d716673e76ea65723e0019caa7e1e92e581ac6423f77a2fff7554250c728721c125596b1c9a17b0c860346b SHA512 60e707d79ee9f92b69aecabc97e92ad04d0d66839ceed250788f111db4128a66197b9c528bde8cb4f4f92e6a5502ff31c6d838e3c1d3b81ce6b7910879915b61
 DIST zabbix-5.0.30-go-deps.tar.xz 34398308 BLAKE2B f987ec0518a070d9480be7a57a8101f6c65f89ff0cdf513cb19b5d79e88c410782df87e732c7d838e6db6dd933cc855c027fc8351855121a57e0a2912ed0bda2 SHA512 eb1ad8c3983e475229887a2561f6e55ed3a4c1be270221fc12c0d0fcba7f2ad661f984f16f5f5d9684496c35c6daebd93dd13f5e898244af90d9ad9bffb911c6
 DIST zabbix-5.0.30.tar.gz 21505195 BLAKE2B e6876b896e61feccdcfa05a9bc2ae57345957e8e4dc2e2c3d635e917cc525c9cf4dad5e45821e6677f766654bd702b8baac8b65a4fc286af816fbf2b2e076a0c SHA512 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e
 DIST zabbix-5.0.31-go-deps.tar.xz 34443128 BLAKE2B 38bf33002e6dbae95b39579383f8bb6998b0408434f140b1bb31e7cadf07a0363ac6234a820ec306cc12f764fc43d250a45ffd159a315dc494d0871ae6167660 SHA512 4d54ff09ccb356b3080240065598cc93d11a11c8faef0c6a22ec923face789cf2bee95ddaf62d0ecd74bd0807060fb4fcbcfa71b1ffcb8723096b1164d7c25ae
 DIST zabbix-5.0.31.tar.gz 21567566 BLAKE2B 076090e07856df0dc2603d75fb7cc9862e40b9e6bda89094cf687aa00719a0df7cf7fd93bc973cb38cbbb31b6b723efd3dc5aa6dde00b4f4a5b118331795bfeb SHA512 7409e23313a6c5f6f4f1e1c0ba0ccfec88aa2687caa25673709bf05b9e287a535ea417551dee0f9d2fbd571adfe843a700ee45ee3dc72752cdeab12ec4c54644
-DIST zabbix-6.0.10-go-deps.tar.xz 27482516 BLAKE2B 64b9f2d093aaa8b7b1b39d4736f9b087fdcc518b1a5eced7a46bfe5a1ea2c1bc2d3641ab8e61d4fca8f036a8a96d8c8b56fe9dab17b356b8c5e507f77f10b864 SHA512 15b4799d8934155112469f4a571b8f015a0779b7c946a49cebb4b513ff7553989cd71704e403ae3fdf18646235fc40daf14bb9481d493ad8e6b53146fd7f3f27
-DIST zabbix-6.0.10.tar.gz 39516402 BLAKE2B 00e81dcea63433cb93ef9bd77094bef89f7d604d8c07b9da5959c79d54f026b1256f486395229e0232aa96271b72fd9f3c67e08dfb96321be398b8b4fa832f6f SHA512 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
-DIST zabbix-6.0.11-go-deps.tar.xz 27480580 BLAKE2B 443ecbd9fd0d66cacc75f53d5f56ae996bce52e04827de97948ffc6a3e02888b4b5122eba2425465624e34bc628992f7a520bc8e0281444baed0aa1631f3bec1 SHA512 0936626b658f1811e8aebdd59ca506b33f1a95696018b088cfe04479386ecbcfe4c6c7fac6d26487e28d36cb6283028312c3bc2d27bde8cf54698236d3bc6ba4
-DIST zabbix-6.0.11.tar.gz 40388383 BLAKE2B e6ded007285aac58bb4c29075ac8d34f6ab0db1a74702269b63dc8772ebdf8b2986737fa91d39c9e8bacee5e1e12d7d7bb9580221f9b4917cbc829784639201d SHA512 decb9fcf5de8f0d81cd0b16b6a5e341742c97baed0faf2d5f22bba98fd9fad4e154360724b5aedc378d5b5e2c64eda36f308e3eb6e6f8e80a5cf082ea95ebef6
 DIST zabbix-6.0.12-go-deps.tar.xz 27481268 BLAKE2B cfeca38b63a6271b4ff6819143e0214d3b468e3f7b681cc0bde443192e84ec4b66eb9b8ce38be01fa74a186f8904dfe73af04ad98007880e9ad6aab5c4b978b3 SHA512 c021efe15b61eeebad855ee9d8081f06796d126f3215bac4cb8a36384185aa2a67c0af580b5fcd830e6da832eb1057c02621c71569e30735fb0bef172f26d3b4
 DIST zabbix-6.0.12.tar.gz 40419443 BLAKE2B 18e328a3361947292b3c78fc75dbcfc464f3419fb35bd0895049c90d26d362edbe0a727d1ab955f428ec812d6f38f68717f3c635216aff0468f188321b476495 SHA512 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
 DIST zabbix-6.0.13-go-deps.tar.xz 17974536 BLAKE2B 296ae034ccf0f6cd1d83379c46ad87d80faf3d897d807d948312989e044dc4d159aabab27999730ed255be3c7d5aa6b70927bcfb888f9969b36994c68246c14b SHA512 279aeed128e00dab8f1824ed7186ddc914615f7756a96c049bff0321997c9e412007c56701a036a1a25029aa7c4f878ad4566e95abbf766ee353666a6a588370
 DIST zabbix-6.0.13.tar.gz 41075557 BLAKE2B 41db999c52d3ca596861d8850d594e639159b8c7090b47dd824be5b2695a6f1ebc0399643de8fb25af4081ab294c6fefe7ec9c0025ba4e4d17d44aa16d8b233a SHA512 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
-DIST zabbix-6.2.4-go-deps.tar.xz 27489292 BLAKE2B 174c822aa1488fd2dfb726ed2cd5d2e86147404793ae97c6d45554de7cdf36073aa28a988e967798afb6681d1c054252433fcbae68816ccca79401383d4cc4e5 SHA512 6c1fa17663aaf91e234c34f7019b6f5b3720ab6c4300ece1ac5404f9f8499b74b6a2f5ab54e2eb0ac221d0df5e5e271762ff2f2f776e782bff0a3c85fe8f6407
-DIST zabbix-6.2.4.tar.gz 40299367 BLAKE2B ee74829acbac90a37bc3bcf3c95a92a7df1f83099cda7c9ba9ed225d3bdfa0e49667c5aa1522dbdac1ca2da8b621f94d384c857af8c66db87353f044f6ec0420 SHA512 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
-DIST zabbix-6.2.5-go-deps.tar.xz 27499244 BLAKE2B c8c7e59e0c2d61224bbfd11690a54b411a981e4ab3a39e217a03be83bdae04914898ab7b38c00d3a48900b769eabf51901410247a204915e0e901182c69266f3 SHA512 0c13f15b2ed62a6eb418244560cd40e277d333f17e65ceb9125335408fd632870d260f986b5c76328bc91e6b0b619816836c543f5d87ef5d957904aad722f613
-DIST zabbix-6.2.5.tar.gz 41020695 BLAKE2B 5e21867358cc6c4374695b7da6d74b8c3642bf4e1f41ebcdb2a158c01e5a4b6ffd679728a35badeb3cbefe0968d97577e9141340b32287cb01d89e0f227b964a SHA512 3cf5745942f69eee348c37ddb1bb68937c628ee97d050b0bfed37be66e4a30a6448829cbfa000f9388761e6611af9ae7046fdc63b608f3bcce1575bfa476dd5b
 DIST zabbix-6.2.6-go-deps.tar.xz 27486336 BLAKE2B e17aa599bc6be82e211f48642c03a73594965dd51a83b7e7e9ccbe949865034348a33cb413824d3d1aabd6aba56751132ef95dc333f75657bce3cc3fa4f1ef01 SHA512 eb18c6a78b0523543b7273c489d2dda94adb983df802b03020374b4bda51a44bf01e92bafe556242710f942474a9547a8366f724187f9a429e28bb94c0fa9c57
 DIST zabbix-6.2.6.tar.gz 41038757 BLAKE2B bc2dd394085d2bb32a052f682d7271b14967ca4100ada34a1145e0b137c32036202346a7ee7bed06f62ddf6a6c9b1033b9b1534aef50850a6d49446b40e6aa21 SHA512 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
 DIST zabbix-6.2.7-go-deps.tar.xz 17973952 BLAKE2B f7e155040a60ac48236084b404d469bc5c34ab0dd986d3d647960bb6313f8080298f359680d6be23d2cb4c5f7d30bbab773c7fe81e4bde3873215f5e4072bed7 SHA512 e83dcd5cd6a07febf9c6380d311c84a319e3c45314266217837f6b35e540a6c9d4c980ceb7bb995ca8366247ea67d7d3c1b10beab677e4c24c69d83ba9977862
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index f1d56c470b2a..5a8b28dde8b8 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -26,7 +26,6 @@ configure different types of notifications for pre-defined events.
     <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
     <flag name="openipmi">Enable openipmi things</flag>
     <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as TLS backend</flag>
-    <flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
     <flag name="proxy">Enable proxy support</flag>
     <flag name="server">Enable zabbix server</flag>
     <flag name="ssh">SSH v2 based checks</flag>
diff --git a/net-analyzer/zabbix/zabbix-5.0.29.ebuild b/net-analyzer/zabbix/zabbix-5.0.29.ebuild
deleted file mode 100644
index 901c486faa9c..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.29.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable agent2) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with gnutls) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with openssl) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.30.ebuild b/net-analyzer/zabbix/zabbix-5.0.30.ebuild
index ef7ad2f9898e..c5d4ab2db7d0 100644
--- a/net-analyzer/zabbix/zabbix-5.0.30.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.30.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.0.10.ebuild b/net-analyzer/zabbix/zabbix-6.0.10.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.10.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	if use pcre2; then
-		econf_args+=( --with-libpcre2 )
-	else
-		# If pcre2 is not enabled, then use the old pcre library.
-		econf_args+=( --with-libpcre )
-	fi
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-
-		if ! use pcre2; then
-			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
-			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
-			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
-		fi
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.0.11.ebuild b/net-analyzer/zabbix/zabbix-6.0.11.ebuild
deleted file mode 100644
index 961445bff7c3..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.11.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.0.12.ebuild b/net-analyzer/zabbix/zabbix-6.0.12.ebuild
index ef2f02fcebe9..21333f63c79d 100644
--- a/net-analyzer/zabbix/zabbix-6.0.12.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.12.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.2.4.ebuild b/net-analyzer/zabbix/zabbix-6.2.4.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.4.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	if use pcre2; then
-		econf_args+=( --with-libpcre2 )
-	else
-		# If pcre2 is not enabled, then use the old pcre library.
-		econf_args+=( --with-libpcre )
-	fi
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-
-		if ! use pcre2; then
-			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
-			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
-			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
-		fi
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.2.5.ebuild b/net-analyzer/zabbix/zabbix-6.2.5.ebuild
deleted file mode 100644
index 961445bff7c3..000000000000
--- a/net-analyzer/zabbix/zabbix-6.2.5.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.2.6.ebuild b/net-analyzer/zabbix/zabbix-6.2.6.ebuild
index ef2f02fcebe9..21333f63c79d 100644
--- a/net-analyzer/zabbix/zabbix-6.2.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.2.6.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 26aa6029d40e..71e41607edcb 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 50b41597c0d5..ef9b716256c7 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,2 +1,5 @@
 DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2697bdec7994485516ef338908b46f2168260b7acf1a7120a687e543f0381bb787567bb4d564b9d14a3eb464a0e9ed6 SHA512 13382a53e6a1a4495c6f53e662ce21b80d73b6134a72f099f05495b64c56ae1a6c1cd1281311f1c3695d8532207fe5bd3d2026ed2c45f3cb5adb1011f1505ee7
+DIST freeradius-3.0.26.tar.gz 5300930 BLAKE2B e8922182f69ff201af331a03ef109072d24fb169c14179c5e71910ed3f767526afd7efe6000fd8a3881fa2ddb0487ebd12f8fdf6845136fdc15fdcb8a83fdf39 SHA512 83825ce1dd3d2e005c11d10ebadd2b37884130c158d3ea43595fa52478e3d194725b15dc73633758b0b1e916e00ea9358d254c38c2b721c475c9a4235aa1a5a3
 DIST freeradius-server-3.2.0.tar.bz2 3399380 BLAKE2B 103cb1faf7efd78520dd613da51671ff37b870fcd356d7d11454d655cf460bcb4132cd91b99be70557242907dd5e4d741b6a776de81c37a24ab9d04a4fe5866b SHA512 e7aa7bfc5a6968cdb860bb565ebd45bc1b3f78a665a9888a8b8dacaa1c5256755468aed33bdffe39465f8678c1fb9d6f47f0dbcf0178dfdcb38d99e3bc4b747d
+DIST freeradius-server-3.2.1.tar.bz2 3399164 BLAKE2B d0e69d468736d2a5dd85b32bb8b1fa44f2e56725ae525a3895df1b926f5ce525c70af08c2b76b62a9479d00d02c3e4915586fb1e5c7d42955c6b9e5cdeda8f6e SHA512 0f9e98cbf0eff4c5af54731ec34a8c9070252eaf2f91ca0c87caae939f6356fa91a6e1ed98ba66dbf1c1bafecdfcf38603fb4f65a5955e88974f49a5b7885f7a
+DIST freeradius-server-3.2.2.tar.bz2 3418998 BLAKE2B 584d1ff79cf3a75c79f5b24f9e47d7c8d8caee0d706eb47bb387300172f0699f904804d963aab8c252a21fe67f7885a47659b8cd9db5292a6d4db087d72e8e38 SHA512 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689
diff --git a/net-dialup/freeradius/freeradius-3.0.26.ebuild b/net-dialup/freeradius/freeradius-3.0.26.ebuild
new file mode 100644
index 000000000000..a2e2c1dd3980
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.26.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit autotools pam python-single-r1 systemd
+
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/"
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/freeradius-server-release_${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	pcap postgres python readline redis rest samba sqlite ssl systemd
+"
+
+RESTRICT="test firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-lang/perl:=
+	sys-libs/gdbm:=
+	sys-libs/talloc
+	virtual/libcrypt:=
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pam? ( sys-libs/pam )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	redis? ( dev-libs/hiredis:= )
+	rest? ( dev-libs/json-c:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+	)
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# 721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	eapply_user
+	default
+
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+	# Drop support of python2
+	rm -r src/modules/rlm_python || die
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	use rest || { rm -r src/modules/rlm_rest || die ; }
+	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# verbosity
+	# build shared libraries using jlibtool -shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		Make.inc.in || die
+
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		scripts/libtool.mk || die
+
+	# crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		--enable-shared
+		--disable-static
+		--disable-ltdl-install
+		--with-system-libtool
+		--with-system-libltdl
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# verbose, do not install certificates
+	# Parallel install fails (#509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# fix #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}/usr/sbin/rc.radiusd" || die
+
+	newinitd "${FILESDIR}/radius.init-r4" radiusd
+	newconfd "${FILESDIR}/radius.conf-r6" radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs || die
+		./bootstrap || die "Error while running ./bootstrap script."
+		chown root:radius "${ROOT}"/etc/raddb/certs || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/freeradius/freeradius-3.2.1.ebuild b/net-dialup/freeradius/freeradius-3.2.1.ebuild
new file mode 100644
index 000000000000..86036194b49c
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.2.1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools pam python-single-r1 systemd
+
+MY_PN=${PN}-server
+MY_P=${MY_PN}-${PV}
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/"
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	postgres python readline redis samba sqlite ssl systemd
+"
+
+RESTRICT="firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+
+# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
+# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
+
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-libs/libltdl
+	dev-libs/libpcre
+	dev-libs/json-c:=
+	dev-lang/perl:=
+	net-libs/libpcap
+	sys-libs/gdbm:=
+	sys-libs/libcap
+	sys-libs/talloc
+	virtual/libcrypt:=
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	redis? ( dev-libs/hiredis:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# bug #721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+	# TODO: shift more of these into configure args below as things
+	# are a bit better now.
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+
+	# Drop support for python2
+	rm -r src/modules/rlm_python || die
+
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	#use rest || { rm -r src/modules/rlm_rest || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# These are all things we don't have in portage/I don't want to deal
+	# with myself.
+	#
+	# Requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
+	# Requires libeap-ikev2
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
+	# Requires some membership.h
+	rm -r src/modules/rlm_opendirectory || die
+	# ?
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# SQL drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag} ; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# - Verbosity
+	# - B uild shared libraries using jlibtool -shared
+	sed -i \
+		-e '/$(LIBTOOL)/s|--quiet ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		Make.inc.in || die
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		scripts/libtool.mk || die
+
+	# Crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# Do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		# Revisit confcache when not needing to use ac_cv anymore
+		# for automagic deps.
+		#--cache-file="${S}"/config.cache
+
+		--enable-shared
+		--disable-ltdl-install
+		--disable-silent-rules
+		--with-system-libtool
+		--with-system-libltdl
+
+		--enable-strict-dependencies
+		--without-rlm_couchbase
+		--without-rlm_securid
+		--without-rlm_unbound
+		--without-rlm_idn
+		#--without-rlm_json
+		#$(use_with rest libfreeradius-json)
+
+		# Our OpenSSL should be patched. Avoid false-positive failures.
+		--disable-openssl-version-check
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-pcre
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with redis rlm_cache_redis)
+		$(use_with redis rlm_redis)
+		$(use_with redis rlm_rediswho)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+
+	# bug #77613
+	if has_version app-crypt/heimdal ; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	if ! use readline ; then
+		export ac_cv_lib_readline=no
+	fi
+
+	#if ! use pcap ; then
+	#	export ac_cv_lib_pcap_pcap_open_live=no
+	#	export ac_cv_header_pcap_h=no
+	#fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# - Verbose, do not install certificates
+	# - Parallel install fails (bug #509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam ; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# bug #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}"/usr/sbin/rc.radiusd || die
+
+	newinitd "${FILESDIR}"/radius.init-r4 radiusd
+	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl ; then
+		cd "${ROOT}"/etc/raddb/certs || die
+
+		./bootstrap || die "Error while running ./bootstrap script."
+		chown root:radius "${ROOT}"/etc/raddb/certs || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/freeradius/freeradius-3.2.2.ebuild b/net-dialup/freeradius/freeradius-3.2.2.ebuild
new file mode 100644
index 000000000000..d2a58e1f032a
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.2.2.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+AUTOTOOLS_DEPEND=">=sys-devel/autoconf-2.69"
+inherit autotools pam python-single-r1 systemd
+
+MY_PN=${PN}-server
+MY_P=${MY_PN}-${PV}
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/"
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE="
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
+	postgres python readline redis samba sqlite ssl systemd
+"
+
+RESTRICT="firebird? ( bindist )"
+
+# NOTE: Temporary freeradius doesn't support linking with mariadb client
+#       libs also if code is compliant, will be available in the next release.
+#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
+
+# TODO: rlm_mschap works with both samba library or without. I need to avoid
+#       linking of samba library if -samba is used.
+
+# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
+# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
+
+RDEPEND="acct-group/radius
+	acct-user/radius
+	!net-dialup/cistronradius
+	dev-libs/libltdl
+	dev-libs/libpcre
+	dev-libs/json-c:=
+	dev-lang/perl:=
+	net-libs/libpcap
+	net-misc/curl
+	sys-libs/gdbm:=
+	sys-libs/libcap
+	sys-libs/talloc
+	virtual/libcrypt:=
+	firebird? ( dev-db/firebird )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql? ( dev-db/mysql-connector-c:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
+	odbc? ( dev-db/unixODBC )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	redis? ( dev-libs/hiredis:= )
+	samba? ( net-fs/samba )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# bug #721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
+)
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+		export PYTHONBIN="${EPYTHON}"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+	# TODO: shift more of these into configure args below as things
+	# are a bit better now.
+	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
+	use ldap || { rm -r src/modules/rlm_ldap || die ; }
+	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
+	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
+	use pam || { rm -r src/modules/rlm_pam || die ; }
+
+	# Drop support for python2
+	rm -r src/modules/rlm_python || die
+
+	use python || { rm -r src/modules/rlm_python3 || die ; }
+	#use rest || { rm -r src/modules/rlm_rest || die ; }
+	# Do not install ruby rlm module, bug #483108
+	rm -r src/modules/rlm_ruby || die
+
+	# These are all things we don't have in portage/I don't want to deal
+	# with myself.
+	#
+	# Requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
+	# Requires libeap-ikev2
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
+	# Requires some membership.h
+	rm -r src/modules/rlm_opendirectory || die
+	# ?
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
+
+	# SQL drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag} ; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	sed -i \
+		-e 's:^#\tuser = :\tuser = :g' \
+		-e 's:^#\tgroup = :\tgroup = :g' \
+		-e 's:/var/run/radiusd:/run/radiusd:g' \
+		-e '/^run_dir/s:${localstatedir}::g' \
+		raddb/radiusd.conf.in || die
+
+	# - Verbosity
+	# - B uild shared libraries using jlibtool -shared
+	sed -i \
+		-e 's|--silent ||g' \
+		-e 's:--mode=\(compile\|link\):& -shared:g' \
+		scripts/libtool.mk || die
+
+	# Crude measure to stop jlibtool from running ranlib and ar
+	sed -i \
+		-e '/LIBRARIAN/s|".*"|"true"|g' \
+		-e '/RANLIB/s|".*"|"true"|g' \
+		scripts/jlibtool.c || die
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+	usesqldriver mongodb mongo
+
+	eautoreconf
+}
+
+src_configure() {
+	# Do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	local myeconfargs=(
+		# Revisit confcache when not needing to use ac_cv anymore
+		# for automagic deps.
+		#--cache-file="${S}"/config.cache
+
+		--enable-shared
+		--disable-ltdl-install
+		--disable-silent-rules
+		--with-system-libtool
+		--with-system-libltdl
+
+		--enable-strict-dependencies
+		--without-rlm_couchbase
+		--without-rlm_securid
+		--without-rlm_unbound
+		--without-rlm_idn
+		#--without-rlm_json
+		#$(use_with rest libfreeradius-json)
+
+		# Our OpenSSL should be patched. Avoid false-positive failures.
+		--disable-openssl-version-check
+		--with-ascend-binary
+		--with-udpfromto
+		--with-dhcp
+		--with-pcre
+		--with-iodbc-include-dir=/usr/include/iodbc
+		--with-experimental-modules
+		--with-docdir=/usr/share/doc/${PF}
+		--with-logdir=/var/log/radius
+
+		$(use_enable debug developer)
+		$(use_with ldap edir)
+		$(use_with redis rlm_cache_redis)
+		$(use_with redis rlm_redis)
+		$(use_with redis rlm_rediswho)
+		$(use_with ssl openssl)
+		$(use_with systemd systemd)
+	)
+
+	# bug #77613
+	if has_version app-crypt/heimdal ; then
+		myeconfargs+=( --enable-heimdal-krb5 )
+	fi
+
+	if use python ; then
+		myeconfargs+=(
+			--with-rlm-python3-bin=${EPYTHON}
+			--with-rlm-python3-config-bin=${EPYTHON}-config
+		)
+	fi
+
+	if ! use readline ; then
+		export ac_cv_lib_readline=no
+	fi
+
+	#if ! use pcap ; then
+	#	export ac_cv_lib_pcap_pcap_open_live=no
+	#	export ac_cv_header_pcap_h=no
+	#fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Verbose, do not generate certificates
+	emake \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS=''
+}
+
+src_install() {
+	dodir /etc
+
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+
+	keepdir /var/log/radius/radacct
+	diropts
+
+	# - Verbose, do not install certificates
+	# - Parallel install fails (bug #509498)
+	emake -j1 \
+		Q='' ECHO=true \
+		LOCAL_CERT_PRODUCTS='' \
+		R="${D}" \
+		install
+
+	if use pam ; then
+		pamd_mimic_system radiusd auth account password session
+	fi
+
+	# bug #711756
+	fowners -R radius:radius /etc/raddb
+	fowners -R radius:radius /var/log/radius
+
+	dodoc CREDITS
+
+	rm "${ED}"/usr/sbin/rc.radiusd || die
+
+	newinitd "${FILESDIR}"/radius.init-r4 radiusd
+	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
+
+	if ! use systemd ; then
+		# If systemd builtin is not enabled we need use Type=Simple
+		# as systemd .service
+		sed -i -e 's:^Type=.*::g' \
+			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
+			"${S}"/debian/freeradius.service
+	fi
+
+	systemd_dounit "${S}"/debian/freeradius.service
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_config() {
+	if use ssl ; then
+		cd "${ROOT}"/etc/raddb/certs || die
+
+		./bootstrap || die "Error while running ./bootstrap script."
+		chown root:radius "${ROOT}"/etc/raddb/certs || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+	fi
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
+		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		elog "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/minicom/minicom-2.8-r1.ebuild b/net-dialup/minicom/minicom-2.8-r1.ebuild
index f9617802793f..2c6f56143e67 100644
--- a/net-dialup/minicom/minicom-2.8-r1.ebuild
+++ b/net-dialup/minicom/minicom-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="sys-libs/ncurses:="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 1887133679f7..b32e491b4ef8 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild b/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
index 3b47d9416b61..7ed4312a3288 100644
--- a/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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 doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
diff --git a/net-dns/bind/bind-9.16.37.ebuild b/net-dns/bind/bind-9.16.37.ebuild
index d1e9d20389c8..065b6dfdd1d0 100644
--- a/net-dns/bind/bind-9.16.37.ebuild
+++ b/net-dns/bind/bind-9.16.37.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug #602682
 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib"
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index b7fadf0b1f97..2cf178c5624e 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,4 +1,2 @@
-DIST knot-resolver-5.5.3.tar.xz 1921668 BLAKE2B 7efdf1a69081d8f9f43b5bbe1b483826b94b87a0b001a449a5f89988afce070e4e3310e513e6281691bd81274a523ab8c7e52fe56a3d62019efe07809033a5a8 SHA512 7bf29bbf82e71727c1f47095a04a12712ca89a6f34d3a325337625ad116f49a47a90cb402525fdbf59cb0889b64d7083b908c335d65429b24d776603a3a8f28a
-DIST knot-resolver-5.5.3.tar.xz.asc 833 BLAKE2B 7ab348587c2604f14171d09436b2a296e9fb7124e6f899aba91215d32d8642dc5b9ae8300edf55c0790289bc954d5cf95c71b66a20b960c848d15e34469fc2f3 SHA512 1e95fffdb1c78a225b5bf861f978c1c18a9935ecd495e8f708ed4a241308b9302d2cf5a5ec51334dbecf50950af5f775bfff78995663cf1681a3dbc354d3a686
 DIST knot-resolver-5.6.0.tar.xz 1923196 BLAKE2B 8d1595e29ca5a3d597f15eda799a1e4e91bcd992c25f442f7b9247b4facec21fb41a89c4db3b2efcd8b8384d9463965ea16c617950fb408685ee6d565686d4e2 SHA512 efa978a8885e9aa6459bad8016e872ded5923d6c4367bb9586764ebfbad903923583ede9cab6339107d32450bf0846a40b8ab72ba7011d57827a86d822b95840
 DIST knot-resolver-5.6.0.tar.xz.asc 833 BLAKE2B 0a5ea3a5458be6a9b8a6cb34e3862119a53841b98148cc543046d745e14cfb49952bf2dbece6cfb3ed302affbcc6dce1911fc8900c0f4cb0acf22698d8b2257c SHA512 1c3ebe636b8295b31fffe08bd1ffade9d6c83a0584ef5cf84cb9f3951260b2e77272c4524789f244cd209381c7adb8c2e4b140e2fae616927a7d037cb187b165
diff --git a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild b/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
deleted file mode 100644
index e8618808dcc5..000000000000
--- a/net-dns/knot-resolver/knot-resolver-5.5.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-
-inherit lua-single meson tmpfiles verify-sig
-
-DESCRIPTION="A scaleable caching DNS resolver"
-HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
-SRC_URI="
-	https://secure.nic.cz/files/${PN}/${P}.tar.xz
-	verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc )
-"
-
-LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="caps dnstap kresc nghttp2 systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	${LUA_DEPS}
-	acct-group/knot-resolver
-	acct-user/knot-resolver
-	dev-db/lmdb:=
-	dev-libs/libuv:=
-	net-dns/knot:=
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	kresc? ( dev-libs/libedit )
-	nghttp2? ( net-libs/nghttp2:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		  dev-util/cmocka
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.3-docdir.patch
-	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/${PN}.gpg
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
-	fi
-
-	unpack ${P}.tar.xz
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var # double lib
-		# https://bugs.gentoo.org/870019
-		-Dauto_features=disabled
-		-Ddoc=disabled
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		-Dopenssl=disabled
-		$(meson_feature caps capng)
-		$(meson_feature dnstap)
-		$(meson_feature kresc client)
-		$(meson_feature nghttp2)
-		$(meson_feature test unit_tests)
-		$(meson_feature systemd systemd_files)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	fowners -R ${PN}: /etc/${PN}
-}
-
-pkg_postinst() {
-	use systemd && tmpfiles_process knot-resolver.conf
-}
diff --git a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
index b191f7d5aaa2..eea083aed1b1 100644
--- a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="caps dnstap kresc nghttp2 systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild
index 70ac2a279f08..9f724f86ab2f 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f2bc6f57d26a..d489635ed8cc 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/samba-4.15.13.ebuild b/net-fs/samba/samba-4.15.13.ebuild
index 31a56a33a2e0..c3fbe5e8b9cb 100644
--- a/net-fs/samba/samba-4.15.13.ebuild
+++ b/net-fs/samba/samba-4.15.13.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-fs/samba/samba-4.16.8.ebuild b/net-fs/samba/samba-4.16.8.ebuild
index 0df40e9643bf..4de9815f7ff5 100644
--- a/net-fs/samba/samba-4.16.8.ebuild
+++ b/net-fs/samba/samba-4.16.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e7211891240b..11b4a677fd09 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index 5ddf7ae6c2c7..744810870263 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7c98222d4763..1d7acdd82b61 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 5471563914b5..9e5e12b782b9 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.11.22_amd64.deb 86439264 BLAKE2B 560232a4c4ba33f3ebab1aadca823d25183c9a6f2f6ecbbf530059e677a95b2e74b0c9320073d5a6158c527bc6af36d27a891fccb5cce8db5a3b0fce1425d641 SHA512 a05bb0c17bdcca5a75ef92577f53711787bf53035f44addaaede0c3ab122a65518ccae9bd872c41926f18ac6812aae0f64b74db8224e4555a52855b89f633d99
+DIST element-desktop_1.11.23_amd64.deb 86329464 BLAKE2B 1dfef4eeebc78b9bf61795d8e59fee4069484dcc4ec53cb6ecc077cbead0eb563ccb5e3c52b47c274e15afe9cf244808904dbd8f87b6d2608098c4eb8498e456 SHA512 6aad946b1398b3da0b5993883aeffaa08d9b3f5104759eda3379e4dc2586106358aad7d88ee4b1484e11606a36781f909f52d4bb12c3eeb421f84a94abc0732e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.11.22.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild
similarity index 100%
rename from net-im/element-desktop-bin/element-desktop-bin-1.11.22.ebuild
rename to net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild
diff --git a/net-im/poezio/poezio-0.14.ebuild b/net-im/poezio/poezio-0.14.ebuild
index cd1ffa0e91b6..25252101030b 100644
--- a/net-im/poezio/poezio-0.14.ebuild
+++ b/net-im/poezio/poezio-0.14.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 optfeature xdg
 
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index 14794a112d69..1a2418a6d044 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 optfeature xdg
 
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index fb1d3f92222c..d3a6c44a234c 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,2 +1,2 @@
-DIST slack-desktop-4.27.156-amd64.deb 66938030 BLAKE2B b7d457fcb6a2518eaea7efc4d7b43f01f8c1da8a1218d3c2c2c14e195004102be344c6f4e2b60dd4f4677e53ea976cb7b0b102e3e0eec385df881eecdee4a7cd SHA512 b7aa66136a330536393a157843e02e4cfec5eca74431304b1b166e80eaadf41e8b12ad69af8616032042237cb9a38414f9bf1b76701def1985edd0a5570781f9
 DIST slack-desktop-4.28.182-amd64.deb 70728630 BLAKE2B 0246dd6ee6983dafad166e41faab30d495c39ad1a66c63bb59174ca1cbe12e275cd961a6873dcbbbe0a497cfeb79e19b6bc6fcdbc60a6a1b9a7e182ddf478066 SHA512 a25062cd721ce2e31aadf649ef23fa5d72fbb184a3499905d0872f165f97f52be9573256d8d981d0f9fc598439e4abb12a1b513d268c6ba8fecd7728ea88b8db
+DIST slack-desktop-4.29.149-amd64.deb 72943850 BLAKE2B 1d36947c5b4da0a2e301b3510dff9e5d3dbc6a3a2f0411980792984a497578d239dbc90dfb6af5cfe6d87dbcb7c3acac3b79c86daf6d58a4a9e69223472447f6 SHA512 9771af26efdadfe7eed5945b57900360b50804642e62db42cb2af20c3246edfdadf491deb2d1004a02e6dc545def079ecf6ab175e4d27f1989bcc8cbaf12366c
diff --git a/net-im/slack/slack-4.27.156-r1.ebuild b/net-im/slack/slack-4.27.156-r1.ebuild
deleted file mode 100644
index bc5a24fd03fb..000000000000
--- a/net-im/slack/slack-4.27.156-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build optfeature pax-utils unpacker xdg
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://slack.com"
-SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="appindicator +seccomp suid wayland"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/mesa:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	sys-libs/glibc
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/chrome-sandbox
-	opt/slack/chrome_crashpad_handler
-	opt/slack/libEGL.so
-	opt/slack/libGLESv2.so
-	opt/slack/libffmpeg.so
-	opt/slack/libvk_swiftshader.so
-	opt/slack/libvulkan.so.1
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/slack
-	opt/slack/swiftshader/libEGL.so
-	opt/slack/swiftshader/libGLESv2.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove hardcoded path, logging noise (wrt 694058, 711494)
-	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
-		-e '/Exec/s|slack|slack -s|' \
-		usr/share/applications/slack.desktop \
-		|| die "sed failed in Icon for slack.desktop"
-
-	if use appindicator ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for appindicator"
-	fi
-
-	if ! use seccomp ; then
-		sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for seccomp"
-	fi
-
-	if use wayland ; then
-		sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for wayland"
-	fi
-
-	rm usr/lib/slack/LICENSE{,S-linux.json} \
-		|| die "rm licenses failed"
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt # wrt 720134
-	cp -a usr/lib/slack "${ED}"/opt || die "cp failed"
-
-	use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	pax-mark -m "${ED}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
-
-	xdg_pkg_postinst
-}
diff --git a/net-im/slack/slack-4.29.149.ebuild b/net-im/slack/slack-4.29.149.ebuild
new file mode 100644
index 000000000000..25ea915418d3
--- /dev/null
+++ b/net-im/slack/slack-4.29.149.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop multilib-build optfeature pax-utils unpacker xdg
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="https://slack.com"
+SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="appindicator +seccomp suid wayland"
+RESTRICT="bindist mirror"
+
+RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
+	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	dev-libs/wayland[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/mesa:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="opt/slack/chrome-sandbox
+	opt/slack/chrome_crashpad_handler
+	opt/slack/libEGL.so
+	opt/slack/libGLESv2.so
+	opt/slack/libffmpeg.so
+	opt/slack/libvk_swiftshader.so
+	opt/slack/libvulkan.so.1
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/slack
+	opt/slack/swiftshader/libEGL.so
+	opt/slack/swiftshader/libGLESv2.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# remove hardcoded path, logging noise (wrt 694058, 711494)
+	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+		-e '/Exec/s|slack|slack -s|' \
+		usr/share/applications/slack.desktop \
+		|| die "sed failed in Icon for slack.desktop"
+
+	if use appindicator ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for appindicator"
+	fi
+
+	if ! use seccomp ; then
+		sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for seccomp"
+	fi
+
+	if use wayland ; then
+		sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for wayland"
+	fi
+
+	rm usr/lib/slack/LICENSE{,S-linux.json} \
+		|| die "rm licenses failed"
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
+
+	insinto /opt # wrt 720134
+	cp -a usr/lib/slack "${ED}"/opt || die "cp failed"
+
+	use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
+	dosym ../../opt/slack/slack usr/bin/slack
+
+	pax-mark -m "${ED}"/opt/slack/slack
+}
+
+pkg_postinst() {
+	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
+
+	xdg_pkg_postinst
+}
diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
new file mode 100644
index 000000000000..852f4ad78027
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
@@ -0,0 +1,63 @@
+Description: (newer) Debian log4cxx needs C++17 and used smart pointers.
+  This patch just enables C++17 for the build and using smart pointers
+  where needed.
+Author: Tobias Frost <tobi@debian.org>
+Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that will enable properly gating the new code.
+Last-Update: 2022-11-21 <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ 
+ project(libtransport)
+ 
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ if(WIN32)
+ 	set(CMAKE_CXX_STANDARD 17)
+ endif(WIN32)
+--- a/plugin/cpp/Logging.cpp
++++ b/plugin/cpp/Logging.cpp
+@@ -26,6 +26,7 @@
+ #include <iterator>
+ #include <algorithm>
+ 
++#include <memory>
+ 
+ #include <boost/filesystem.hpp>
+ #include <boost/algorithm/string.hpp>
+@@ -100,15 +101,17 @@
+ #ifdef _MSC_VER
+ 		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
+ #else
+-		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
++		auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
++		auto consoleappender = std::make_shared<ConsoleAppender>(patternlayout);
++		root->addAppender(consoleappender);
+ #endif
+ 	}
+ 	else {
+ 		log4cxx::helpers::Properties p;
+ 
+-		log4cxx::helpers::FileInputStream *istream = NULL;
++		log4cxx::helpers::InputStreamPtr istream;
+ 		try {
+-			istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
++			istream.reset(new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)));
+ 		}
+ 		catch(log4cxx::helpers::IOException &ex) {
+ 			std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n";
+--- a/tests/libtransport/main.cpp
++++ b/tests/libtransport/main.cpp
+@@ -23,7 +23,9 @@
+ #ifdef WITH_LOG4CXX
+ 	LoggerPtr root = Logger::getRootLogger();
+ #ifndef _MSC_VER
+-	root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false));
++	auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
++	auto fileappender = std::make_shared<FileAppender>(patternlayout, "libtransport_test.log", false);
++	root->addAppender(fileappender);
+ #else
+ 	root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false));
+ #endif
diff --git a/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..6913f31eba94
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.3-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/spectrum
+	acct-user/spectrum
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/libev:=
+	>=dev-libs/log4cxx-1.0.0:=
+	dev-libs/jsoncpp:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	dev-libs/protobuf:=
+	net-dns/libidn:=
+	>=net-im/swift-4.0.2-r2:=
+	net-misc/curl
+	sys-libs/zlib:=
+	frotz? ( !games-engines/frotz )
+	irc? ( net-im/libcommuni )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	postgres? ( dev-libs/libpqxx:= )
+	purple? (
+		dev-libs/glib
+		net-im/pidgin:=
+	)
+	sms? ( app-mobilephone/smstools )
+	sqlite? ( dev-db/sqlite:3 )
+	twitter? ( net-misc/curl )
+	whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.3-log4cxx-1.0.0.patch" )
+
+src_prepare() {
+	# Respect users LDFLAGS
+	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_PURPLE="$(usex purple)"
+		$(usex irc '-DENABLE_QT4=OFF' '')
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_XMPP="$(usex xmpp)"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/tests/libtransport" || die
+	./libtransport_test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	diropts -o spectrum -g spectrum
+	keepdir /var/log/spectrum2 /var/lib/spectrum2
+	diropts
+
+	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+	newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	tmpfiles_process spectrum2.conf
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 0320c9390f11..aa13c0a59c97 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,6 +1,8 @@
 DIST tdesktop-4.4.1.tar.gz 17238891 BLAKE2B da7620a5d5ee28dfbbcba098cd4493c346a0c4a558d64835337d2ca722a91e9385e5d42a3b99b24f8aaf5b97291e3432b73e2880162c539bc6424de6e3e00b9a SHA512 f45cc3b788fdd50f8caf9aff43dccfd250c0586cae5c54e27e943c24b472f059cea8017ecf9a7b0061fd02d49113ab33b5288daeaa6b40fb7282b8b09abd0459
 DIST tdesktop-4.5.3.tar.gz 17292564 BLAKE2B d8fd0a4aea06ec2141bc9e8561f83116a692353297e41a07202aba6a5eff33c46572c6c2c1b0765cd9d2447cb318aed983dfd03c58137cc374db63db8578980f SHA512 869c55ec21e5ebcb3e8d08ccbd8154510523aea93f9f7fc127ad1918109f3856c32413277dc4b32f7007c92b8f560665484ba47d39490f57047c6baf2b1466e8
 DIST tdesktop-4.6.0.tar.gz 17368321 BLAKE2B 511071683c2f9a43b077f5cd84f67137e86c8483d69d9fd53238b3ce1ef0be045fb81fed37be1b78b0df06f25ac4e0f592b9047ca33f8d97bf98b69809a4c3b2 SHA512 0a6ade8f2e9f74cedbae20410b607a61c20e6349b77a064b7f8eae8f4bbbdfd3b58e0d6353a74ebf0a135af3bfa34e2af9232bfb1278b57bc2c73c571a633842
+DIST tdesktop-4.6.5.tar.gz 17391978 BLAKE2B 6c3b576e1f88eaea1a3e36c2c545c9b1ed11db8e857bb4fd880a21ee7b139daececda867a9244610290ea36e788e0167b39c9aa989b0b0761f3cd07bb8679998 SHA512 28a46fe759bf26f2eb590a9f8cec548c2e242f00d8f90a2fb73dbda2f4956fd0afaecc3f5eec638af82272a072955b547404e98113df56700b9d4f02f49c1950
 DIST tsetup.4.4.1.tar.xz 50194196 BLAKE2B 05ff4bc66b77e4b26a802c766f65b7f1690376371681f0ed474d5b8edd0bdc0eae04e78c7539b05f9e7ea3a37dc4250c3761bf0ef23386b5033ce0a52caea5ec SHA512 d13892b0923b4dc9c565002ff54f41382aaba75de532b25b940c1e0cbff49784e15ff9aba5dfdf7b86c996c7502c44c7cfe9df865095d513277a5b553d4e00ea
 DIST tsetup.4.5.3.tar.xz 50285164 BLAKE2B 77e386803e9972f0ca8d1478ccbfb7c34b633b6184799f49e2cb2d2276bb623767997965442a0c0d45d8fbc08d24033d86b3456ef786cd64a789addd5513c6c3 SHA512 3c7d607e04991336008269b136953bb4bf40b2976ab5f3afb84761857c9340606e22e284ac1a419f717342e4083769463ba611fe5d2ab1aaeb145a0ae7949d6c
 DIST tsetup.4.6.0.tar.xz 50550076 BLAKE2B e96f34ce72559244430f4316b214d12f2bda7c990e6205e26c5be296a3043ae2a2948974eea7d2fe6c449b3c6bdd9b78dc83509a32f32c44e55aa2d17a9504e4 SHA512 036aec474c359a7d2d714a505835a4a6bbb3204e94294532f39574f4c12551b158fe6022fe5455da910e7686a27c7eaf9d83f8231efbedb8e639a0e8f9f2ee49
+DIST tsetup.4.6.5.tar.xz 50721036 BLAKE2B 8b26f63e73493aff0d312b0bd2cc160b595b0f8c0899a2dd22ededa22ab5b761d81b4ed4ef097c86bafc436a9f5f31982d6b25550794500f8bfd7342751c49c2 SHA512 d8cdbc18d93bfd9ff35f1268bc8933e4ab658ead632bfd3b5d712cbd11795922b247bb6063f16ec66d6b6c83703f6c377d25521c7ce9f06cbb2888a913f711e7
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.6.5.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.6.5.ebuild
new file mode 100644
index 000000000000..0fe79450766d
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.6.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	!net-im/telegram-desktop
+	sys-libs/glibc
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10
+"
+
+S="${WORKDIR}/Telegram"
+
+src_prepare() {
+	default
+	sed -i -e 's/@CMAKE_INSTALL_FULL_BINDIR@\///g' "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop || die
+}
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /etc/tdesktop
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 68e00be4e7a4..6c4d7c210238 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,2 +1,3 @@
+DIST zoom-5.13.10.1208_x86_64.tar.xz 166970460 BLAKE2B 58d1bda480345a77a1fc466bb1af3429a63d1959ee4aada608f7ea6d55a537afb2840c497951c8030fb78836a3bb671debc6e4cbae82fe870eed9383e111c207 SHA512 dc29e626d6bfe565519822249324510e9e2719beaaf0f9382187f3d3467ce24a7d81e0473d4af22485a28932a6727b368a1d13a3322cb970b69b44155b1d6a30
 DIST zoom-5.13.4.711_x86_64.tar.xz 147729432 BLAKE2B fe3766cdc3096601709bf4264620e8ef734c4dfa4ee12babbae9ac17ce3446a7f49e49900e40a47a877f301bf5a539e63c4d24635d7eceb7ad5fae312f12a264 SHA512 20c6bf2681dc097a8becf02b91dfddb72f39c8ffcb905a8e726a2e63f353f865f3ae84f83dd7362de0c528797ac915ac49c49dabeec7b6eb9606800fe5a73fa2
 DIST zoom-5.13.7.683_x86_64.tar.xz 166196936 BLAKE2B 94e76477860a9e390e610c30b9aac5a345492f7e2c0c19107784b8f5ffbfbc885c877529e4f24c366715c59f814a95d88f501405b5d15eb4f04ceeab4d1e92ca SHA512 a79df3b5621103e747fbb2a703afe4233dd5054d947000dca6b6055e7837bee1266711c8cfe1d3fc3cdb12fa2f4eef32a6522255eaa9f062cb8ace7c998a45ef
diff --git a/net-im/zoom/zoom-5.13.10.1208.ebuild b/net-im/zoom/zoom-5.13.10.1208.ebuild
new file mode 100644
index 000000000000..6c6cfdba4fb4
--- /dev/null
+++ b/net-im/zoom/zoom-5.13.10.1208.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/mit-krb5
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/quazip-1.0:0=[qt5(+)]
+	media-libs/alsa-lib
+	media-libs/fdk-aac:0/2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa[gbm(+)]
+	media-sound/mpg123
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+	opencl? ( virtual/opencl )
+	pulseaudio? ( media-libs/libpulse )
+	wayland? ( dev-libs/wayland )
+	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+BDEPEND="dev-util/bbe
+	bundled-libjpeg-turbo? ( dev-util/patchelf )"
+
+CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain an icon, so extract it from the binary
+	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
+		|| die "Extraction of icon failed"
+
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		# Remove insecure RPATH from bundled lib
+		patchelf --remove-rpath libturbojpeg.so || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r calendar cef email json ringtone scheduler sip timezones \
+		translations
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher *.sh
+	fperms a+x /opt/zoom/cef/chrome-sandbox
+	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
+
+	if use opencl; then
+		doexe aomhost libaomagent.so libclDNN64.so libdvf.so libmkldnn.so \
+			libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+	fi
+
+	if ! use wayland; then
+		# Soname dependency on libwayland-client.so.0
+		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
+	fi
+
+	if use bundled-qt; then
+		doins -r Qt
+		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
+		(	# Remove libs and plugins with unresolved soname dependencies.
+			# Why does the upstream package contain such garbage? :-(
+			cd "${ED}"/opt/zoom/Qt || die
+			rm -r plugins/audio plugins/egldeviceintegrations \
+				plugins/platforms/libqeglfs.so \
+				plugins/platforms/libqlinuxfb.so \
+				plugins/platformthemes/libqgtk3.so \
+				qml/Qt/labs/lottieqt qml/QtQml/RemoteObjects \
+				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
+				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
+				qml/QtQuick/XmlListModel || die
+			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
+				plugins/platforms/libqwayland*.so qml/QtWayland || die
+		)
+	else
+		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
+		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
+			ewarn "You have disabled the bundled-qt USE flag."
+			ewarn "You may experience problems when running Zoom with"
+			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
+			ewarn "See https://bugs.gentoo.org/798681 for details."
+		fi
+	fi
+
+	make_wrapper zoom /opt/zoom/zoom /opt/zoom \
+		/opt/zoom:/opt/zoom/Qt/lib:/opt/zoom/cef
+	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
+		"Network;VideoConference;" \
+		"MimeType=$(printf '%s;' \
+			x-scheme-handler/zoommtg \
+			x-scheme-handler/zoomus \
+			application/x-zoom)"
+	doicon videoconference-zoom.svg
+	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9e3ad87610fd..ebd61aefa7a6 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/dccserver/dccserver-0.5-r2.ebuild b/net-irc/dccserver/dccserver-0.5-r2.ebuild
index 1399170485f3..50cabc57cb28 100644
--- a/net-irc/dccserver/dccserver-0.5-r2.ebuild
+++ b/net-irc/dccserver/dccserver-0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/dccserver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 
 RDEPEND="dev-libs/libbsd"
 DEPEND="${RDEPEND}"
diff --git a/net-irc/hexchat/hexchat-2.16.1-r1.ebuild b/net-irc/hexchat/hexchat-2.16.1-r1.ebuild
index 21c3871de08a..c6d138bbd523 100644
--- a/net-irc/hexchat/hexchat-2.16.1-r1.ebuild
+++ b/net-irc/hexchat/hexchat-2.16.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit flag-o-matic lua-single meson mono-env python-single-r1 xdg
 
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
diff --git a/net-irc/hexchat/hexchat-2.16.1.ebuild b/net-irc/hexchat/hexchat-2.16.1.ebuild
deleted file mode 100644
index 7304fa96178c..000000000000
--- a/net-irc/hexchat/hexchat-2.16.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit lua-single meson mono-env python-single-r1 xdg
-
-DESCRIPTION="Graphical IRC client based on XChat"
-HOMEPAGE="https://hexchat.github.io/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	# We need to empty SRC_URI or else mono-env breaks the live ebuild
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux"
-fi
-
-LICENSE="GPL-2 plugin-fishlim? ( MIT )"
-SLOT="0"
-IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	plugin-fishlim? ( ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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 )
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	plugin-sysinfo? ( sys-apps/pciutils )
-	python? (
-		${PYTHON_DEPS}
-		virtual/python-cffi
-	)
-	ssl? ( dev-libs/openssl:0= )
-	theme-manager? (
-		|| (
-			(
-				dev-lang/mono[minimal]
-				dev-dotnet/libgdiplus
-			)
-			dev-lang/mono[-minimal]
-		)
-	)"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-arch/xz-utils
-	app-text/iso-codes
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-	if use theme-manager ; then
-		mono-env_pkg_setup
-		export XDG_CACHE_HOME="${T}/.cache"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddbus-service-use-appid=false
-		-Dinstall-appdata=false
-		-Dplugin=true
-		$(meson_feature dbus)
-		$(meson_feature libcanberra)
-		$(meson_feature ssl tls)
-		$(meson_use gtk gtk-frontend)
-		$(meson_use !gtk text-frontend)
-		$(meson_use theme-manager)
-
-		$(meson_use plugin-checksum with-checksum)
-		$(meson_use plugin-fishlim with-fishlim)
-		-Dwith-lua="$(usex lua "${ELUA}" false)"
-		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
-		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
-		$(meson_use plugin-sysinfo with-sysinfo)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc readme.md
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	if use gtk ; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		xdg_pkg_postinst
-	else
-		elog "You have disabled the gtk USE flag. This means you don't have"
-		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
-	fi
-
-	if use theme-manager ; then
-		elog "Themes are available at:"
-		elog "  https://hexchat.github.io/themes.html"
-	fi
-
-	elog
-	elog "optional dependencies:"
-	elog "  media-sound/sox (sound playback if you don't have libcanberra"
-	elog "    enabled)"
-	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
-	elog "    needs libcanberra enabled)"
-}
-
-pkg_postrm() {
-	if use gtk ; then
-		xdg_pkg_postrm
-	fi
-}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index e8d6b89487a3..8d9762ab2ebc 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit flag-o-matic lua-single meson mono-env python-single-r1 xdg
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 004b1e9efc8b..4637afe53ba8 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index f812a0c1784b..7321af99dcc7 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,3 +1,4 @@
 DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad886071a76d527730108da155d290612f1e54cec15d69f55713f37f377e6bff844b16b5deef64c7d8bb31195652 SHA512 e0471aa355d311a40c9d29d7101bf8e22b89ac675d4914c38e617d3213b61107487ef20ca80d7cff8093b548f4a976526298e1f32959ae6ce3c088d45ecc9781
 DIST grpc-1.51.1.tar.gz 8550112 BLAKE2B 83ba622222e941a6a0fa33f4878e9a10f4165d29ade36fb58201bc76dad9b075d1cc5474c2a8e48f63b63a7b2d0e169f58af88fff837973ae03315833f2c2eb7 SHA512 1bc8e7a5a15b2dca88527d111cde398b0dc1921bbc945c6df8225b4225b8ac0b43155bcf743230ce7b5962d1ab948e9363229c98a879b1befc7a939a290fb888
 DIST grpc-1.52.0.tar.gz 8682080 BLAKE2B de1583401a70ec09cc30527346d18bc6d2272a61419de5b5f5ee8074e996daa04b060f112d693004e4cbf49c04e3048746d8f12823a40c367965cba2b5266028 SHA512 a3e8b22b04fc6d06762a10d325438fa19253fcace2c6aeb31cb30092f68d651ecbf6f9ea74ae9333e20a77029c989f8a963912f8be5c008590b08570a47b1bf7
+DIST grpc-1.52.1.tar.gz 8686340 BLAKE2B 0076ddd4a2840892f4ad11885e18f782b6a645337224974522c5f828d0226d6a1e19aaaf0f30ea3225d56118e0cfc251d45b8d5e6811c2d1a84e274ff037bb53 SHA512 06c69fb817af75b2610761a3a193178b749755eb7bed58875aa251def7c0c253cdaf02cf834c31c8b2cae7b01a6081e2aece4b131a162f64bd45ff0aff4d7758
diff --git a/net-libs/grpc/grpc-1.52.1.ebuild b/net-libs/grpc/grpc-1.52.1.ebuild
new file mode 100644
index 000000000000..1bc65a8edf87
--- /dev/null
+++ b/net-libs/grpc/grpc-1.52.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/30.152"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc examples test"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20220623.1*:=
+	>=dev-libs/re2-0.2021.11.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/protobuf-3.18.1:=
+	dev-libs/xxhash
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+soversion_check() {
+	local core_sover cpp_sover
+	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'
+	core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	# remove dots, e.g. 1.37 -> 137
+	core_sover="${core_sover//./}"
+	cpp_sover="${cpp_sover//./}"
+	[[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
+	[[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	# suppress network access, package builds fine without the submodules
+	mkdir "${S}/third_party/opencensus-proto/src" || die
+
+	soversion_check
+}
+
+src_configure() {
+	# https://github.com/grpc/grpc/issues/29652
+	filter-lto
+
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		-DCMAKE_CXX_STANDARD=17
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
diff --git a/net-libs/ldns/ldns-1.8.3-r1.ebuild b/net-libs/ldns/ldns-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..b6b2d28818e4
--- /dev/null
+++ b/net-libs/ldns/ldns-1.8.3-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools python-single-r1 multilib-minimal
+
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # missing test directory
+
+BDEPEND="
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+	>=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
+	examples? ( net-libs/libpcap )
+"
+RDEPEND="
+	${DEPEND}
+	!<net-dns/ldns-utils-1.8.0-r2
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+PATCHES=(
+	"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
+	"${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-configure-strict.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Drop after 1.8.3
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--with-ssl="${EPREFIX}"/usr \
+		$(multilib_native_with drill) \
+		$(multilib_native_use_with examples) \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins libdns.vim
+}
diff --git a/net-libs/librsync/librsync-2.3.4.ebuild b/net-libs/librsync/librsync-2.3.4.ebuild
index 1a3139b85484..94cc93a72091 100644
--- a/net-libs/librsync/librsync-2.3.4.ebuild
+++ b/net-libs/librsync/librsync-2.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libvncserver/libvncserver-0.9.14.ebuild b/net-libs/libvncserver/libvncserver-0.9.14.ebuild
index 01ad479fffc3..bc1c292d70e9 100644
--- a/net-libs/libvncserver/libvncserver-0.9.14.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.14.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
+IUSE="+24bpp +filetransfer +gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
 # https://bugs.gentoo.org/550916
@@ -27,6 +27,12 @@ REQUIRED_USE="
 	png? ( zlib )
 	ssl? ( !gnutls? ( threads ) )
 "
+# Avoid using internal crypto backend as it doesn't support
+# all authentication methods #893608
+REQUIRED_USE+="
+	ssl? ( gnutls? ( gcrypt ) )
+	!ssl? ( gcrypt )
+"
 
 DEPEND="
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= )
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.4.0.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.4.0.ebuild
index 9ee1c9b2a444..cb3360386751 100644
--- a/net-libs/socket_wrapper/socket_wrapper-1.4.0.ebuild
+++ b/net-libs/socket_wrapper/socket_wrapper-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d714e4a9e38b..4f1547752d4d 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index 9b1ab5a615f6..78a2f73e4e5d 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,2 +1,3 @@
 DIST b4-0.10.1.tar.gz 100142 BLAKE2B 81481b835c8fc63df6c78c852344a6daeeba656268b61808fb314b09e45786473b453c5163d2dd7c01604caad4281f7e7712efdb57c0dee2dcf415f0781b4a7b SHA512 6707f4407bfe9b46134c243d18a110150f1647fc12328c8e7fedeb40e404b6bd8662d651479c27145965bffabc3ca2f8498b53e801fc2846116ef101e1974733
+DIST b4-0.12.1.tar.gz 233691 BLAKE2B d10dc969d16722083ab0b79b7a2a26df44dbe2d5a8a804a0339903ff30f2a25a915e7755d4c5a9855d9b3abd8fbd6a3ff3b8034a6679491835446fdd24ee1b0f SHA512 6a7cacfdda6b4c8c3b87554c1b8fc7b2e797ea0b44476943aa6b75a901dc57cc17fab2a584d63c3724967ee8e6d9b3070dea94a6e4df43547a521ba741366032
 DIST b4-0.8.0.tar.gz 66882 BLAKE2B 7f93b9ce9f1f448a1b4be94c692ee93912e273c740c41518fdacd515df7038ba140f62712ef7a6df8a946315eb776ebb7e182d71905ca2ff34771525ceefe4c2 SHA512 4696a0164289eb7077d276a3133ba3776bfc3bfa25fd3591da6e932329f1578fcfe9909419426865ba3239c5b0a7b23dbb85df10307210420ac85e399d8fddd9
diff --git a/net-mail/b4/b4-0.12.1.ebuild b/net-mail/b4/b4-0.12.1.ebuild
new file mode 100644
index 000000000000..be2c831b62a5
--- /dev/null
+++ b/net-mail/b4/b4-0.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Utility for fetching patchsets from public-inbox"
+HOMEPAGE="https://pypi.org/project/b4/"
+# pypi lacks tests
+SRC_URI="https://git.kernel.org/pub/scm/utils/b4/b4.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/dkimpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
+	>=dev-python/patatt-0.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
+	>=dev-vcs/git-filter-repo-2.30[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/net-mail/b4/metadata.xml b/net-mail/b4/metadata.xml
index ddd173fbe5e8..2682456e0d77 100644
--- a/net-mail/b4/metadata.xml
+++ b/net-mail/b4/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">b4</remote-id>
 	</upstream>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 3d9fb2486140..151fb8a9e630 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,2 +1 @@
-DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d
 DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8
diff --git a/net-mail/mailutils/mailutils-3.14-r1.ebuild b/net-mail/mailutils/mailutils-3.14-r1.ebuild
deleted file mode 100644
index bbdd56f1a541..000000000000
--- a/net-mail/mailutils/mailutils-3.14-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools elisp-common flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://mailutils.org/"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="
-	!mail-filter/libsieve
-	!mail-client/mailx
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/libcrypt:=
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm:= )
-	guile? ( dev-scheme/guile:12/2.2-1 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring:= )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-add-include.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf \
-		MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_with servers unistring ) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-mail/mailutils/mailutils-3.15.ebuild b/net-mail/mailutils/mailutils-3.15.ebuild
index 9c462f598ceb..3bb1b72f7fbf 100644
--- a/net-mail/mailutils/mailutils-3.15.ebuild
+++ b/net-mail/mailutils/mailutils-3.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild b/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..f5a753cbc898
--- /dev/null
+++ b/net-mail/onionrouter/onionrouter-0.6.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 systemd
+
+DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix"
+HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="$(python_gen_cond_dep '
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+')"
+BDEPEND="$(python_gen_cond_dep '
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+')"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	insinto /etc/onionrouter
+	doins "${S}/onionrouter/configs/onionrouter.ini"
+}
diff --git a/net-mail/onionrouter/onionrouter-0.6.2.ebuild b/net-mail/onionrouter/onionrouter-0.6.2.ebuild
deleted file mode 100644
index e77f2b0c931f..000000000000
--- a/net-mail/onionrouter/onionrouter-0.6.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd
-
-DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix"
-HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="$(python_gen_cond_dep '
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-')"
-BDEPEND="$(python_gen_cond_dep '
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-')"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	insinto /etc/onionrouter
-	doins "${S}/onionrouter/configs/onionrouter.ini"
-}
diff --git a/net-mail/onionrouter/onionrouter-9999.ebuild b/net-mail/onionrouter/onionrouter-9999.ebuild
index e77f2b0c931f..f5a753cbc898 100644
--- a/net-mail/onionrouter/onionrouter-9999.ebuild
+++ b/net-mail/onionrouter/onionrouter-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 systemd
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d3cd06782c07..75277381658c 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 1146fa58155c..60ff7c07658a 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -1,2 +1 @@
-DIST anydesk-6.2.0-amd64.tar.gz 6216311 BLAKE2B ffdd139e5e67cf9da5eefcd8c261a52d5e556923353baec8d848aea95a6583280845c3d2cf9c34fbcbecf9ddb3991aa59542baf74f2761cc4a7ee69637be0bd4 SHA512 673e5a0a0ca6d2c550c9c01a07edd2096db26416286a5a603adfc7a844d864f327061e0906978c6e4cd0871859f12f281a52b3bceffe8a6014a1bb3c54322ab6
 DIST anydesk-6.2.1-amd64.tar.gz 6634159 BLAKE2B 03abb9c3a990a8e4b53505896ebef253c386f578a275ccbec55e85cbb27e5c0f140863c6dc407b1d0cc2f2975b63bcd13487e27425b16cd3fdb42fd71a646e97 SHA512 2a36eb0698d18d7f779a9c7b8a17b2a9964fc10ba1ce65a68555332e58fd316b8541ef5443c8f8a62a30711e8dd19174d599ac2cdccd581da645c6b6a7e000ae
diff --git a/net-misc/anydesk/anydesk-6.2.0-r1.ebuild b/net-misc/anydesk/anydesk-6.2.0-r1.ebuild
deleted file mode 100644
index f066939a989a..000000000000
--- a/net-misc/anydesk/anydesk-6.2.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit desktop optfeature systemd xdg-utils
-
-DESCRIPTION="Feature rich multi-platform remote desktop application"
-HOMEPAGE="https://anydesk.com"
-SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz
-	https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz"
-
-# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
-LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glu
-	sys-auth/polkit
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-"
-BDEPEND="dev-util/patchelf"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${PN}/*"
-
-src_install() {
-	local dst="/opt/${PN}"
-
-	exeinto ${dst}
-	doexe ${PN}
-
-	dodir /opt/bin
-	dosym "${dst}/${PN}" "/opt/bin/${PN}"
-
-	newinitd "${FILESDIR}/anydesk.init" anydesk
-	systemd_newunit "${FILESDIR}/anydesk-4.0.1.service" anydesk.service
-
-	insinto /usr/share/polkit-1/actions
-	doins polkit-1/com.anydesk.anydesk.policy
-
-	insinto /usr/share
-	doins -r icons
-
-	domenu "${FILESDIR}/anydesk.desktop"
-
-	dodoc copyright README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To run AnyDesk as background service use:"
-		elog
-		elog "OpenRC:"
-		elog "# rc-service anydesk start"
-		elog "# rc-update add anydesk default"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start anydesk.service"
-		elog "# systemctl enable anydesk.service"
-		elog
-		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
-		elog "further information about the linux version of AnyDesk."
-		elog
-	fi
-
-	optfeature_header "AnyDesk uses additional tools to query information about the host:"
-	optfeature "lsb_release" sys-apps/lsb-release
-	optfeature "lspci" sys-apps/pciutils
-	optfeature "lsusb" sys-apps/usbutils
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-misc/anydesk/anydesk-6.2.1-r1.ebuild b/net-misc/anydesk/anydesk-6.2.1-r1.ebuild
new file mode 100644
index 000000000000..77d78ee0f0c6
--- /dev/null
+++ b/net-misc/anydesk/anydesk-6.2.1-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit desktop optfeature systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz
+	https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+# x11-libs/gtkglext is required and cannot be mitigated: https://bugs.gentoo.org/868255
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-libs/glib:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/libglvnd
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+BDEPEND="dev-util/patchelf"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+	local dst="/opt/${PN}"
+
+	exeinto ${dst}
+	doexe ${PN}
+
+	dodir /opt/bin
+	dosym "${dst}/${PN}" "/opt/bin/${PN}"
+
+	newinitd "${FILESDIR}/anydesk.init" anydesk
+	systemd_newunit "${FILESDIR}/anydesk-4.0.1.service" anydesk.service
+
+	insinto /usr/share/polkit-1/actions
+	doins polkit-1/com.anydesk.anydesk.policy
+
+	insinto /usr/share
+	doins -r icons
+
+	domenu "${FILESDIR}/anydesk.desktop"
+
+	dodoc copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To run AnyDesk as background service use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service anydesk start"
+		elog "# rc-update add anydesk default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start anydesk.service"
+		elog "# systemctl enable anydesk.service"
+		elog
+		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+		elog "further information about the linux version of AnyDesk."
+		elog
+	fi
+
+	optfeature_header "AnyDesk additional tools:"
+	optfeature "lsb_release" sys-apps/lsb-release
+	optfeature "lspci" sys-apps/pciutils
+	optfeature "lsusb" sys-apps/usbutils
+	optfeature "sound support" media-libs/libcanberra[gtk2]
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/anydesk/anydesk-6.2.1.ebuild b/net-misc/anydesk/anydesk-6.2.1.ebuild
deleted file mode 100644
index 90d3f93c2857..000000000000
--- a/net-misc/anydesk/anydesk-6.2.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit desktop optfeature systemd xdg-utils
-
-DESCRIPTION="Feature rich multi-platform remote desktop application"
-HOMEPAGE="https://anydesk.com"
-SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz
-	https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz"
-
-# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
-LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-# x11-libs/gtkglext is required and cannot be mitigated: https://bugs.gentoo.org/868255
-RDEPEND="
-	app-accessibility/at-spi2-core:2
-	dev-libs/glib:2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glu
-	media-libs/libglvnd
-	sys-auth/polkit
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-"
-BDEPEND="dev-util/patchelf"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${PN}/*"
-
-src_install() {
-	local dst="/opt/${PN}"
-
-	exeinto ${dst}
-	doexe ${PN}
-
-	dodir /opt/bin
-	dosym "${dst}/${PN}" "/opt/bin/${PN}"
-
-	newinitd "${FILESDIR}/anydesk.init" anydesk
-	systemd_newunit "${FILESDIR}/anydesk-4.0.1.service" anydesk.service
-
-	insinto /usr/share/polkit-1/actions
-	doins polkit-1/com.anydesk.anydesk.policy
-
-	insinto /usr/share
-	doins -r icons
-
-	domenu "${FILESDIR}/anydesk.desktop"
-
-	dodoc copyright README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To run AnyDesk as background service use:"
-		elog
-		elog "OpenRC:"
-		elog "# rc-service anydesk start"
-		elog "# rc-update add anydesk default"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start anydesk.service"
-		elog "# systemctl enable anydesk.service"
-		elog
-		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
-		elog "further information about the linux version of AnyDesk."
-		elog
-	fi
-
-	optfeature_header "AnyDesk uses additional tools to query information about the host:"
-	optfeature "lsb_release" sys-apps/lsb-release
-	optfeature "lspci" sys-apps/pciutils
-	optfeature "lsusb" sys-apps/usbutils
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-misc/anydesk/files/anydesk-4.0.1.service b/net-misc/anydesk/files/anydesk-4.0.1.service
index e7a3ef008374..38ce50ea938d 100644
--- a/net-misc/anydesk/files/anydesk-4.0.1.service
+++ b/net-misc/anydesk/files/anydesk-4.0.1.service
@@ -6,7 +6,7 @@ After=systemd-user-sessions.service
 [Service]
 Type=simple
 ExecStart=/opt/bin/anydesk --service
-PIDFile=/var/run/anydesk.pid
+PIDFile=/run/anydesk.pid
 KillMode=mixed
 TimeoutStopSec=30
 User=root
diff --git a/net-misc/anydesk/files/anydesk.init b/net-misc/anydesk/files/anydesk.init
index 5b8986ed8d1b..83bc3e58c7e9 100644
--- a/net-misc/anydesk/files/anydesk.init
+++ b/net-misc/anydesk/files/anydesk.init
@@ -6,5 +6,5 @@ name="AnyDesk service"
 description="AnyDesk global service"
 command="/opt/bin/anydesk"
 command_args="--service"
-pidfile="/var/run/anydesk.pid"
+pidfile="/run/anydesk.pid"
 command_background=true
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d989a6a83d01..a46c6e4c7b08 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -2,7 +2,10 @@ DIST asterisk-16.26.1.tar.gz 28001023 BLAKE2B d426566827bd3466720f94eed04a654eda
 DIST asterisk-16.27.0.tar.gz 28014649 BLAKE2B 785650674bb2762ab898118cf49aa2cddde60f7e42df0a882751e36053f3cfb7de94475acf6bd484a1998c04b1edd1dca2ee4e9895bf9e411d9b09f91f7a4743 SHA512 ae016a79f8c38c5ae0069d0fa7434a564c8a72efa69135ce17dc7febf220a189ef47aba064ab39a2f49be0f7d5138b36e29f2d004ba51aa3724708efce645d1e
 DIST asterisk-16.29.0.tar.gz 28105953 BLAKE2B a17dbbb1f717ba6d03da71f761f063a5b95e71f50378cf6bc3abdbaf1bcbac462be1b051c1fe1812a6f2c9082c9928a85ea60346dae742149f230ab8ec6c997f SHA512 7a83778c406dbb7d1e0eebc4eb9f51c841fc5fc987445014e685ade9e143bb81e2fb4870a6ddaf3e4721e75bbd5d6468c9d896616bb1411bad84ac6ca510d69b
 DIST asterisk-16.29.1.tar.gz 28104161 BLAKE2B 030d0c2ce296db9c38ebd45b69b8a57f368e97f6121aca77c5b1dd4eeaa9f274f4d0e404bbae1317c1c02497e155ca9fef06b82d003987621d2c46984e5f5d2c SHA512 5ae5c22b48ea0ff83a655d64a0122923e736e84d612b7936d157614b01ed1f12da76a8adb10c045023a9464dce26563c8458fcea80af3f26176ed1fcbe4e5376
+DIST asterisk-16.30.0.tar.gz 28131110 BLAKE2B f230155a6347e891b531e54fe2821f1d477ed83699dd4a90c67b3307965430dbcdd04bd0ced49803776d349e29846492a6ef96e19ad3665dc610623be8de25cc SHA512 59cfbc1463dbad6ae7c6307d96b1a220fb02b3e398f96708654e58db788d57f2ca7aac8d4a290ed04f333b5c82c514ec9b95681125e3bdddc237e6c778fd2aec
 DIST asterisk-18.13.0.tar.gz 28127627 BLAKE2B 24e030d5226fb3cad8e2fedce951fab047afbdf5556821bc246acc3731f25398d47eac7b7e0a97f019d9e97cc6f8990967019db62845f21f3b3459a2c3fced02 SHA512 085dfcf15f99d7d96b49a720156678c4de5a88b55375257a9a1234f9dd83f21eed1685d4177dae5978272608e690582367c6c34fdef91bbad54299594d0ce9df
 DIST asterisk-18.15.0.tar.gz 28219845 BLAKE2B 712e14bcc2f24b645c39fdfbae19771134e065a9f83187e6578aeb70686a19e66faef4fb700089379274b7fbe9f99cdeec92761fa734926b3bb5db2f02cad8ff SHA512 acf202246e149ddc44ffb688a834455420d6ab53989560568cdccf0da121821ee946c45085c964b52632e24109741908d3f4c00ca00d0b4a9402c128becd9e28
 DIST asterisk-18.15.1.tar.gz 28216621 BLAKE2B f354a49111b22fe37caf72ba552d8ecc3dec17605771d153d05b01d7e3017c6a50087309c37078d32b6dc375bbb14dfee89356eb46355f47374a08d5427179a1 SHA512 c8bee50023b137d95b02ce770c9983fc3d8cfc10f7d714ab658fb118813ccf29d97b0ada64bfd2795ce3a0f9ecfe82bd85ab3abefe9c8cc83454cd50ff8e5cf5
+DIST asterisk-18.16.0.tar.gz 28278347 BLAKE2B 3e588d3ff6b14eb5334b0c2cca07ee026b9db20e83b07d0e21b1ec2d3fed8779c4e188248d151d9ac6e46da96e0e6a5673429394c84e0d445457d84f1ecc8eee SHA512 50cebb63e270a802a14e43c07ed1b9bf6b989a6a608c44d5aa3f415e66d4306523e5f916be21d6cef260e35fd097d2dc25ec850987dc407df873446c784f737a
 DIST asterisk-20.0.1.tar.gz 27983541 BLAKE2B a7d5f2b4d7721c66bb04ab395f97432791824b8e1136b224a03e52dd78d600f358278ad1a7dd2ec8684d5b850c3e65d5e14b98f7ecc3cee2ef93c4287e541dd3 SHA512 91e4835fd01233c81af0120d511522881af69e65abcc62a9e2241c89357a970b94901dfd7a7fcdbeba59eb3aa4c27f95735f2a10891f1ad6f2c36bb3244423e4
+DIST asterisk-20.1.0.tar.gz 28043611 BLAKE2B a9476afc1764b05193625724707077c92e975b8c78d89b9ed41a4b123d3b5d04c90f1e09d1cd20c4181ca1ea7d6e3d9f81521676540c7bfaa806ba51b462371f SHA512 e31652b37f918b1be0c395122b1013576a551c962c056963f87c2fce3561689b8a565e9b74e3fff0394879a505532d55d175ef9860dd9589323074b51149aaf6
diff --git a/net-misc/asterisk/asterisk-16.30.0.ebuild b/net-misc/asterisk/asterisk-16.30.0.ebuild
new file mode 100644
index 000000000000..a984cb830e26
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.30.0.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+	"${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap:= )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+		AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		SED=sed \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable astdb2* tools.  We've been on sqlite long enough
+	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+	_menuselect --disable astdb2sqlite3 menuselect.makeopts
+	_menuselect --disable astdb2bdb menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# Disable conversion tools (which fails to compile in some cases).
+	_menuselect --disable astdb2bdb menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
+	newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
+	newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-18.16.0.ebuild b/net-misc/asterisk/asterisk-18.16.0.ebuild
new file mode 100644
index 000000000000..3aeec65e1492
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.16.0.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap:= )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.12:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+		AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable astdb2* tools.  We've been on sqlite long enough
+	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+	_menuselect --disable astdb2sqlite3 menuselect.makeopts
+	_menuselect --disable astdb2bdb menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# Disable conversion tools (which fails to compile in some cases).
+	_menuselect --disable astdb2bdb menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
+	newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
+	newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-20.1.0.ebuild b/net-misc/asterisk/asterisk-20.1.0.ebuild
new file mode 100644
index 000000000000..78b8025b2537
--- /dev/null
+++ b/net-misc/asterisk/asterisk-20.1.0.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap:= )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.12:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( net-libs/c-client[ssl=] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \
+		AC_CONFIG_SUBDIRS=menuselect eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable astdb2* tools.  We've been on sqlite long enough
+	# that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194)
+	_menuselect --disable astdb2sqlite3 menuselect.makeopts
+	_menuselect --disable astdb2bdb menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# Disable conversion tools (which fails to compile in some cases).
+	_menuselect --disable astdb2bdb menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro chan_sip res_monitor
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper
+	newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk
+	newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/axel/axel-2.17.11.ebuild b/net-misc/axel/axel-2.17.11.ebuild
index 9652f4f27a2c..65b8d2b117b6 100644
--- a/net-misc/axel/axel-2.17.11.ebuild
+++ b/net-misc/axel/axel-2.17.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug nls ssl"
 
 CDEPEND="
diff --git a/net-misc/bgpq4/Manifest b/net-misc/bgpq4/Manifest
index 6eb8bf49f9be..995eff4f109c 100644
--- a/net-misc/bgpq4/Manifest
+++ b/net-misc/bgpq4/Manifest
@@ -1,2 +1,2 @@
-DIST bgpq4-1.5.tar.gz 52779 BLAKE2B 538d10983180413298ad005032e069c0847f7cb8eb78eee253f1072935a4d0db24626e3e20117224027e71c5f499001ffbe15816066ad89e08c30b7bf3431ce4 SHA512 b0d552634db6e7a90f76387b22c3539b59c5f89f9564b661bc810f9a9729f0dd87931a64fc230b8ed0a38162a572d8d93139a792ee80e996663b47ec3e060b9b
 DIST bgpq4-1.7.tar.gz 55311 BLAKE2B 56824c0ebfa97cc459753cd59069a370afb5f6c86675f6c358e49d1cb7d781e5a9f51aa4526fd60269a5a77bc53685426898f439768c08a0f1917b1b2d98cdb3 SHA512 d9798f9d8297e05d1553fb9cfafe63fd77145e14aa72cb95d4581cae30bdf3e7c08a5ca6261a4f44580a35e048ba50fc181750ecbe838ca40b6dcfbaaca42ab5
+DIST bgpq4-1.8.tar.gz 55947 BLAKE2B 2aea8eddc33881b2e5734a805e290ed8e0a24aa41dfc65d6cd0d4221b4ff95f9477d80754eb3ae92e71843e4539653143748eca61f8f0a561932c5fff28a799e SHA512 c2bb9a6cc4f2ee361a3193c2637bc62432cc82f0182368d56d90112e50ffb7b1a28868568ee551ceda658dbdeed809dff30c820e50f9b5cf430cca01ac55cf99
diff --git a/net-misc/bgpq4/bgpq4-1.5.ebuild b/net-misc/bgpq4/bgpq4-1.5.ebuild
deleted file mode 100644
index 249a36b386d6..000000000000
--- a/net-misc/bgpq4/bgpq4-1.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Generate access-lists for various routers, maintained fork of bgpq3"
-HOMEPAGE="https://github.com/bgp/bgpq4/"
-SRC_URI="https://github.com/bgp/bgpq4/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/net-misc/bgpq4/bgpq4-1.8.ebuild b/net-misc/bgpq4/bgpq4-1.8.ebuild
new file mode 100644
index 000000000000..a59c2865738d
--- /dev/null
+++ b/net-misc/bgpq4/bgpq4-1.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Generate access-lists for various routers, maintained fork of bgpq3"
+HOMEPAGE="https://github.com/bgp/bgpq4/"
+SRC_URI="https://github.com/bgp/bgpq4/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index e8026cf6a74d..0f851994e08c 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,2 +1,3 @@
 DIST connman-82ce08135a14ef4ab5b5b60f1e426a26b9fc72fc.tar.gz 742300 BLAKE2B 90d6332ce6ee29ee313b6e83cb4c77982bfff02bf358cf066df7a77cfacfaaeb6b06315f7452a86b33a7351adb7883a608020010834604f94ae4671d72e268b4 SHA512 35c95b9544ee204bf57df3ff4258f3454a3d34e4fff2fe19d74df2fead8956c919fe5ecde7554b22c32504a32b15adb5c0d858457acdf21f4d2df766d4a0de4b
+DIST connman-9971144ae862e83f1f5d8cb84c0b62f2542dcdec.tar.gz 743500 BLAKE2B 513380639f02c103f4e9aca73571e00edc42894e612712c20319c3ee9b8845bff41ce05b17016b52b7d34f09c8f74f877a639fd21455b13a5a2ef1554eb0b093 SHA512 bc37dabb13b76e3fa0efd811d664f321b47118d378285dfa06710ec227822c409ed0c60c2f42c00ae081e47ec879ec1b19f784e9fc2346d1d57f6e87550dda22
 DIST connman-cb05780d86c39cfb5e6d9ac2b288bf3244a95d57.tar.gz 738675 BLAKE2B d2c8ee587bdf045e4438a5c4c48475a5ba8ae390032dbdee44ed884273d741e290fcaeb5cee1025a7dec1f7f7034cf01d3e074d08004024dc541bff1b729627c SHA512 3d49f7fad6044c080a5805cc35dbecbdf916d66a2ace0246631936fbf46d80fcfff960df79a8471069caa00975dd74f5fcc17812811ce9c93919e2947ef23f6d
diff --git a/net-misc/connman/connman-1.42_pre20230116-r2.ebuild b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild
new file mode 100644
index 000000000000..d1dc59e3b63c
--- /dev/null
+++ b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit autotools systemd tmpfiles
+
+COMMIT=9971144ae862e83f1f5d8cb84c0b62f2542dcdec
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	net-libs/gnutls
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0=
+	)
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )"
+RDEPEND="${COMMON_DEPEND}
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	l2tp? ( net-dialup/xl2tpd )
+	ofono? ( net-misc/ofono )
+	policykit? ( sys-auth/polkit )
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
+S=${WORKDIR}/${PN}-${COMMIT}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	cp "${FILESDIR}"/connman.initd2 "${T}"
+	if use iwd; then
+		sed -i \
+			-e "s/need dbus/need dbus iwd/" \
+			-e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \
+			"${T}"/connman.initd2 || die
+		sed -i \
+			-e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \
+			src/connman.service.in || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var \
+		--runstatedir=/run \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable debug) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable examples test) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable networkmanager nmcompat) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable tools) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+		)
+	# wifi USE logic to match networkmanager ebuild behavior
+	if use wifi; then
+		if use iwd; then
+			myeconfargs+=( --enable-iwd --disable-wifi )
+		else
+			myeconfargs+=( --disable-iwd --enable-wifi=builtin )
+		fi
+	else
+		myeconfargs+=( --disable-iwd --disable-wifi )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${T}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process connman_resolvconf.conf
+}
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 5872e2d57b56..480b2915a9fb 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,4 +1,3 @@
-DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
 DIST dropbear-2022.82.tar.bz2 2309514 BLAKE2B 56ff931de1e5681850a4c96b8f2c1d90db1680a08a8a741ae3034a433c2780715ede9754357477c9adfe35a310859641d7a03534e6a656e11cd7de8832fbc27d SHA512 94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b
 DIST dropbear-2022.82.tar.bz2.asc 833 BLAKE2B 7d152456f24a61add2935e7f2c9ae7a05e00137ae2c39638004cccc1fd0491311328b5e829443cbe727ae6ec9d58973270b917bae0f23ddcef0b5051b62ca60b SHA512 a45fa49857598195b8d7e51e02bf26498a74c6900245c114ce1fa19bc4eb0ef0518cbb68996c3584c0b98c22bb2078eb963e4a513f0dfb03baae6d04f5911105
 DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
diff --git a/net-misc/dropbear/dropbear-2020.81-r3.ebuild b/net-misc/dropbear/dropbear-2020.81-r3.ebuild
deleted file mode 100644
index 15ac003888ba..000000000000
--- a/net-misc/dropbear/dropbear-2020.81-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit savedconfig pam
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
-
-LIB_DEPEND="
-	virtual/libcrypt[static-libs(+)]
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? (
-		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
-		>=dev-libs/libtommath-1.2.0
-		${LIB_DEPEND//\[static-libs(+)]}
-	)
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.46-dbscp.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex minimal "" "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-	)
-}
-
-pkg_setup() {
-	if use static ; then
-		ewarn "Using bundled copies of libtommath and libtomcrypt"
-	fi
-}
-
-src_prepare() {
-	default
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i svr-authpam.c || die
-	restore_config localoptions.h
-}
-
-src_configure() {
-	# Notes:
-	# 1) We use bundled libtom* when static build is enabled because
-	#    libtomcrypt lacks it and we don't particularly want to add it.
-	# 2) We disable the hardening flags as our compiler already enables them
-	#    by default as is appropriate for the target.
-	local myeconfargs=(
-		--disable-harden
-		$(use_enable static bundled-libtom)
-		$(use_enable zlib)
-		$(use_enable pam)
-		$(use_enable !bsdpty openpty)
-		$(use_enable shadow)
-		$(use_enable static)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin || die
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}" || die
-	fi
-	save_config localoptions.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	if use pam; then
-		pamd_mimic system-remote-login dropbear auth account password session
-	fi
-}
diff --git a/net-misc/dropbear/dropbear-2022.83.ebuild b/net-misc/dropbear/dropbear-2022.83.ebuild
index 0ede69cedbbe..a1e8f6ebb47d 100644
--- a/net-misc/dropbear/dropbear-2022.83.ebuild
+++ b/net-misc/dropbear/dropbear-2022.83.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
 RESTRICT="!test? ( test ) test"
 
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index c0b228a98864..c4b387a6832e 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1 +1,2 @@
 DIST dropbox-cli-2022.py.xz 14288 BLAKE2B a90d347efcce5917179853afef346a6679dddbb33e146a936786c226ad519601f503d73eeb1d1e205be8bd11792aeedb90ff7046c770f079a47e75dea80efd99 SHA512 59bfbf3544a8407bbc232d87e57d8b27d4bbc108483af52e58c0badddde6ce2dfde2203403a8c5e8c95421fe8c4b73e75cec64def2699ae9bac31be965e98974
+DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294
diff --git a/net-misc/dropbox-cli/dropbox-cli-2023.ebuild b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild
new file mode 100644
index 000000000000..44405e85739c
--- /dev/null
+++ b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-r1 bash-completion-r1
+
+DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gpg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="net-misc/dropbox
+	${PYTHON_DEPS}
+	gpg? ( app-crypt/gpgme[python] )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin ${P}.py ${PN}
+	python_replicate_script "${D}"/usr/bin/${PN}
+	newbashcomp "${FILESDIR}"/${PN}-19-completion ${PN}
+}
diff --git a/net-misc/dropbox/dropbox-168.4.4802.ebuild b/net-misc/dropbox/dropbox-168.4.4802.ebuild
index e1949fb60f88..b0b4cee9bbeb 100644
--- a/net-misc/dropbox/dropbox-168.4.4802.ebuild
+++ b/net-misc/dropbox/dropbox-168.4.4802.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/htail/htail-1.5.ebuild b/net-misc/htail/htail-1.5.ebuild
index 96d199eb59a7..5b91fa1c3dcc 100644
--- a/net-misc/htail/htail-1.5.ebuild
+++ b/net-misc/htail/htail-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index c0e56f6c5040..0bce138a63ac 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,4 +1,6 @@
 DIST linuxx64-22.12.0.12.tar.gz 165269811 BLAKE2B 7735357f38d9438137792fc1d1febfdda6ca464fc43f573dffb4a33fffca052a78b8b61277cffd9287efcbc3823529e707140e7c9c1f9502c768528d2018b71d SHA512 bbe002d32e6d3819ab76ecef7fe7b62fff14da409d1b13c6edfc947cd46b0919d0f1972e7c1581d871bbe341ea50d3cf0da797f53f97b8e370610b37048f9a31
 DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
+DIST linuxx64-23.2.0.10.tar.gz 165430863 BLAKE2B 92e3eb397691c938768c4893ebbbef48cccbaf120de40956f3883fff76ac770fe55f3e99b397634776626d76962a18a8ce0a4814f5b8a52f39a3910e4cc764ae SHA512 9eaff591e14df82a05d5c8aa4b1ec763495671a5b46476b0d722ec0893939be99d99cf820432f27293b5d8c482544397562f8ab5be210b648d278a73cc65fb0a
 DIST linuxx86-22.12.0.12.tar.gz 147837116 BLAKE2B d5f1c53d1f2d2ecb95e67df256a667df733251a99dd4a5e9584554521c4f1b1fbd065dfd8b1c4ba344a543c5cd7dde4a939e3d4d82f658e7dae42c07527b645e SHA512 8e9c4262dcd7731b88ae43a663d5901a21a9ede2feed163b538f5fb475f0eba8768a08715db5e9c8fa809442140d1ef03d4d4e509cb83142bea806855615a6b3
 DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
+DIST linuxx86-23.2.0.10.tar.gz 147975174 BLAKE2B 20ef9c6059b39c79deb5098c4f8ba02bb82fee9c4eb06eab8fb5f49c450a87a1374febc044b8130a8cd5112b4bbdaa45dabb8e14fe009be4016cdbf5864b2803 SHA512 f2cebaeaadd53e0431de0455b24a0dc6063eea3586cf1b696c33849ee51623a11add431c11b9bf91b8228ecf4c49d157781643debd1248cf6cd88b974844201a
diff --git a/net-misc/icaclient/icaclient-23.2.0.10.ebuild b/net-misc/icaclient/icaclient-23.2.0.10.ebuild
new file mode 100644
index 000000000000..5fe81dd431fe
--- /dev/null
+++ b/net-misc/icaclient/icaclient-23.2.0.10.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+	x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx"
+RESTRICT="mirror strip fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+# we have binaries for two conflicting kerberos implementations
+# https://bugs.gentoo.org/792090
+# https://bugs.gentoo.org/775995
+REQUIRES_EXCLUDE="
+	libgssapi.so.3
+	libgssapi_krb5.so.2 libkrb5.so.3
+"
+# when using media-plugins/hdx-realtime-media-engine we better not ignore that
+REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
+	!hdx? ( libunwind.so.1 )
+"
+# we have binaries which wouls still support gstreamer:0.10
+REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
+	libgstapp-0.10.so.0
+	libgstbase-0.10.so.0
+	libgstinterfaces-0.10.so.0
+	libgstpbutils-0.10.so.0
+	libgstreamer-0.10.so.0
+"
+
+BDEPEND="
+	hdx? ( >=media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libogg
+	media-libs/libpulse
+	media-libs/libvorbis
+	media-libs/mesa
+	media-libs/speex
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	sys-apps/util-linux
+	sys-libs/libcxx
+	sys-libs/libcxxabi
+	sys-libs/zlib
+	virtual/krb5
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	${BDEPEND}
+	!hdx? ( !<media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+"
+DEPENDS=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+}
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
+}
+
+src_prepare() {
+	default
+	rm lib/UIDialogLibWebKit.so || die
+
+	cp nls/en/module.ini . || die
+	if use hdx; then
+		"${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die
+		mv new_module.ini module.ini || die
+	fi
+	mv module.ini config/ || die
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/*
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	local lang LANGCODES=( en )
+	use l10n_de && LANGCODES+=( de )
+	use l10n_es && LANGCODES+=( es )
+	use l10n_fr && LANGCODES+=( fr )
+	use l10n_ja && LANGCODES+=( ja )
+	use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+	for lang in ${LANGCODES[@]} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	cp -a util "${ED}/${ICAROOT}" || die
+	test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	local other_files=(
+		icasessionmgr
+		NativeMessagingHost
+		UtilDaemon
+	)
+
+	exeinto "${ICAROOT}"
+	for bin in ${other_files[@]} ; do
+		doexe ${bin}
+	done
+
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	insinto "${ICAROOT}"/pkginf
+	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+
+	insinto /usr/share/mime/packages
+	doins desktop/Citrix-mime_types.xml
+}
+
+pkg_preinst() {
+	# previous versions of the ebuild created that and left it around
+	# we own it now and avoid conflict warnings with this
+	rm -f "${ROOT}${ICAROOT}/config/module.ini"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! use hdx; then
+		if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then
+			ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want"
+			ewarn "to use media-plugins/hdx-realtime-media-engine. Which does"
+			ewarn "not need to be explicitly installed anymore."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest
index 123942b2897a..004df62c823e 100644
--- a/net-misc/netkit-fingerd/Manifest
+++ b/net-misc/netkit-fingerd/Manifest
@@ -1 +1 @@
-DIST bsd-finger_0.17.orig.tar.bz2 24096 BLAKE2B 96342764b07e3946c2ddba8ecd094e3760b32601e6eea630c1586e821ee856a2e09420ba69ff55e3023d832757f8daaf58e4bf5d4bab35e475bcd83c851ab730 SHA512 06bc071fb5115be13ab88b946626f97b14ec60e9223c831bdc0575c6ad9556227179736078191ce4f4b982ebcba9a82b4aba2ad970803b35015999a167841bdc
+DIST bsd-finger-0.17.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0
diff --git a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch
new file mode 100644
index 000000000000..4318db053ac2
--- /dev/null
+++ b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/897822
+
+Add missing fcntl.h.
+Change sys/time.h to time.h.
+
+--- a/finger/lprint.c
++++ b/finger/lprint.c
+@@ -42,13 +42,14 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <fcntl.h>
+ #include <paths.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <sys/stat.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include "finger.h"
+ 
+ static void lprint(PERSON *pn);
+--- a/finger/sprint.c
++++ b/finger/sprint.c
+@@ -40,7 +40,7 @@
+ #endif /* not lint */
+ 
+ #include <sys/types.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff
deleted file mode 100644
index e7c2d776147d..000000000000
--- a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- bsd-finger-0.17/finger/lprint.c~	Tue Sep 14 12:51:11 1999
-+++ bsd-finger-0.17/finger/lprint.c	Sun Apr 29 21:49:04 2001
-@@ -48,7 +48,7 @@
- #include <sys/types.h>
- #include <sys/file.h>
- #include <sys/stat.h>
--#include <sys/time.h>
-+#include <time.h>
- #include "finger.h"
- 
- static void lprint(PERSON *pn);
---- bsd-finger-0.17/finger/sprint.c~	Sun Dec 12 19:59:33 1999
-+++ bsd-finger-0.17/finger/sprint.c	Sun Apr 29 21:49:22 2001
-@@ -40,7 +40,7 @@
- #endif /* not lint */
- 
- #include <sys/types.h>
--#include <sys/time.h>
-+#include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
index bd104d8c1edc..6c1adb7f6586 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit toolchain-funcs
 
-MY_PN="${PN/netkit/bsd}"
-MY_PN="${MY_PN/rd/r}"
 DESCRIPTION="Netkit - fingerd and finger client"
 HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit"
-SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.bz2"
+SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/finger/bsd-finger-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S=${WORKDIR}/bsd-finger-${PV}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-r2-gentoo.diff
+	"${FILESDIR}"/netkit-fingerd-0.17-includes.patch
 	"${FILESDIR}"/${P}-name-check.patch #80286
 )
 
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 0770f6988b67..df4b080d77e0 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,2 +1 @@
-DIST r8168-8.050.03.tar.bz2 115525 BLAKE2B 9681417c5ded9d089259d80226a16789beaacf31902d896410d581927468c44486a4c496e45d9973851ccca2d4c408159064452849b03347c789390b2b23e57b SHA512 b4c0af2f4e6b9dc36f2db9e33f465d8598afa0b28577ea1f016617e853af00cf41886941fd8173a5b035e219d87a0fae28771230079c88f34039efe669c1e1c6
 DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca
diff --git a/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
deleted file mode 100644
index 442fa1c3eadf..000000000000
--- a/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Functions like 'pci_dma_sync_single_for_device', 'pci_set_dma_mask', and 'pci_set_consistent_dma_mask'
-no longer exist in 5.18.0.
-Fix similar to https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2238850.html
-
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -3698,7 +3698,11 @@
-         txd->opts2 = 0;
-         while (1) {
-                 memset(tmpAddr, pattern++, len - 14);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
-                 pci_dma_sync_single_for_device(tp->pci_dev,
-+#else
-+                dma_sync_single_for_device(&tp->pci_dev->dev,
-+#endif
-                                                le64_to_cpu(mapping),
-                                                len, DMA_TO_DEVICE);
-                 txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
-@@ -3726,7 +3730,11 @@
-                 if (rx_len == len) {
-                         dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
-                         i = memcmp(skb->data, rx_skb->data, rx_len);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
-                         pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
-+#else
-+                        dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
-+#endif
-                         if (i == 0) {
- //              dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
-                                 break;
-@@ -26408,11 +26416,20 @@
- 
-         if ((sizeof(dma_addr_t) > 4) &&
-             use_dac &&
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
-             !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
-             !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
-+#else
-+            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
-+            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-+#endif
-                 dev->features |= NETIF_F_HIGHDMA;
-         } else {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
-                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-+#else
-+                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-+#endif
-                 if (rc < 0) {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-                         if (netif_msg_probe(tp))
diff --git a/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch b/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch
deleted file mode 100644
index d0f5d30ada06..000000000000
--- a/net-misc/r8168/files/r8168-8.050.03-5.19-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Andrea Righi <andrea.righi@canonical.com>
-Subject: support linux 5.19
-
-Index: r8168-8.050.03/src/r8168_n.c
-===================================================================
---- r8168-8.050.03.orig/src/r8168_n.c
-+++ r8168-8.050.03/src/r8168_n.c
-@@ -116,6 +116,15 @@
- #define FIRMWARE_8168FP_3   "rtl_nic/rtl8168fp-3.fw"
- #define FIRMWARE_8168FP_4   "rtl_nic/rtl8168fp-4.fw"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+static inline void netif_set_gso_max_size(struct net_device *dev,
-+					  unsigned int size)
-+{
-+	/* dev->gso_max_size is read locklessly from sk_setup_caps() */
-+	WRITE_ONCE(dev->gso_max_size, size);
-+}
-+#endif
-+
- /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
-    The RTL chips use a 64 element hash table based on the Ethernet CRC. */
- static const int multicast_filter_limit = 32;
diff --git a/net-misc/r8168/r8168-8.050.03.ebuild b/net-misc/r8168/r8168-8.050.03.ebuild
deleted file mode 100644
index 6c2652606478..000000000000
--- a/net-misc/r8168/r8168-8.050.03.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info linux-mod
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# "GBE Ethernet LINUX driver r8168 for kernel up to 5.17" from above link,
-# we need to mirror it to avoid users from needing to fill a captcha to
-# download
-SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-IUSE="use-firmware"
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-PATCHES=(
-	"${FILESDIR}/r8168-8.050.02-5.18-fix.patch"
-	"${FILESDIR}/r8168-8.050.03-5.19-fix.patch"
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
-}
diff --git a/net-misc/radvd/radvd-2.19-r2.ebuild b/net-misc/radvd/radvd-2.19-r2.ebuild
index 09f0b09aa5c9..ac71ff204c83 100644
--- a/net-misc/radvd/radvd-2.19-r2.ebuild
+++ b/net-misc/radvd/radvd-2.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="https://v6web.litech.org/radvd/"
+HOMEPAGE="https://radvd.litech.org/"
 SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz"
 
 LICENSE="BSD"
diff --git a/net-misc/radvd/radvd-2.19-r4.ebuild b/net-misc/radvd/radvd-2.19-r4.ebuild
index c0f7f25a5faa..24730014369e 100644
--- a/net-misc/radvd/radvd-2.19-r4.ebuild
+++ b/net-misc/radvd/radvd-2.19-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="https://v6web.litech.org/radvd/"
+HOMEPAGE="https://radvd.litech.org/"
 SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz"
 
 LICENSE="BSD"
diff --git a/net-misc/radvd/radvd-2.19-r5.ebuild b/net-misc/radvd/radvd-2.19-r5.ebuild
index 29de0514de5a..222b52879021 100644
--- a/net-misc/radvd/radvd-2.19-r5.ebuild
+++ b/net-misc/radvd/radvd-2.19-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="https://v6web.litech.org/radvd/"
+HOMEPAGE="https://radvd.litech.org/"
 SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz"
 
 LICENSE="BSD"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 1d0f96876480..f02155e15a3a 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,2 +1 @@
-DIST Remmina-v1.4.27.tar.bz2 1975470 BLAKE2B 09ce4cd29f476a307dce4c35d8304b8383db016b63646375d50a86051f6dd99fb4775700e3d8887dbbbece72b90dcbc5987b0705e2fe8f5b0840bba1cb29c92e SHA512 44bc067eaf2c4c10e42182aa7c3ec2aa18ec5c0ce51a2fc765884cbfc11261d3c0db537b1674424aa092caf171e647714dcc8af6d813273f7b96876a251e0575
 DIST Remmina-v1.4.29.tar.bz2 2014832 BLAKE2B a5e3a54d510c74fd8399116dfd1cc67aaafdf93e3217a20ad77a2c959597b7be51cf187ffb459eb5cabe0a30f985f649aa59dba1397d7a8b3a0c10ea997b3fdf SHA512 8fbe822d07ec800bb739579b373003ee56cbc661fd0b635e5a7af0369d2e5450e7116907a87c34e82704c2aab790ac501ee6331946751660321c917ffd9a183e
diff --git a/net-misc/remmina/remmina-1.4.27.ebuild b/net-misc/remmina/remmina-1.4.27.ebuild
deleted file mode 100644
index 893bfcc13437..000000000000
--- a/net-misc/remmina/remmina-1.4.27.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	net-libs/libsoup:2.4
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.29-r1.ebuild b/net-misc/remmina/remmina-1.4.29-r1.ebuild
deleted file mode 100644
index 901a4cac14ff..000000000000
--- a/net-misc/remmina/remmina-1.4.29-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libayatana-appindicator )
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.29-r2.ebuild b/net-misc/remmina/remmina-1.4.29-r2.ebuild
index 790b0d0b43f2..2a0cc95fbf42 100644
--- a/net-misc/remmina/remmina-1.4.29-r2.ebuild
+++ b/net-misc/remmina/remmina-1.4.29-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-misc/remmina/remmina-1.4.29.ebuild b/net-misc/remmina/remmina-1.4.29.ebuild
deleted file mode 100644
index c86d19979b6a..000000000000
--- a/net-misc/remmina/remmina-1.4.29.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index ed41f6d57189..6ba554204cfc 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -2,3 +2,4 @@ DIST streamlink-4.3.0.tar.gz 474184 BLAKE2B 557d70105f043fe7454d1c6dd7a49becfd35
 DIST streamlink-5.1.2.tar.gz 494342 BLAKE2B f916aab0fcd346e9945de04335309c61cb83c7c5047208a281a87162fb19dae6e45ae861fbc55780049e63bd854f303ee1669d3664a3736debbf8194ee4e6760 SHA512 8fecdc46fc34b37a5a67d15bb4252d1ebab69815398deb533de063fdf7e211d23d413b1b519984dddd2bb5e35296d717dd0504a3578b7bc44c7b123cd70db2a3
 DIST streamlink-5.2.1.tar.gz 510860 BLAKE2B eb7f3c85b048d3f274c332f27daafe38a0b495a651101ba2f7c19f13f18a8c691d495f614212dd610e80d0e80c23c695017a212760fe10dd58e00e9d8ac7f95f SHA512 68c02eaee2881f8777eaae3d0b54b0c6aeb0aabf76ab52ac23999895ed0d04a73d817634926869acbf8c092bbe65aadc9637824d56fc439d7445d2ea5f400764
 DIST streamlink-5.3.0.tar.gz 521864 BLAKE2B 2afb7577ba43b73f58d7cd13d217dbaa96f8abea8a10fa495d158c56604ec385e6191df6001f3d969f6aafa3a9aca8a46ab7224af646e2bb404e6098b5261e6a SHA512 7fc18c0604729df358ba396a21e4aa646344d1a1f320ce84831bc13c207a6dd64b2bd6679dc1712483764edd01bd87347d7eca2e3c8d4f6f2113db9c03737343
+DIST streamlink-5.3.1.tar.gz 524261 BLAKE2B 4691ce2751382271fa49ab1570ee32f48798ef5f802cb79f80786d27d737ac58bb8f01ae5d71a15cb8fff4b1422485ad5f43b66d74531d370ae78b6d9e837d99 SHA512 55120f53d47d222d5d3b428ddaa608799623f7adc09bedaa6eff7389962db1a60374a2fa951a3f2779873a6b2c9757caa82e255a05056b0b5d0762829822b32a
diff --git a/net-misc/streamlink/streamlink-5.3.1.ebuild b/net-misc/streamlink/streamlink-5.3.1.ebuild
new file mode 100644
index 000000000000..ff7c51d0ed88
--- /dev/null
+++ b/net-misc/streamlink/streamlink-5.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 94960aaac192..70102e5fd41d 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
new file mode 100644
index 000000000000..aa3265514938
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
+HOMEPAGE="https://tigervnc.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	~net-misc/tigervnc-${PV}[server]
+	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index a2a9e9e7c73c..3d98f06d8bf5 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d SHA512 55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd9666686b8d4ac5fc3389c6f9319df16b90be8
+DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
new file mode 100644
index 000000000000..fc6cb7d77a07
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	java? ( viewer )
+	opengl? ( server )
+	|| ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
+	)
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk:1
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libXi
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+)
+[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 989e229b1c93..f463d4c1c313 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,2 +1,4 @@
 DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11
 DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c
+DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de
+DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489
diff --git a/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild
new file mode 100644
index 000000000000..abebac6c9c50
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-3.0.3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_OPT_USE=viewer
+inherit cmake desktop java-pkg-opt-2 verify-sig
+
+DESCRIPTION="A fast replacement for TigerVNC"
+HOMEPAGE="https://www.turbovnc.org/"
+SRC_URI="
+	https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz
+	verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+server +ssl +viewer"
+REQUIRED_USE="|| ( server viewer )"
+
+COMMON_DEPEND="
+	x11-apps/xauth
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xkeyboard-config
+	server? (
+		media-libs/libjpeg-turbo:=
+		sys-libs/pam
+		sys-libs/zlib
+		virtual/opengl
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/pixman
+		ssl? ( dev-libs/openssl:= )
+		!net-misc/tigervnc[server]
+	)
+	viewer? (
+		media-libs/libjpeg-turbo:=[java]
+		x11-libs/libXi
+		!net-misc/tigervnc[viewer(+)]
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+	viewer? ( >=virtual/jre-1.8:* )
+"
+
+# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2
+# but cmake will look for them, so add them here
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/xtrans
+	viewer? ( >=virtual/jdk-1.8:* )
+	server? (
+		app-arch/bzip2
+		media-libs/freetype
+		x11-libs/libfontenc
+	)
+"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc )
+"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch )
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc
+
+pkg_pretend() {
+	if use ssl && ! use server; then
+		einfo "USE=\"ssl\" selected but USE=\"server\" is not.  The SSL support is unused"
+	fi
+}
+
+src_prepare() {
+	use viewer && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTVNC_BUILDVIEWER=$(usex viewer)
+		-DTVNC_BUILDHELPER=$(usex viewer)
+		-DTVNC_BUILDSERVER=$(usex server)
+		-DTVNC_BUILDWEBSERVER=$(usex server)
+	)
+
+	if use server ; then
+		mycmakeargs+=(
+			-DTVNC_SYSTEMLIBS=ON
+			-DTVNC_SYSTEMX11=ON
+			-DXKB_BIN_DIRECTORY=/usr/bin
+			-DXKB_DFLT_RULES=base
+		)
+		if use ssl ; then
+			# Link properly against OpenSSL to ensure
+			# we catch e.g. ABI change
+			# (i.e. don't dlopen it)
+			mycmakeargs+=(
+				-DTVNC_USETLS=OpenSSL
+				-DTVNC_DLOPENSSL=OFF
+			)
+		else
+			mycmakeargs+=( -DTVNC_USETLS=OFF )
+		fi
+	fi
+
+	if use viewer ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use viewer ; then
+		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+	fi
+
+	# Don't install incompatible init script
+	rm -rf "${ED}"/etc/init.d/ || die
+	rm -rf "${ED}"/etc/sysconfig/ || die
+
+	# Conflicts with x11-base/xorg-server
+	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
+
+	einstalldocs
+}
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index eee178f4360e..a97b233c2ef3 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,2 +1,3 @@
 DIST ytfzf-2.5.3.tar.gz 3265442 BLAKE2B e920bf60a567741cc84739d20f282c27036eafaa823ea273439e49f9b855798a11f611ee8b4893490538d24c3039f2780451272f82ead73c45fb0f2124e05417 SHA512 fcc9e6064fe381972f30a94fd418ba9a497fed4be891f40b75e608a4c095f7b311000ae104d8e877b52622defa4ff57cb0ec1ace4d034ba08f0ff3985438d58d
 DIST ytfzf-2.5.4.tar.gz 3273455 BLAKE2B 9e4ba90cca7a17fc8c7283097db1925582b9dbb85b9b83db77f2e20a48db7566a8396114256bcb61bffb281ac0ce64f199702f495cd07f2e4e11d0c81605a973 SHA512 48ab12314a638d2682eb387c1d0bd2c8979762287194d897d801c1b845c28e3e6c2b383e1fede75e0b0649ab401855e6a9ee48a58cfc4e08b0f291da877ed150
+DIST ytfzf-2.5.5.tar.gz 3278740 BLAKE2B e80ee83cbd80fd3d53dd4e3f9aca4fed71b6bbebc6b0f0d8c85263efa4dfd184e45998719df966279365378669624119035f069c4d2b2d5f820e5304bd36604d SHA512 811fbc1de1b23bddd988c74212f0d6b314e5a7998ebc06e0481d42a5e6afa530f10a0e749a293a76799eff1fc380ebd54210f5e152c6d8ab07fd39327544c9d7
diff --git a/net-misc/ytfzf/ytfzf-2.5.5.ebuild b/net-misc/ytfzf/ytfzf-2.5.5.ebuild
new file mode 100644
index 000000000000..28d4e09cb02b
--- /dev/null
+++ b/net-misc/ytfzf/ytfzf-2.5.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
+HOMEPAGE="https://github.com/pystardust/ytfzf/"
+SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X minimal"
+
+RDEPEND="
+	app-misc/jq
+	net-misc/curl[ssl]
+	app-alternatives/awk
+	!minimal? (
+		X? ( media-gfx/ueberzug )
+		app-shells/fzf
+		media-video/mpv[lua]
+		net-misc/yt-dlp
+	)"
+
+src_compile() { :; }
+
+src_install() {
+	local emakeargs=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	emake "${emakeargs[@]}" addons doc install
+	einstalldocs
+
+	rm -r "${ED}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	optfeature "external menu support" x11-misc/dmenu
+	optfeature "desktop notifications" x11-libs/libnotify
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that ${PN} supports many methods to display menus/thumbnails."
+		elog "This ebuild primarily covers defaults and major features, additional"
+		elog "dependencies may be needed for others. Set USE=minimal if want full"
+		elog "control over optional dependencies (e.g. fzf is optional if use dmenu)."
+	fi
+}
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
index ba71a7a4ec39..dea8b38e2d45 100644
--- a/net-misc/ytmdl/Manifest
+++ b/net-misc/ytmdl/Manifest
@@ -1,2 +1,3 @@
 DIST ytmdl-2022.12.25.tar.gz 52126 BLAKE2B f769ec1bd78f4d1ce53104c18c95df66722c31747e7b0b4f98bc96d56e1d8ee40d6be834b6f3c690dc8986182185c8e755b567fd488924ad08d5d2362d95e9e9 SHA512 543353ec951e80956ccbb9398d14237a02cc9ca66deaa41ce3b50c3d577b9930adf490777ccf7936a75a9a40524aea328fee62298d8ca2606a28ffa9ec17ba23
 DIST ytmdl-2022.3.16.tar.gz 51115 BLAKE2B 504d0d0de299c8989bb289769cd43645199a7f47b683885efc6eafde5643ed070cc66eeaf7b1c8f42d547b25f830c3bd8feb9abc0124b28d4d1900e5cf785c9d SHA512 5ad67fb981d5f3ea42d2f097cecf982f0971e824c5971aa8fbc664303f436c623ab03a9f0e31dba060b27eb7eb57b88452ba1ede9eb3385dc6acead9fa43e0d0
+DIST ytmdl-2023.2.28.tar.gz 52281 BLAKE2B 5a9dfea6022082b976fb165ca45cb4ae13adac9308cb5671b52bd433eed4b2921bad345c3acaa10f125d06162964c55b82c44468e3d12b52c47ea63d2d1bce71 SHA512 891119c0386bd2079108b9b34f41606c2a6da21de5f574a89b95d6cb5a661611e442ffc10f6f4d94d827318568408ff8d5b58eb3eb602e64afa4efa3728b3855
diff --git a/net-misc/ytmdl/ytmdl-2022.12.25.ebuild b/net-misc/ytmdl/ytmdl-2022.12.25.ebuild
index bbabf283d724..7c908d1870ad 100644
--- a/net-misc/ytmdl/ytmdl-2022.12.25.ebuild
+++ b/net-misc/ytmdl/ytmdl-2022.12.25.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/net-misc/ytmdl/ytmdl-2022.3.16.ebuild b/net-misc/ytmdl/ytmdl-2022.3.16.ebuild
index 735d7b0244c7..a43f0ec72bd5 100644
--- a/net-misc/ytmdl/ytmdl-2022.3.16.ebuild
+++ b/net-misc/ytmdl/ytmdl-2022.3.16.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/net-misc/ytmdl/ytmdl-2023.2.28.ebuild b/net-misc/ytmdl/ytmdl-2023.2.28.ebuild
new file mode 100644
index 000000000000..7c908d1870ad
--- /dev/null
+++ b/net-misc/ytmdl/ytmdl-2023.2.28.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Simple app to get songs from youtube in mp3 format"
+HOMEPAGE="https://ytmdl.deepjyoti30.dev/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/ffmpeg-python[${PYTHON_USEDEP}]
+	dev-python/itunespy[${PYTHON_USEDEP}]
+	dev-python/pyDes[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/simber[${PYTHON_USEDEP}]
+	dev-python/spotipy[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/youtube-search-python[${PYTHON_USEDEP}]
+	dev-python/ytmusicapi[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	net-misc/downloader-cli[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp ${PN}.bash ${PN}
+}
diff --git a/net-misc/zsync/metadata.xml b/net-misc/zsync/metadata.xml
index 9a154a2d05a2..c14c57dad630 100644
--- a/net-misc/zsync/metadata.xml
+++ b/net-misc/zsync/metadata.xml
@@ -22,4 +22,7 @@
 		anyone can download the file, make a .zsync and provide it to other users (this
 		is what I am doing for the moment)."
 	</longdescription>
+	<upstream>
+		<remote-id type="github">cph6/zsync</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index dc6a9287c951..4554df09be4e 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/canto-curses/canto-curses-0.9.9.ebuild b/net-news/canto-curses/canto-curses-0.9.9.ebuild
index 54185b196972..d19be6fc05ba 100644
--- a/net-news/canto-curses/canto-curses-0.9.9.ebuild
+++ b/net-news/canto-curses/canto-curses-0.9.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="ncurses(+),threads(+)"
 inherit distutils-r1
 
diff --git a/net-news/canto-daemon/canto-daemon-0.9.8.ebuild b/net-news/canto-daemon/canto-daemon-0.9.8.ebuild
index 273aed1916ee..31c5019726ce 100644
--- a/net-news/canto-daemon/canto-daemon-0.9.8.ebuild
+++ b/net-news/canto-daemon/canto-daemon-0.9.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 inherit distutils-r1
 
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index c1bbf460f1a8..5b46e9b95553 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild
new file mode 100644
index 000000000000..53c0115cfa85
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit optfeature python-single-r1 systemd
+
+MY_PV="${PV/_rc/RC}"
+MY_PV="${MY_PV//_pre*}"
+
+MY_P="${PN/sab/SAB}-${MY_PV}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	acct-user/sabnzbd
+	acct-group/sabnzbd
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
+		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/puremagic[${PYTHON_USEDEP}]
+		~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/tavalidate[${PYTHON_USEDEP}]
+			>=dev-python/tavern-2[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${DEPEND}
+	>=app-arch/par2cmdline-0.4
+	net-misc/wget
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+			dev-python/pkginfo[${PYTHON_USEDEP}]
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/selenium[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/xmltodict[${PYTHON_USEDEP}]
+		')
+		app-arch/p7zip
+		app-arch/unrar
+		app-arch/unzip
+		www-apps/chromedriver-bin
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tavern-2.patch
+)
+
+src_test() {
+	local EPYTEST_IGNORE=(
+		# network sandbox
+		tests/test_getipaddress.py
+		tests/test_rss.py
+		tests/test_urlgrabber.py
+		tests/test_utils/test_happyeyeballs.py
+		tests/test_utils/test_internetspeed.py
+	)
+	local EPYTEST_DESELECT=(
+		# network sandbox
+		'tests/test_cfg.py::TestValidators::test_validate_host'
+		'tests/test_consistency.py::TestWiki'
+		# Just plain fails
+		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
+		# Chromedriver tests don't want to behave in portage
+		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
+		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
+		'tests/test_functional_config.py::TestConfigLogin::test_login'
+		'tests/test_functional_config.py::TestConfigCategories::test_page'
+		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
+		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
+		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
+		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
+		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=tavern._core.pytest
+	epytest -s
+}
+
+src_install() {
+	local d
+	for d in email icons interfaces locale po sabnzbd scripts tools; do
+		insinto /usr/share/${PN}/${d}
+		doins -r ${d}/*
+	done
+
+	exeinto /usr/share/${PN}
+	doexe SABnzbd.py
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+	python_optimize "${ED}"/usr/share/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	diropts -o ${PN} -g ${PN}
+	dodir /etc/${PN}
+	keepdir /var/log/${PN}
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
+
+	dodoc ISSUES.txt README.mkd
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		einfo "Default directory: /var/lib/${PN}"
+		einfo
+		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+		einfo
+		einfo "    usermod -a -G sabnzbd <user>"
+		einfo
+		einfo "By default, SABnzbd will listen on TCP port 8080."
+	fi
+
+	optfeature "7z archive support" app-arch/p7zip
+	optfeature "rar archive support" app-arch/unrar app-arch/rar
+	optfeature "zip archive support" app-arch/unzip
+}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
deleted file mode 100644
index f9a876c654e3..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.7.2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
-		dev-python/tavalidate[${PYTHON_USEDEP}]
-		>=dev-python/tavern-2[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			dev-python/pkginfo[${PYTHON_USEDEP}]
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tavern-2.patch
-)
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=tavern._core.pytest
-	epytest -s
-}
-
-src_install() {
-	local d
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto /usr/share/${PN}/${d}
-		doins -r ${d}/*
-	done
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index e8348a3c1734..14058e764be7 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 7ae9a277ae21..742e3b0d6867 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,2 +1,3 @@
 DIST qbittorrent-4.4.5.tar.gz 7739170 BLAKE2B b40a3ca63c787e0b9b9aac00a6fef452b461ba36b1ef030bc3cdd5fbefcca42d58ff6c3bd382e49f7937161afc6a37bc2c29de4f804db10c7031b9f1ad5f4e2b SHA512 a2b6ecd9a6f087a7ecaad2774d395ee4b2164cb8540b9f32574640f485fa3fc8688046d30e0179863a0aff1524d69b83c00bc232c7feb9ad737c79a05734ad95
 DIST qbittorrent-4.5.1.tar.gz 8780065 BLAKE2B 5c910722d778272972b90f8a2680b0450ea4220a760335e09bf078a63bbdc0c35788de6d75375c4de808582f386cc7d4c372b87d3a6308aa41f575a72927de5e SHA512 46042e55618b9bb24b61b88695a2ab01e5aef39fcad465d47aabe9965d2b66c96e0f35af49bb19b597c009de5b844969819d9dc700b883b1c0d99e2b9671f405
+DIST qbittorrent-4.5.2.tar.gz 8890525 BLAKE2B 48585b703ce6edf862ea3c8cfad6cab2edcb65a138c6e8d232322b4f4fd682c87447ff11d29c04c26b5623e730ab9a1ce0496456b3ba6122f97913bd92b86790 SHA512 e900a1c5f0f70163463557aec3de0d31394fac56cfed91ea53ee5cf852cce4b2998bf79be60fc547c1c34a1658378f3ed9dbfb30aae5a772b85d819c7e7ce458
diff --git a/net-p2p/qbittorrent/qbittorrent-4.5.2.ebuild b/net-p2p/qbittorrent/qbittorrent-4.5.2.ebuild
new file mode 100644
index 000000000000..47567072162d
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.5.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild systemd xdg
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/qBittorrent-release-${PV}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus +gui webui"
+REQUIRED_USE="dbus? ( gui )
+	|| ( gui webui )"
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/openssl-1.1.1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtxml:5
+	<net-libs/libtorrent-rasterbar-2:=
+	>=sys-libs/zlib-1.2.11
+	dbus? ( dev-qt/qtdbus:5 )
+	gui? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md )
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use gui && MULTIBUILD_VARIANTS+=( gui )
+	use webui && MULTIBUILD_VARIANTS+=( nogui )
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	multibuild_src_configure() {
+		local mycmakeargs=(
+			# musl lacks execinfo.h
+			-DSTACKTRACE=$(usex !elibc_musl)
+
+			# More verbose build logs are preferable for bug reports
+			-DVERBOSE_CONFIGURE=ON
+
+			# Not yet in ::gentoo
+			-DQT6=OFF
+
+			-DWEBUI=$(usex webui)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == gui ]]; then
+			# We do this in multibuild, see bug #839531 for why.
+			# Fedora has to do the same thing.
+			mycmakeargs+=(
+				-DGUI=ON
+				-DDBUS=$(usex dbus)
+				-DSYSTEMD=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DGUI=OFF
+				-DDBUS=OFF
+				# The systemd service calls qbittorrent-nox, which is only
+				# installed when GUI=OFF.
+				-DSYSTEMD=ON
+				-DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)"
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant multibuild_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+	einstalldocs
+}
diff --git a/net-p2p/transmission/transmission-4.0.1-r1.ebuild b/net-p2p/transmission/transmission-4.0.1-r1.ebuild
deleted file mode 100644
index 594e5b952031..000000000000
--- a/net-p2p/transmission/transmission-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2006-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic tmpfiles systemd xdg-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/transmission/transmission"
-else
-	MY_PV="${PV/_beta/-beta.}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="A fast, easy, and free BitTorrent client"
-HOMEPAGE="https://transmissionbt.com/"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT="0"
-IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test"
-RESTRICT="!test? ( test )"
-
-ACCT_DEPEND="
-	acct-group/transmission
-	acct-user/transmission
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		gtk? ( sys-devel/gettext )
-		qt5? ( dev-qt/linguist-tools:5 )
-	)
-"
-COMMON_DEPEND="
-	>=dev-libs/libevent-2.1.0:=[threads(+)]
-	!mbedtls? ( dev-libs/openssl:0= )
-	mbedtls? ( net-libs/mbedtls:0= )
-	net-libs/libnatpmp
-	>=net-libs/libpsl-0.21.1
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.28.0[ssl]
-	sys-libs/zlib:=
-	nls? ( virtual/libintl )
-	gtk? (
-		>=dev-cpp/gtkmm-3.24.0:3.0
-		>=dev-cpp/glibmm-2.60.0:2
-		appindicator? ( dev-libs/libayatana-appindicator )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtdbus:5
-	)
-	systemd? ( >=sys-apps/systemd-209:= )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMON_DEPEND}
-	${ACCT_DEPEND}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		-DENABLE_GTK=$(usex gtk ON OFF)
-		-DENABLE_QT=$(usex qt5 ON OFF)
-		-DENABLE_MAC=OFF
-		-DREBUILD_WEB=OFF
-		-DENABLE_CLI=$(usex cli ON OFF)
-		-DENABLE_TESTS=$(usex test ON OFF)
-		-DENABLE_NLS=$(usex nls ON OFF)
-
-		-DRUN_CLANG_TIDY=OFF
-
-		-DUSE_GTK_VERSION=3
-		-DUSE_SYSTEM_EVENT2=ON
-		-DUSE_SYSTEM_DEFLATE=OFF
-		-DUSE_SYSTEM_DHT=OFF
-		-DUSE_SYSTEM_MINIUPNPC=ON
-		-DUSE_SYSTEM_NATPMP=ON
-		-DUSE_SYSTEM_UTP=OFF
-		-DUSE_SYSTEM_B64=OFF
-		-DUSE_SYSTEM_PSL=ON
-		-DUSE_QT_VERSION=5
-
-		-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl)
-		-DWITH_INOTIFY=ON
-		-DWITH_APPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-	)
-
-	# Disable assertions by default, bug 893870.
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-
-	if use systemd; then
-		# Service sets Type=notify
-		systemd_dounit daemon/transmission-daemon.service
-		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-	fi
-
-	insinto /usr/lib/sysctl.d
-	doins "${FILESDIR}"/60-transmission.conf
-
-	newtmpfiles "${FILESDIR}"/transmission-daemon.tmpfiles transmission-daemon.conf
-}
-
-pkg_postrm() {
-	if use gtk || use qt5; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use qt5; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-	tmpfiles_process transmission-daemon.conf
-}
diff --git a/net-p2p/transmission/transmission-4.0.1-r2.ebuild b/net-p2p/transmission/transmission-4.0.1-r2.ebuild
new file mode 100644
index 000000000000..83fe7816fdd1
--- /dev/null
+++ b/net-p2p/transmission/transmission-4.0.1-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2006-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic tmpfiles systemd xdg-utils
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/transmission/transmission"
+else
+	MY_PV="${PV/_beta/-beta.}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/transmission/transmission/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="A fast, easy, and free BitTorrent client"
+HOMEPAGE="https://transmissionbt.com/"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT="0"
+IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test"
+RESTRICT="!test? ( test )"
+
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		gtk? ( sys-devel/gettext )
+		qt5? ( dev-qt/linguist-tools:5 )
+	)
+"
+COMMON_DEPEND="
+	>=dev-libs/libevent-2.1.0:=[threads(+)]
+	!mbedtls? ( dev-libs/openssl:0= )
+	mbedtls? ( net-libs/mbedtls:0= )
+	net-libs/libnatpmp
+	>=net-libs/libpsl-0.21.1
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.28.0[ssl]
+	sys-libs/zlib:=
+	nls? ( virtual/libintl )
+	gtk? (
+		>=dev-cpp/gtkmm-3.24.0:3.0
+		>=dev-cpp/glibmm-2.60.0:2
+		appindicator? ( dev-libs/libayatana-appindicator )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	systemd? ( >=sys-apps/systemd-209:= )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMON_DEPEND}
+	${ACCT_DEPEND}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+
+		-DENABLE_GTK=$(usex gtk ON OFF)
+		-DENABLE_QT=$(usex qt5 ON OFF)
+		-DENABLE_MAC=OFF
+		-DREBUILD_WEB=OFF
+		-DENABLE_CLI=$(usex cli ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_NLS=$(usex nls ON OFF)
+
+		-DRUN_CLANG_TIDY=OFF
+
+		-DUSE_GTK_VERSION=3
+		-DUSE_SYSTEM_EVENT2=ON
+		-DUSE_SYSTEM_DEFLATE=OFF
+		-DUSE_SYSTEM_DHT=OFF
+		-DUSE_SYSTEM_MINIUPNPC=ON
+		-DUSE_SYSTEM_NATPMP=ON
+		-DUSE_SYSTEM_UTP=OFF
+		-DUSE_SYSTEM_B64=OFF
+		-DUSE_SYSTEM_PSL=ON
+		-DUSE_QT_VERSION=5
+
+		-DWITH_CRYPTO=$(usex mbedtls mbedtls openssl)
+		-DWITH_INOTIFY=ON
+		-DWITH_APPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+	)
+
+	# Disable assertions by default, bug 893870.
+	use debug || append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
+	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
+
+	if use systemd; then
+		# Service sets Type=notify
+		systemd_dounit daemon/transmission-daemon.service
+		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
+	fi
+
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
+
+	newtmpfiles "${FILESDIR}"/transmission-daemon.tmpfiles transmission-daemon.conf
+}
+
+pkg_postrm() {
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+	tmpfiles_process transmission-daemon.conf
+}
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 594e5b952031..83fe7816fdd1 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -55,10 +55,11 @@ COMMON_DEPEND="
 	)
 	qt5? (
 		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
 		dev-qt/qtnetwork:5
-		dev-qt/qtdbus:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
 	)
 	systemd? ( >=sys-apps/systemd-209:= )
 "
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index e60205b0d7ca..62bdc482b1d0 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild
new file mode 100644
index 000000000000..2e2bbd3cef13
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.28.17-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+inherit perl-module systemd flag-o-matic
+
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+SRC_URI="
+	https://github.com/OpenPrinting/cups-filters/releases/download/${PV}/${P}.tar.xz
+	https://www.openprinting.org/download/${PN}/${P}.tar.xz
+"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	exif? ( media-libs/libexif )
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	ldap? ( net-nds/openldap:= )
+	pdf? ( app-text/mupdf:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( media-fonts/dejavu )
+"
+
+src_configure() {
+	# Bug #898156
+	append-cxxflags -std=c++17
+
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+
+		$(use_enable exif)
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	if use perl; then
+		pushd "${S}"/scripting/perl > /dev/null || die
+		perl-module_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}"/scripting/perl > /dev/null || die
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	# Avoid perl-module_src_test
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null || die
+		perl-module_src_test
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}"/scripting/perl > /dev/null || die
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null || die
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}"/utils/cups-browsed.service
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely"
+		ewarn "necessary. net-print/foomatic-filters as a replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0264fc2c7839..1f8e28d1a8b4 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index ef9b346d873b..1fe4d86c2db8 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,2 +1,3 @@
 DIST i2pd-2.43.0.tar.gz 638031 BLAKE2B 5e954fb62198a229fc8de9ca48655a67e8e9a0eabfa7f31dcaaaf42149239565968f16825eb25b202b6a5754938ce82d28cd2631e085dfa358bcd27ced089bd5 SHA512 7247850cd47cccc540346b4a1becc6dba5f40bcb333cd722e9fc59fd8b0beddee700376829d29add05cea6b84bb34303ed37e01914a1a41cf8cd94fe5c826e4a
 DIST i2pd-2.44.0.tar.gz 648523 BLAKE2B f9b29da82c943d070c09ed3ee78ceb7759c015da8a2da19c24cbf2d9841c7869920cbafd6212ada2e285b8b263d1a719220ba9dabb20807ccb78d2576383d167 SHA512 8760fb8a501ee75ede0ec29d3e9f39efec3bc91490810b39ac4879dbc073239e779e179c0f44bc43ba31fa0b786fd652d8b6feda415731e8fc3f4c0781400e1e
+DIST i2pd-2.46.1.tar.gz 644777 BLAKE2B 4973f595a162adb5d26d5c47f5b290476147e7159c6409648a501377a52823d49581f36d620502beaf741086df9f52d543dd1b173690d2ed24b327c53037ced5 SHA512 31fc39cd506775ed1e16ec0ab7dd21cf2a54575ccf797c3edb34b59733ee5d9eeaa34efd86e088040a7ccdb2e13917630e5a6aa4cbe3906786200b42ce763fa9
diff --git a/net-vpn/i2pd/i2pd-2.46.1.ebuild b/net-vpn/i2pd/i2pd-2.46.1.ebuild
new file mode 100644
index 000000000000..24596def6c50
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.46.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs systemd
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening +upnp"
+
+RDEPEND="
+	acct-user/i2pd
+	acct-group/i2pd
+	dev-libs/boost:=
+	dev-libs/openssl:0=[-bindist(-)]
+	sys-libs/zlib
+	upnp? ( net-libs/miniupnpc:= )"
+DEPEND="${RDEPEND}"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/build"
+
+DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
+
+pkg_pretend() {
+	if use i2p-hardening && ! tc-is-gcc; then
+		die "i2p-hardening requires gcc"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_STATIC=OFF
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins contrib/i2pd.conf
+	doins contrib/tunnels.conf
+
+	# working directory
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+
+	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
+	doenvd "${FILESDIR}/99i2pd"
+
+	# openrc and systemd daemon routines
+	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
+	newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
+}
+
+pkg_postinst() {
+	if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then
+		ewarn
+		ewarn "Configuration of the subscriptions has been moved from"
+		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
+		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 40fcf972ff90..9638204e3e29 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 854be1728113..5071805ae313 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1 +1 @@
-DIST blueberry-1.4.7.tar.gz 1415642 BLAKE2B 59b419d73416105d3d853cc8c5f6cba3f1171f441478ec7f3bdfaaeea22ce07afef3da372a1f993345a7fb38621d0d163ebb4a4d9e8b9e919d71af47e79dfb98 SHA512 2562017da0a102d5fde2905aa4d76cbcd761eeb5e17b137bb6a0bd22d518dfb677bb6ce1e05eb109a1b8ae35588f56f0d42b56f455aaec174155614966551eee
+DIST blueberry-1.4.8.tar.gz 1416910 BLAKE2B ef122021709443fa7a06e6759450ca8b3bc2c21ee930b0bc532454001addb49df1320a177f8b2e217b59e4a931f1634eea642c1d625ba255ecffff573d60cc34 SHA512 32dbc4fa91321eb1401afa4ac4cc42794ef8cac9ed63ad19c3fd34d88e0eb6c7aa51d3aa3a2f8017a9f6135ab16ca154a929ce5ff592f5157bb3f799a9ef8891
diff --git a/net-wireless/blueberry/blueberry-1.4.7.ebuild b/net-wireless/blueberry/blueberry-1.4.7.ebuild
deleted file mode 100644
index 88c8874d7a8e..000000000000
--- a/net-wireless/blueberry/blueberry-1.4.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A Bluetooth configuration tool"
-HOMEPAGE="https://github.com/linuxmint/blueberry"
-SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/python3-xapp[${PYTHON_USEDEP}]
-	')
-	>=net-wireless/gnome-bluetooth-3.14:2[introspection]
-	net-wireless/bluez[obex]
-	net-wireless/bluez-tools
-	|| (
-		>=sys-apps/util-linux-2.31_rc1
-		net-wireless/rfkill
-	)
-	x11-libs/libnotify[introspection]
-	x11-misc/wmctrl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	python_fix_shebang usr/lib
-}
-
-src_install() {
-	doins -r etc
-	exeinto /usr/bin
-	doexe usr/bin/*
-	exeinto /usr/lib/blueberry
-	doexe usr/lib/blueberry/*
-	insinto /usr
-	doins -r usr/share
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/net-wireless/blueberry/blueberry-1.4.8.ebuild b/net-wireless/blueberry/blueberry-1.4.8.ebuild
new file mode 100644
index 000000000000..ed92957c3cf4
--- /dev/null
+++ b/net-wireless/blueberry/blueberry-1.4.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A Bluetooth configuration tool"
+HOMEPAGE="https://github.com/linuxmint/blueberry"
+SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/python3-xapp[${PYTHON_USEDEP}]
+	')
+	>=net-wireless/gnome-bluetooth-3.14:2[introspection]
+	net-wireless/bluez[obex]
+	net-wireless/bluez-tools
+	>=sys-apps/util-linux-2.31_rc1
+	x11-libs/libnotify[introspection]
+	x11-misc/wmctrl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	python_fix_shebang usr/lib
+}
+
+src_install() {
+	doins -r etc
+	exeinto /usr/bin
+	doexe usr/bin/*
+	exeinto /usr/lib/blueberry
+	doexe usr/lib/blueberry/*
+	insinto /usr
+	doins -r usr/share
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7394e7e5f13c..64f0907c94dc 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 073c161ed52c..eae0b1d0df9f 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Hans de Graaff <graaff@gentoo.org> (2023-02-27)
+# Depends on virtual/rust
+dev-lang/ruby jit
+
 # Sam James <sam@gentoo.org> (2022-12-26)
 # Unkeyworded dependencies
 dev-util/diffoscope opendocument pascal pdf R
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 0db01a3af009..721deb5a7efc 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hans de Graaff <graaff@gentoo.org) (2023-02-27)
+# Depends on virtual/rust
+dev-lang/ruby jit
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
 # dev-cpp/glog fails tests, needs checknig
 media-libs/opencv glog contribsfm
@@ -141,6 +145,7 @@ app-office/libreoffice clang
 #
 # - sys-libs/libcxx: will work once https://reviews.llvm.org/D139297 lands
 # - sys-devel/lld: port is still under review
+dev-util/lldb test
 sys-devel/clang-common default-libcxx default-lld
 sys-devel/clang-runtime libcxx
 
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 37ba660a0017..3a525a0bb06b 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -205,3 +205,6 @@ x11-misc/rss-glx quesoglc
 # Joseph Jezak <josejx@gentoo.org> (2010-02-12)
 # Mask unstable pidgin deps until we can mark them stable (farsight2)
 net-im/pidgin gstreamer
+
+# mask custom-cpuopts and cpudetection on ppc64 for mplayer - bug #234629
+media-video/mplayer cpudetection
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index 7de0634ed869..ef203e88e276 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2008-2022 Gentoo Authors
+# Copyright 2008-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ### THIS FILE IS ONLY FOR PACKAGES MASKED ON BOTH 64-BIT AND 32-BIT USERLAND!!!
@@ -33,9 +33,6 @@ battery
 # Unmask the flag for Playstation 3
 -ps3
 
-# mask custom-cpuopts and cpudetection on ppc64 for mplayer - bug #234629
-cpudetection
-
 # Michał Górny <mgorny@gentoo.org> (2013-05-04)
 # Unmask systemd since it is keyworded here.
 -systemd
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ab69dbfae58e..68ff36a90cc8 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -181,3 +181,9 @@ ADA_TARGET="gnat_2021"
 # Default targets for lua{,-single}.eclass
 LUA_SINGLE_TARGET="lua5-1"
 LUA_TARGETS="lua5-1"
+
+# Sam James <sam@gentoo.org> (2023-02-28)
+# Reduce -Wimplicit-function-declaration noise from autoconf. Any compilers
+# we care about should match these anyway. See https://wiki.gentoo.org/wiki/Modern_C_porting.
+ac_cv_c_undeclared_builtin_options="none needed"
+gl_cv_compiler_check_decl_option="-Werror=implicit-function-declaration"
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index fd56c6780391..8861e56847ab 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -91,12 +91,6 @@ dev-libs/glib sysprof
 # bug #769923
 dev-embedded/urjtag ftd2xx
 
-# Sam James <sam@gentoo.org> (2021-01-27)
-# Experimental feature which may not be as secure
-# as on OpenBSD (where proper kernel support exists).
-# bug #726994
-app-admin/doas persist
-
 # Sam James <sam@gentoo.org> (2021-01-09)
 # relapack is experimental, please be careful with use
 # bug #764206
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 2f45df3c93a3..87715b2e6286 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,18 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Conrad Kostecki <conikost@gentoo.org> (2023-03-01)
+# Binary package, which is compiled against glibc
+sys-block/arcconf
+
+# Conrad Kostecki <conikost@gentoo.org> (2023-03-01)
+# Binary package, which is compiled against glibc
+sys-apps/smcipmitool
+
+# Alfredo Tupone <tupone@gentoo.org> (2023-02-27)
+# Uses dev-util/nvidia-cuda-toolkit
+dev-libs/cutlass
+
 # Sam James <sam@gentoo.org> (2023-01-02)
 # Uses error.h, bug #888956
 =sys-libs/liburing-2.3
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index f324085299dd..f47dd6dadc26 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Conrad Kostecki <conikost@gentoo.org> (2023-03-01)
+# sys-block/arcconf is masked on musl
+net-analyzer/nagios-plugin-check_raid aacraid
+
 # Sam James <sam@gentoo.org> (2023-02-17)
 # dev-lisp/sbcl is masked on musl
 sci-mathematics/fricas sbcl
diff --git a/profiles/package.mask b/profiles/package.mask
index 2042993b66fb..f7d2971e3669 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,41 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2023-02-28)
+# Unmaintained.  Last (keep-alive) commit in 2019.  Suffers from bitrot.
+# Removal on 2023-03-30.  Bug #885713.
+net-im/ekg2
+
+# Mike Pagano <mpagano@gentoo.org> (2023-02-27)
+# Mask =www-servers/nginx-unit-1.29.0-r1 for testing
+=www-servers/nginx-unit-1.29.0-r1
+
+# Pacho Ramos <pacho@gentoo.org> (2023-02-27)
+# No longer needed by thermald-2, discontinued by upstream
+# Removal: 2023-03-29.  Bug #898164.
+sys-power/dptfxtract
+
+# Torokhov Sergey <torokhov-s-a@yandex.ru> (2023-02-26)
+# The masked version causes GIMP breaking of Cut/Copy/Paste
+# https://gitlab.gnome.org/GNOME/gimp/-/issues/9175
+=media-libs/babl-0.1.100
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-25)
+# Major update.  Multiple packages are known to be broken.
+# Masked for further testing.
+>=dev-python/cython-3
+
+# Ulrich Müller <ulm@gentoo.org> (2023-02-26)
+# Installs headers, libs, and pkgconfig as "git2-experimental",
+# which breaks reverse dependencies. Bug #897880
+=dev-libs/libgit2-1.6.1
+
+# Matt Turner <mattst88@gentoo.org> (2023-02-25)
+# Packages are unmaintained and archived upstream.
+# Removal on 2023-03-27. Bug #897748
+gnome-extra/seahorse-nautilus
+x11-libs/libcryptui
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-02-25)
 # Fails tests, last upstream commit 2021, does not work with
 # python3.11. No reverse dependencies.
@@ -305,14 +340,6 @@ dev-ruby/ruby_gntp
 # Removal on 2023-02-27.
 app-admin/bastille
 
-# Ionen Wolkens <ionen@gentoo.org> (2023-01-28)
-# Recently broke at runtime, and its relationship with evolving
-# swig+python is likely to keep breaking this further without an
-# active upstream (no activty since 2018) to keep up with changes.
-# Removal: 2023-02-27. Bug #892323
-games-rpg/adonthell
-games-rpg/wastesedge
-
 # Florian Schmaus <flow@gentoo.org> (2023-01-27)
 # Previous dependencies of dev-lang/clojure, now part of the clojure
 # ebuild and no longer needed.
@@ -327,411 +354,6 @@ dev-java/spec-alpha
 # Removal on 2023-02-25.  Bug #806384.
 www-misc/wsmake
 
-# Marek Szuba <marecki@gentoo.org> (2023-01-26)
-# Upstream keeps the module files unversioned so it is only the use of
-# mirroring that has prevented us from seeing regular hash mismatches
-# - and it is not clear for many of the modules whether we are allowed
-# to mirror them or not. A convoluted and fragile process has been
-# required to detect new modules and versions, and the request for a
-# Repology-friendly upstream endpoint appears to have stalled.
-# Please switch to managing SWORD modules on a per-user basis, using
-# tools bundled with app-text/sword (see e.g.
-# https://wiki.crosswire.org/SWORD_Module_Source_Discovery_and_Module_Updating)
-# or appropriate functionality in GUI front-end software.
-# Removal on 2023-02-26. Bug #892069.
-app-dicts/sword-2BabDict
-app-dicts/sword-AB
-app-dicts/sword-Abbott
-app-dicts/sword-AbbottSmith
-app-dicts/sword-AbbottSmithStrongs
-app-dicts/sword-ABP
-app-dicts/sword-ABPGRK
-app-dicts/sword-ABS_Essay_GoodSam_SWB
-app-dicts/sword-ACV
-app-dicts/sword-Afr1953
-app-dicts/sword-AKJV
-app-dicts/sword-Alb
-app-dicts/sword-Aleppo
-app-dicts/sword-alzat
-app-dicts/sword-AmTract
-app-dicts/sword-Anderson
-app-dicts/sword-Antoniades
-app-dicts/sword-AraNAV
-app-dicts/sword-AraSVD
-app-dicts/sword-ArmEastern
-app-dicts/sword-ArmWestern
-app-dicts/sword-ASV
-app-dicts/sword-Azeri
-app-dicts/sword-BaptistConfession1646
-app-dicts/sword-BaptistConfession1689
-app-dicts/sword-Barnes
-app-dicts/sword-BasHautin
-app-dicts/sword-BBE
-app-dicts/sword-BDBGlosses_Strongs
-app-dicts/sword-BeaMRK
-app-dicts/sword-Bela
-app-dicts/sword-br_en
-app-dicts/sword-BretonNT
-app-dicts/sword-BulCarigradNT
-app-dicts/sword-BulVeren
-app-dicts/sword-BurCBCM
-app-dicts/sword-BurJudson
-app-dicts/sword-Burkitt
-app-dicts/sword-BWE
-app-dicts/sword-Byz
-app-dicts/sword-Calo
-app-dicts/sword-Catena
-app-dicts/sword-Cawdrey
-app-dicts/sword-CBC
-app-dicts/sword-CebPinadayag
-app-dicts/sword-Chamorro
-app-dicts/sword-Che1860
-app-dicts/sword-ChiNCVs
-app-dicts/sword-ChiNCVt
-app-dicts/sword-ChiSB
-app-dicts/sword-ChiUn
-app-dicts/sword-ChiUnL
-app-dicts/sword-ChiUns
-app-dicts/sword-Clarke
-app-dicts/sword-Common
-app-dicts/sword-Concord
-app-dicts/sword-CopNT
-app-dicts/sword-CopSahBible2
-app-dicts/sword-CopSahHorner
-app-dicts/sword-CopSahidica
-app-dicts/sword-CopSahidicMSS
-app-dicts/sword-CPDV
-app-dicts/sword-CroSaric
-app-dicts/sword-CSlElizabeth
-app-dicts/sword-CzeB21
-app-dicts/sword-CzeBKR
-app-dicts/sword-CzeCEP
-app-dicts/sword-CzeCSP
-app-dicts/sword-Daily
-app-dicts/sword-DaNT1819
-app-dicts/sword-DaOT1871NT1907
-app-dicts/sword-DaOT1931NT1907
-app-dicts/sword-Darby
-app-dicts/sword-Dari
-app-dicts/sword-DarkNightOfTheSoul
-app-dicts/sword-DBD
-app-dicts/sword-Diaglott
-app-dicts/sword-Dodson
-app-dicts/sword-DRC
-app-dicts/sword-DTN
-app-dicts/sword-DutKant
-app-dicts/sword-DutKingComm
-app-dicts/sword-DutSVV
-app-dicts/sword-DutSVVA
-app-dicts/sword-Easton
-app-dicts/sword-Elzevir
-app-dicts/sword-EMBReality
-app-dicts/sword-EMTV
-app-dicts/sword-en_eu
-app-dicts/sword-Esperanto
-app-dicts/sword-Est
-app-dicts/sword-Etheridge
-app-dicts/sword-Eusebian_num
-app-dicts/sword-Eusebian_vs
-app-dicts/sword-f35
-app-dicts/sword-Family
-app-dicts/sword-FarHezareNoh
-app-dicts/sword-FarOPV
-app-dicts/sword-FarTPV
-app-dicts/sword-FinBiblia
-app-dicts/sword-Finney
-app-dicts/sword-FinPR
-app-dicts/sword-FinPR92
-app-dicts/sword-FinRK
-app-dicts/sword-FinSTLK2017
-app-dicts/sword-FreAug
-app-dicts/sword-FreBailly
-app-dicts/sword-FreBBB
-app-dicts/sword-FreBDM1707
-app-dicts/sword-FreBDM1744
-app-dicts/sword-FreChry
-app-dicts/sword-FreCJE
-app-dicts/sword-FreCrampon
-app-dicts/sword-FreDAW
-app-dicts/sword-FreGBM
-app-dicts/sword-FreGeneve1669
-app-dicts/sword-FreJND
-app-dicts/sword-FreKhan
-app-dicts/sword-FreLSN1872
-app-dicts/sword-FreLXX
-app-dicts/sword-FreOltramare1874
-app-dicts/sword-FrePGR
-app-dicts/sword-FrePilgrim
-app-dicts/sword-FreSegond1910
-app-dicts/sword-FreStapfer1889
-app-dicts/sword-FreSynodale1921
-app-dicts/sword-FVDPVietAnh
-app-dicts/sword-Geez
-app-dicts/sword-Geneva
-app-dicts/sword-Geneva1599
-app-dicts/sword-GerAlbrecht
-app-dicts/sword-GerAugustinus
-app-dicts/sword-GerBoLut
-app-dicts/sword-GerElb1871
-app-dicts/sword-GerElb1905
-app-dicts/sword-GerGruenewald
-app-dicts/sword-GerHfa2002
-app-dicts/sword-GerHfaLex2002
-app-dicts/sword-GerKingComm
-app-dicts/sword-GerLeoNA28
-app-dicts/sword-GerLeoRP18
-app-dicts/sword-GerLutherpredigten
-app-dicts/sword-GerMenge
-app-dicts/sword-GerNeUe
-app-dicts/sword-GerOffBiSt
-app-dicts/sword-GerReinhardt
-app-dicts/sword-GerSch
-app-dicts/sword-GerTafel
-app-dicts/sword-GerTextbibel
-app-dicts/sword-GerZurcher
-app-dicts/sword-Godbey
-app-dicts/sword-GodsWord
-app-dicts/sword-GreekHebrew
-app-dicts/sword-GreVamvas
-app-dicts/sword-Haitian
-app-dicts/sword-HebDelitzsch
-app-dicts/sword-HebModern
-app-dicts/sword-HebrewGreek
-app-dicts/sword-Heretics
-app-dicts/sword-HinERV
-app-dicts/sword-Hitchcock
-app-dicts/sword-HunIMIT
-app-dicts/sword-HunKar
-app-dicts/sword-HunKNB
-app-dicts/sword-HunRUF
-app-dicts/sword-HunUj
-app-dicts/sword-Imitation
-app-dicts/sword-Institutes
-app-dicts/sword-IriODomhnuill
-app-dicts/sword-ISBE
-app-dicts/sword-ISV
-app-dicts/sword-ItaDio
-app-dicts/sword-ItaRive
-app-dicts/sword-ItDizGreco
-app-dicts/sword-ItNomiBibbia
-app-dicts/sword-JapBungo
-app-dicts/sword-JapDenmo
-app-dicts/sword-JapKougo
-app-dicts/sword-JapMeiji
-app-dicts/sword-JapRaguet
-app-dicts/sword-JCRHoliness
-app-dicts/sword-JEAffections
-app-dicts/sword-JESermons
-app-dicts/sword-JFB
-app-dicts/sword-JOChrist
-app-dicts/sword-JOCommGod
-app-dicts/sword-JOGlory
-app-dicts/sword-JOMortSin
-app-dicts/sword-Josephus
-app-dicts/sword-JPS
-app-dicts/sword-JST
-app-dicts/sword-Jubilee2000
-app-dicts/sword-Kapingamarangi
-app-dicts/sword-Kaz
-app-dicts/sword-KD
-app-dicts/sword-Kekchi
-app-dicts/sword-KhmerNT
-app-dicts/sword-KingComm
-app-dicts/sword-KJV
-app-dicts/sword-KJVA
-app-dicts/sword-KJVPCE
-app-dicts/sword-KLV
-app-dicts/sword-KLVen_iklingon
-app-dicts/sword-KLViklingon_en
-app-dicts/sword-KorHKJV
-app-dicts/sword-KorRV
-app-dicts/sword-KtuVB
-app-dicts/sword-la_en
-app-dicts/sword-Latvian
-app-dicts/sword-LawGospel
-app-dicts/sword-LEB
-app-dicts/sword-Leeser
-app-dicts/sword-Lightfoot
-app-dicts/sword-LinVB
-app-dicts/sword-LITV
-app-dicts/sword-LO
-app-dicts/sword-LtKBB
-app-dicts/sword-Luther
-app-dicts/sword-LvGluck8
-app-dicts/sword-LXX
-app-dicts/sword-MAK
-app-dicts/sword-Mal1910
-app-dicts/sword-ManxGaelic
-app-dicts/sword-Maori
-app-dicts/sword-MapM
-app-dicts/sword-Mg1865
-app-dicts/sword-MHC
-app-dicts/sword-MHCC
-app-dicts/sword-MKJV
-app-dicts/sword-MLStrong
-app-dicts/sword-MollColossians
-app-dicts/sword-MonKJV
-app-dicts/sword-Montgomery
-app-dicts/sword-MorphGNT
-app-dicts/sword-Murdock
-app-dicts/sword-Nave
-app-dicts/sword-Ndebele
-app-dicts/sword-Nestle1904
-app-dicts/sword-NETfree
-app-dicts/sword-NETnotesfree
-app-dicts/sword-NETtext
-app-dicts/sword-NHEB
-app-dicts/sword-NHEBJE
-app-dicts/sword-NHEBME
-app-dicts/sword-NlCanisius1939
-app-dicts/sword-NorBroed
-app-dicts/sword-Norsk
-app-dicts/sword-NorSMB
-app-dicts/sword-NorthernAzeri
-app-dicts/sword-Noyes
-app-dicts/sword-OEB
-app-dicts/sword-OEBcth
-app-dicts/sword-OrthJBC
-app-dicts/sword-Orthodoxy
-app-dicts/sword-OSHB
-app-dicts/sword-OSHM
-app-dicts/sword-OxfordTR
-app-dicts/sword-Packard
-app-dicts/sword-Passion
-app-dicts/sword-Personal
-app-dicts/sword-Peshitta
-app-dicts/sword-Phaistos
-app-dicts/sword-Pilgrim
-app-dicts/sword-PNT
-app-dicts/sword-PohnOld
-app-dicts/sword-Pohnpeian
-app-dicts/sword-PolGdanska
-app-dicts/sword-PolUGdanska
-app-dicts/sword-PorAlmeida1911
-app-dicts/sword-PorAR
-app-dicts/sword-PorBLivre
-app-dicts/sword-PorBLivreTR
-app-dicts/sword-PorCap
-app-dicts/sword-PorIBP
-app-dicts/sword-PotLykins
-app-dicts/sword-Practice
-app-dicts/sword-QuotingPassages
-app-dicts/sword-RecVer
-app-dicts/sword-Rieger
-app-dicts/sword-RKJNT
-app-dicts/sword-RNKJV
-app-dicts/sword-Robinson
-app-dicts/sword-RomCor
-app-dicts/sword-Rotherham
-app-dicts/sword-RusCARS
-app-dicts/sword-RusCARSA
-app-dicts/sword-RusCARSADICT
-app-dicts/sword-RusCARSDict
-app-dicts/sword-RusCARST
-app-dicts/sword-RusCARSTDICT
-app-dicts/sword-RusMakarij
-app-dicts/sword-RusSynodal
-app-dicts/sword-RusSynodalLIO
-app-dicts/sword-RusVZh
-app-dicts/sword-RWebster
-app-dicts/sword-RWP
-app-dicts/sword-SahidicBible
-app-dicts/sword-SAOA
-app-dicts/sword-SBLGNT
-app-dicts/sword-SBLGNTApp
-app-dicts/sword-Scofield
-app-dicts/sword-ScotsGaelic
-app-dicts/sword-Sentiment
-app-dicts/sword-Shona
-app-dicts/sword-SloKJV
-app-dicts/sword-SloOjacano
-app-dicts/sword-SloStritar
-app-dicts/sword-SME
-app-dicts/sword-Smith
-app-dicts/sword-sml_BL_2008
-app-dicts/sword-SomKQA
-app-dicts/sword-Sorani
-app-dicts/sword-SP
-app-dicts/sword-SpaPlatense
-app-dicts/sword-SpaRV
-app-dicts/sword-SpaRV1865
-app-dicts/sword-SpaRV1909
-app-dicts/sword-SpaRVG
-app-dicts/sword-SpaTDP
-app-dicts/sword-SpaVNT
-app-dicts/sword-SPDSS
-app-dicts/sword-SPE
-app-dicts/sword-SPMT
-app-dicts/sword-Spurious
-app-dicts/sword-SPVar
-app-dicts/sword-SrKDEkavski
-app-dicts/sword-SrKDIjekav
-app-dicts/sword-StrongsGreek
-app-dicts/sword-StrongsHebrew
-app-dicts/sword-Swahili
-app-dicts/sword-Swe1917
-app-dicts/sword-Swe1917Of
-app-dicts/sword-SweFolk1998
-app-dicts/sword-SweKarlXII
-app-dicts/sword-SweKarlXII1873
-app-dicts/sword-Tagalog
-app-dicts/sword-TagAngBiblia
-app-dicts/sword-Tausug
-app-dicts/sword-TCR
-app-dicts/sword-TDavid
-app-dicts/sword-TFG
-app-dicts/sword-ThaiKJV
-app-dicts/sword-Tisch
-app-dicts/sword-TNT
-app-dicts/sword-Torrey
-app-dicts/sword-TR
-app-dicts/sword-TSK
-app-dicts/sword-TurHADI
-app-dicts/sword-TurNTB
-app-dicts/sword-Twenty
-app-dicts/sword-Tyndale
-app-dicts/sword-UKJV
-app-dicts/sword-Ukrainian
-app-dicts/sword-UkrKulish
-app-dicts/sword-Uma
-app-dicts/sword-UrduGeo
-app-dicts/sword-UrduGeoDeva
-app-dicts/sword-UrduGeoRoman
-app-dicts/sword-UyCyr
-app-dicts/sword-VarApp
-app-dicts/sword-VieRobinson
-app-dicts/sword-VieStrongsGreek
-app-dicts/sword-Viet
-app-dicts/sword-VietLCCMN
-app-dicts/sword-VietLCCMNCT
-app-dicts/sword-VietNVB
-app-dicts/sword-vlsJoNT
-app-dicts/sword-Vulgate
-app-dicts/sword-Vulgate_HebPs
-app-dicts/sword-VulgClementine
-app-dicts/sword-VulgConte
-app-dicts/sword-VulgGlossa
-app-dicts/sword-VulgHetzenauer
-app-dicts/sword-VulgSistine
-app-dicts/sword-Webster
-app-dicts/sword-Webster1806
-app-dicts/sword-Webster1913
-app-dicts/sword-WelBeiblNet
-app-dicts/sword-Wesley
-app-dicts/sword-Westminster
-app-dicts/sword-Westminster21
-app-dicts/sword-Weymouth
-app-dicts/sword-WHNU
-app-dicts/sword-WLC
-app-dicts/sword-Worsley
-app-dicts/sword-Wulfila
-app-dicts/sword-Wycliffe
-app-dicts/sword-YLT
-app-dicts/sword-ZhEnglish
-app-dicts/sword-ZhHanzi
-app-dicts/sword-ZhPinyin
-app-text/sword-modules
-
 # Michał Górny <mgorny@gentoo.org> (2023-01-25)
 # Unmaintained.  Multiple build failure bugs reported.  This version
 # predates 2008.
@@ -844,11 +466,6 @@ net-p2p/vuze-coreplugins
 # This version currently is not compatible with kernel build (yet)
 ~dev-util/bindgen-0.63.0
 
-# Sam James <sam@gentoo.org> (2022-12-09)
-# Breaks compilation of reverse dependencies with broken pkgconfig (pc) file
-# bug #885075, https://github.com/libarchive/libarchive/issues/1766
-=app-arch/libarchive-3.6.2
-
 # Stephan Hartmann <sultan@gentoo.org> (2023-01-15)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 84cf206e8f2d..6695784f4b7c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1202,7 +1202,6 @@ app-text/stardict:wordnet - Enable wordnet plugin to find similar English words
 app-text/stardict:xdxfparse - Enable plugin to parse dictionaries in xdxf (XML Dictionary eXchange Format)
 app-text/stardict:youdaodict - Enable youdao.com network plugin (for Chinese language)
 app-text/sword:clucene - Use dev-cpp/clucene for lucene search support
-app-text/sword-modules:esoteric - Install modules with no linguistic content, in unknown languages etc.
 app-text/tessdata_best:osd - Enable support orientation and script detection.
 app-text/tessdata_fast:osd - Enable support orientation and script detection.
 app-text/tessdata_legacy:math - Enable support for recognition of equations.
@@ -1750,7 +1749,7 @@ dev-lang/php:cli - Enable CLI SAPI
 dev-lang/php:coverage - Include gcov symbols for test coverage and lcov reports. Only useful for extension developers, and requires GCC.
 dev-lang/php:ctype - Enable ctype functions
 dev-lang/php:embed - Enable embed SAPI
-dev-lang/php:enchant - Add supports Enchant spelling library.
+dev-lang/php:enchant - Add supports Enchant spelling library
 dev-lang/php:ffi - Add foreign function interface (ffi extension) support
 dev-lang/php:fileinfo - Add fileinfo extension support
 dev-lang/php:filter - Add filter extension support
@@ -4541,7 +4540,6 @@ media-sound/deadbeef:shellexec - Define custom shell commands that can be called
 media-sound/deadbeef:supereq - Enable equalizer
 media-sound/denemo:alsa - Enable alsa support through media-libs/alsa-lib
 media-sound/denemo:aubio - Enable media-libs/aubio support
-media-sound/denemo:fluidsynth - Enable Fluidsynth MIDI software synthesis using media-sound/fluidsynth
 media-sound/denemo:jack - Enable jack support through virtual/jack
 media-sound/denemo:portaudio - Enable support for media-libs/portaudio
 media-sound/denemo:portmidi - Enable support for the media-libs/portmidi backend
@@ -5433,7 +5431,6 @@ net-analyzer/zabbix:mbedtls - Use net-libs/mbedtls as TLS backend
 net-analyzer/zabbix:odbc - Enable Database Monitor and use UnixODBC Library by default
 net-analyzer/zabbix:openipmi - Enable openipmi things
 net-analyzer/zabbix:openssl - Use dev-libs/openssl as TLS backend
-net-analyzer/zabbix:pcre2 - Use dev-libs/libpcre2 instead of dev-libs/libpcre
 net-analyzer/zabbix:proxy - Enable proxy support
 net-analyzer/zabbix:server - Enable zabbix server
 net-analyzer/zabbix:ssh - SSH v2 based checks
@@ -7184,6 +7181,7 @@ sci-libs/blis:openmp - Use openmp threadding model
 sci-libs/blis:pthread - Use pthread threadding model
 sci-libs/blis:serial - Use no threadding model
 sci-libs/caffe2:cuda - Add support for CUDA processing
+sci-libs/caffe2:distributed - Support distributed applications
 sci-libs/caffe2:ffmpeg - Add support for video processing operators
 sci-libs/caffe2:nnpack - Use NNPACK
 sci-libs/caffe2:numpy - Add support for math operations through numpy
@@ -7191,6 +7189,7 @@ sci-libs/caffe2:opencl - Use OpenCL
 sci-libs/caffe2:opencv - Add support for image processing operators
 sci-libs/caffe2:openmp - Use OpenMP for parallel code
 sci-libs/caffe2:qnnpack - Use QNNPACK
+sci-libs/caffe2:tensorpipe - Use tensorpipe
 sci-libs/caffe2:xnnpack - Use XNNPACK
 sci-libs/cantera:cti - Install CTI tools (ck2cti, ck2yaml, ctml_writer) for conversion of Chemkin files to Cantera format
 sci-libs/cddlib:tools - Add a few executables and tests for cddlib
@@ -7973,6 +7972,7 @@ sys-block/nbdkit:libssh - Enable the SSH plugin via net-libs/libssh.
 sys-block/nbdkit:libvirt - Enable the app-emulation/libvirt plugin.
 sys-block/nbdkit:nbd - Enable the nbd plugin via sys-libs/libnbd.
 sys-block/nbdkit:torrent - Enable the torrent plugin via net-libs/libtorrent-rasterbar.
+sys-block/ndctl:libtracefs - Use dev-libs/libtracefs to build cxl-monitor binary
 sys-block/open-iscsi:rdma - Support iSCSI over RDMA
 sys-block/open-iscsi:tcp - Support iSCSI over TCP
 sys-block/parted:debug - Enable debugging as encouraged by upstream: [The default configuration] includes --enable-debug (by default), which contains many assertions. Obviously, these "waste" space, but in the past, they have caught potentially dangerous bugs before they would have done damage, so we think it's worth it. Also, it means we get more bug reports ;)
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 073409241674..6b703b227b1f 100644
Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 497296b4c644..1c6e8b1aacce 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,2 +1 @@
-DIST kstars-3.6.1.tar.xz 110215912 BLAKE2B 8bb0e4a966124adfe0a6fbda36879ab6d1331c8ab21ad9666e863c6b97acb4ae821a156a6433db8bc40ecec95d1ad4e5b1e6a2c615079268371ed006aae291b1 SHA512 6b5cdba4363d87ba462d2d98b101cae41dc1ae35861aec61ebb8d335b0186fff9625b566dc816bd792ae7746b711a044d5173a8f63063448ff5f55ddfcdb0b75
 DIST kstars-3.6.2.tar.xz 111110944 BLAKE2B 8a2c5821b982ee62167e2ba28d70d3931d9643d7c9410097169f87556ec4b2ea137e6595089960c63c6063f69c1415968664b8dd1e05a8f8a619b37d2539c26e SHA512 8519aaab748afe948af332cf3b54a031aa65ac0d36f4dc3b5da7de9bffd9eab402221a11378ebe4d97cf4d4b0754b1a7c644f8222c93e0fca089f26545f10283
diff --git a/sci-astronomy/kstars/kstars-3.6.1.ebuild b/sci-astronomy/kstars/kstars-3.6.1.ebuild
deleted file mode 100644
index ab00714ee37c..000000000000
--- a/sci-astronomy/kstars/kstars-3.6.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="5"
-IUSE="fits indi +password raw wcs"
-
-REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdatavis3d-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebsockets-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio:= )
-	indi? (
-		sci-libs/gsl:=
-		>=sci-libs/indilib-1.9.1
-		sci-libs/libnova:=
-		>=sci-libs/stellarsolver-2.2
-	)
-	password? ( dev-libs/qtkeychain:= )
-	raw? ( media-libs/libraw:= )
-	wcs? ( sci-astronomy/wcslib:= )
-"
-# TODO: Add back when re-enabled by upstream
-# 	opengl? (
-# 		>=dev-qt/qtopengl-${QTMIN}:5
-# 		virtual/opengl
-# 	)
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpositioning-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFETCH_TRANSLATIONS=OFF
-		-DBUILD_PYKSTARS=OFF
-		-DBUILD_DOC=$(usex handbook)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package indi INDI)
-		$(cmake_use_find_package indi Nova)
-		$(cmake_use_find_package password Qt5Keychain)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package wcs WCSLIB)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 842768, test declared unstable by upstream
-	local myctestargs=(
-		-E "(TestKSPaths)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
-	fi
-	ecm_pkg_postinst
-}
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index f1434074a9a6..34875e4f1ecc 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 77f7e0f9d946..d05a497499b0 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,2 +1,3 @@
 DIST bc-6.1.1.tar.xz 455456 BLAKE2B 7945ac623740abd9cbd894c20b8a03006caf64d2ce9770ade930d912c52b4e29b107b524d4a95ebea99e31921b7940e39e1afdeec837b4a03d3ed4e11b9f517b SHA512 0e7fb4d4223ace8ba5c1961cc0d7eba475174f92b75529fde64446b5d80db5729f848fd95507570711d2b8928996c87e837e926d31028f32e3f97cad47567d39
 DIST bc-6.2.6.tar.xz 457640 BLAKE2B ab134928292d73ebd41921d8931420b037837f82fe8338a7b5f84137bd05d8d6db1cfce19b506dc2b470a44aa277b73202b599866343d6978c219d65c9f27bf6 SHA512 f3631ff2378e93f9758a133400749973681f142f3eeaf1ae8ffc60f1a31b9ca9a9bcdf14435b72fea8b8ea486d0fb6b53954a511c5db62d834bf6cf270d7e4a5
+DIST bc-6.3.1.tar.xz 457868 BLAKE2B 1bb4e2b3e776e6d30194805b7b695d704a749d227a6228cb1835777bfd0b4d48f09ed65f15f6208674007e9f629e0593e700235d3420626a016569824a90a56d SHA512 a2904fa120b3a891fbb0cf5052596fb9b727143882dc838fa49978a7d05c709ba1ae4d9a976a353b6311cd0d8483b208aa4967d0fd553a3079b80f7ccb879582
diff --git a/sci-calculators/bc-gh/bc-gh-6.3.1.ebuild b/sci-calculators/bc-gh/bc-gh-6.3.1.ebuild
new file mode 100644
index 000000000000..7b4e6bc4cbf5
--- /dev/null
+++ b/sci-calculators/bc-gh/bc-gh-6.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="bc-${PV}"
+DESCRIPTION="Implementation of POSIX bc with GNU extensions"
+HOMEPAGE="
+	https://git.gavinhoward.com/gavin/bc/
+	https://github.com/gavinhoward/bc/
+"
+SRC_URI="
+	https://github.com/gavinhoward/bc/releases/download/${PV}/${MY_P}.tar.xz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="libedit readline"
+
+DEPEND="
+	!readline? (
+		libedit? ( dev-libs/libedit:= )
+	)
+	readline? (
+		sys-libs/readline:=
+		sys-libs/ncurses:=
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	local myconf=(
+		# GNU and BSD bc's have slightly different behavior. This bc can act
+		# like both, changing at runtime with environment variables, but it
+		# needs defaults, which can be set at compile time. This option sets all
+		# of the defaults to match the GNU bc/dc since it's common on Linux.
+		-pGNU
+		# A lot of test results are generated first by a bc compatible with the
+		# GNU bc. If there is no GNU bc installed, then those tests should be
+		# skipped. That's what this option does. Without it, we would have a
+		# dependency cycle. Those tests are super long, anyway.
+		-G
+		# Disables the automatic stripping of binaries.
+		-T
+		# Enables installing all locales, which is important for packages.
+		-l
+		# Disables some "problematic" tests that need specific options on Linux
+		# to not trigger the OOM killer because malloc() lies.
+		-P
+	)
+	if use readline ; then
+		myconf+=( -r )
+	elif use libedit ; then
+		myconf+=( -e )
+	fi
+
+	local -x EXECSUFFIX="-gh"
+	local -x PREFIX="${EPREFIX}/usr"
+	./configure.sh "${myconf[@]}" || die
+}
+
+src_test() {
+	# This is to fix a bug encountered on Arch. It is to ensure we don't get
+	# segfaults on `make check` when the error messages change because the error
+	# messages are passed to printf(); they have format specifiers. With these
+	# env vars, the internal error messages are used, instead of the installed
+	# locales, which might be different since the new locale files are not
+	# installed yet. (It is impossible to use uninstalled locales because of the
+	# poor design of POSIX locales.)
+	env LANG=C LC_ALL=C emake check
+}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 0169a490405a..7aeb02e93faf 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index 870c91e9b3c6..cce7ddf724f5 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,3 +1,2 @@
-DIST chemex-2022.0.1.tar.gz 2840066 BLAKE2B 05e3cd048a996b85e9a88297180bdd6e0b972619f5ac734d10a5744e7ab28fa2080bf6d6b53b69d04192ca420a24014f7eded0668ec716218ca4cc4877875ec9 SHA512 c2b49d83d618e69e43737b9d8b6a16de4fc46b481b2c65aaa4110bf425cd71bd5347240e7336855ec294ea126dd036262535645fca93ae352616f1a71b11e698
-DIST chemex-2022.1.0.tar.gz 2836330 BLAKE2B 69c0e23a5195fca210e2c7c8c2f31196e23e416a8be47856589491586ae7de05ccd10982ec3d752015fc8a571dd6f0e63f52715452fc9388b38999532a5fdf12 SHA512 00d7f07b0c6d301d88ff2a1bebeb82fe9dc51c7deddf3db371f73b62d1156c5d369ffedb474bead618abde8334fab9e6e9ceb481f6b4bdac5eceeb7bee899b2a
 DIST chemex-2022.2.0.tar.gz 2837302 BLAKE2B 611e51a3a29dd479119dd0b2fa7aa0eae08aa59806cc26f61feda7aca7b2a94b6cc75458ec753f989ee1076b3fa49998d7fed26de1a1408432fd416d364a8f8a SHA512 52d3d8e4edd148c0e93a8c4ba4a0a487df76e332155994dc347af5e65e3baebbc39617a653853c6f5787e571c0dda756dfdec35446bc00fe9965ae1c2e8192f0
+DIST chemex-2022.3.0.tar.gz 2842921 BLAKE2B d0fe809ed64ee86ef319bd76c33dea1e75de13fc7cdf7e77d8cb74e4c76b66edd6e3c535df405a66bfc228780f34ee18a56639241ae8c234ac4128ed4ba806f3 SHA512 93a8e362ec024a3d49e2792e485b3a7808944fb02c41dae0d0b2af14ccb00b95d9edddc47eef0f08d1040b08cf6078be74b45185be84b495ead96c951ee52515
diff --git a/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild b/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild
deleted file mode 100644
index 9abd2a6493fb..000000000000
--- a/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL="yes"
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
-HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="test"
-
-#RESTRICT="!test? ( test )"
-# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
-		>=dev-python/cachetools-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.5.3[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.3[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}]
-		>=dev-python/rapidfuzz-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/rich-12.5.1[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.9.1[${PYTHON_USEDEP}]
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/sci-chemistry/chemex/chemex-2022.1.0.ebuild b/sci-chemistry/chemex/chemex-2022.1.0.ebuild
deleted file mode 100644
index a67b5eb6bbe8..000000000000
--- a/sci-chemistry/chemex/chemex-2022.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL="yes"
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
-HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="test"
-
-#RESTRICT="!test? ( test )"
-# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
-		>=dev-python/cachetools-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.4[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}]
-		>=dev-python/rapidfuzz-2.11.0[${PYTHON_USEDEP}]
-		>=dev-python/rich-12.6.0[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.9.3[${PYTHON_USEDEP}]
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/sci-chemistry/chemex/chemex-2022.3.0.ebuild b/sci-chemistry/chemex/chemex-2022.3.0.ebuild
new file mode 100644
index 000000000000..172721dca8e1
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2022.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL="yes"
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
+		>=dev-python/cachetools-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.6.2[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.24.1[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
+		>=dev-python/rapidfuzz-2.13.7[${PYTHON_USEDEP}]
+		>=dev-python/rich-13.0.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/sci-chemistry/dssp/Manifest b/sci-chemistry/dssp/Manifest
index adb164c9b6da..8f5d275bf005 100644
--- a/sci-chemistry/dssp/Manifest
+++ b/sci-chemistry/dssp/Manifest
@@ -1,4 +1,4 @@
 DIST dssp-2.2.1.tgz 47141 BLAKE2B 34d8b2db8797a8c23763766c0214337f03584c4be52c1bc820a0df0db6a5f78ac0229aafdd47a60b8fd6f4832abf0399663c53f9e898c75f08ecbe22b141c8da SHA512 4a273714d6b3230daea166caa7f4117d5ccb225bea0cf1bc2eb61539b6cc8e227d0ba19047d61f0ad0d1d6bc2efdec9c193bd44341e15ef0950acb4a22498811
 DIST dssp-3.0.11.tar.gz 168085 BLAKE2B e1c42fd22cfb2287f10b5deae48b56a4583d4a67737a3485dcbd160d1597a15c2d5105c3794c875d8001abede1c014efb4f7f5b7c250f867bdf9ed95a0860217 SHA512 a0cfe44e517ff1f909ef2928b62ae2c639c6bddfd8a0fb538883f647fd2771e00da68e0fd2521aa02ba3c6d1b0c9b784b7fe142392af3a3abf6ea89f1546bd9d
-DIST dssp-4.0.4.tar.gz 122183 BLAKE2B b12702c482ad58f09d96e9c85759ebe9455961978277e25d1ee554d07a643b342acf2dbcd3c18d539f058b970c24888a43827b6bac47899ca61bf96dd0c2723b SHA512 e0646bb20f10617174b0970c549fd44990750f46f7a550e4c3bc89487a8d3b7a175d53b2abb0684f9d96203a23d64ae67c6c10688fd4f5f59ff19995f9149ef8
 DIST dssp-4.2.0.tar.gz 157104 BLAKE2B 4caffb5f7cfe2a130e3ac6c5efa41689bbbb8ee054333cd4320cf77ac36dccaa128fe816ca57b6bd287271924122de4252076628098db415c854df6f09c17ac2 SHA512 b86c736ea9fdf62be923f8a69bae56f7298cd01e6623c1f3eee6951e20483d24438b1318924e980b6a98b19c77cb84d4ba66260a575b63e7c536ecba0478c4a5
+DIST dssp-4.2.2.1.tar.gz 144413 BLAKE2B 97c587bc0b4ef3d212ae81d568f817aab54f1dd2a77d170746e9b0d3f1bd63873d21fb0a7fc38c0300fc091f21241820d5d009d42a9e3e33dcc608c046185d9f SHA512 6daa41aea766940bf40afaee068daef341a7f79cae79d967b8da00e7002bdb602deaed40e452a5f0cea9aa2041a5c8678dfcae2e0f595cc5a0856392162dcdff
diff --git a/sci-chemistry/dssp/dssp-4.0.4.ebuild b/sci-chemistry/dssp/dssp-4.0.4.ebuild
deleted file mode 100644
index 756e23958f93..000000000000
--- a/sci-chemistry/dssp/dssp-4.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="The protein secondary structure standard"
-HOMEPAGE="https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/PDB-REDO/dssp"
-
-SRC_URI="https://github.com/PDB-REDO/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/boost:=[zlib]
-	>=sci-libs/libcifpp-2.0.0
-"
-DEPEND=""
-RDEPEND="${BDEPEND}"
-
-pkg_postinst() {
-	if has_version "<=sci-chemistry/gromacs-2022"; then
-		ewarn "DSSP > 3.0.x is not compatible with gmx do_dssp:"
-		ewarn "https://gitlab.com/gromacs/gromacs/-/issues/4129"
-		ewarn
-		ewarn "Feel free to mask newer versions if needed."
-	fi
-}
diff --git a/sci-chemistry/dssp/dssp-4.2.2.1.ebuild b/sci-chemistry/dssp/dssp-4.2.2.1.ebuild
new file mode 100644
index 000000000000..32167a786c22
--- /dev/null
+++ b/sci-chemistry/dssp/dssp-4.2.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="The protein secondary structure standard"
+HOMEPAGE="https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/PDB-REDO/dssp"
+SRC_URI="https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-libs/boost:=[zlib]
+	>=dev-libs/libmcfp-1.2.2
+	>=sci-libs/libcifpp-5.0.8
+"
+DEPEND=""
+RDEPEND="${BDEPEND}"
+
+pkg_postinst() {
+	if has_version "<=sci-chemistry/gromacs-2022"; then
+		ewarn "DSSP > 3.0.x is not compatible with gmx do_dssp:"
+		ewarn "https://gitlab.com/gromacs/gromacs/-/issues/4129"
+		ewarn
+		ewarn "Feel free to mask newer versions if needed."
+	fi
+}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 30c46576017a..67d90219a410 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
index 8e5713ee00e8..6d68a3f229f6 100644
--- a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit cmake xdg-utils
 
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index 08b7cf0d812d..5def86e1cebb 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit cmake xdg-utils
 
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
index 730463965c90..148370c0f790 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit xdg-utils
 
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
index 730463965c90..148370c0f790 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit xdg-utils
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ac0c3d8dc96d..3228bb72ddc5 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
deleted file mode 100644
index 352a593d3559..000000000000
--- a/sci-libs/caffe2/caffe2-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake flag-o-matic
-
-MYPN=pytorch
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="A deep learning framework"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ffmpeg? ( opencv )
-" # ?? ( cuda rocm )
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-cpp/gflags:=
-	>=dev-cpp/glog-0.5.0
-	dev-libs/cpuinfo
-	dev-libs/libfmt
-	dev-libs/protobuf:=
-	dev-libs/pthreadpool
-	dev-libs/sleef
-	sci-libs/lapack
-	>=sci-libs/onnx-1.12.0
-	sci-libs/foxi
-	cuda? (
-		=dev-libs/cudnn-8*
-		dev-libs/cudnn-frontend:0/8
-		dev-util/nvidia-cuda-toolkit:=[profiler]
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	nnpack? ( sci-libs/NNPACK )
-	numpy? ( $(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		') )
-	opencl? ( virtual/opencl )
-	opencv? ( media-libs/opencv:= )
-	qnnpack? ( sci-libs/QNNPACK )
-	xnnpack? ( sci-libs/XNNPACK )
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen
-	dev-libs/psimd
-	dev-libs/FP16
-	dev-libs/FXdiv
-	dev-libs/pocketfft
-	dev-libs/flatbuffers
-	sci-libs/kineto
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-	')
-"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13.0-gentoo.patch
-	"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
-	"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
-	"${FILESDIR}"/${PN}-1.12.0-clang.patch
-)
-
-src_prepare() {
-	filter-lto #bug 862672
-	cmake_src_prepare
-	pushd torch/csrc/jit/serialization || die
-	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
-	popd
-}
-
-src_configure() {
-	if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
-		ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0."
-		ewarn "These may not be optimal for your GPU."
-		ewarn ""
-		ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
-		ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
-		ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5,3.5"
-		ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
-		ewarn ""
-		ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
-		ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_CUSTOM_PROTOBUF=OFF
-		-DBUILD_SHARED_LIBS=ON
-
-		-DUSE_CCACHE=OFF
-		-DUSE_CUDA=$(usex cuda)
-		-DUSE_CUDNN=$(usex cuda)
-		-DUSE_FAST_NVCC=$(usex cuda)
-		-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-		-DUSE_DISTRIBUTED=OFF
-		-DUSE_FAKELOWP=OFF
-		-DUSE_FBGEMM=OFF # TODO
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GFLAGS=ON
-		-DUSE_GLOG=ON
-		-DUSE_GLOO=OFF
-		-DUSE_KINETO=OFF # TODO
-		-DUSE_LEVELDB=OFF
-		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-		-DUSE_MKLDNN=OFF
-		-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
-		-DUSE_NNPACK=$(usex nnpack)
-		-DUSE_QNNPACK=$(usex qnnpack)
-		-DUSE_XNNPACK=$(usex xnnpack)
-		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
-		-DUSE_PYTORCH_QNNPACK=OFF
-		-DUSE_NUMPY=$(usex numpy)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_ROCM=OFF # TODO
-		-DUSE_SYSTEM_CPUINFO=ON
-		-DUSE_SYSTEM_PYBIND11=ON
-		-DUSE_VALGRIND=OFF
-		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DUSE_ITT=OFF
-		-DUSE_SYSTEM_EIGEN_INSTALL=ON
-		-DUSE_SYSTEM_PTHREADPOOL=ON
-		-DUSE_SYSTEM_FXDIV=ON
-		-DUSE_SYSTEM_FP16=ON
-		-DUSE_SYSTEM_GLOO=ON
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-		-DUSE_TENSORPIPE=OFF
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	use cuda && addpredict "/dev/nvidiactl" # bug 867706
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto "/var/lib/${PN}"
-	doins "${BUILD_DIR}"/CMakeCache.txt
-
-	rm -rf python
-	mkdir -p python/torch/include || die
-	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
-	mv "${ED}"/usr/include/torch python/torch/include || die
-	cp torch/version.py python/torch/ || die
-	rm -r "${ED}"/var/tmp || die
-	python_domodule python/caffe2
-	python_domodule python/torch
-}
diff --git a/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
new file mode 100644
index 000000000000..9411531dd1ec
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-1.13.1-r4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake cuda flag-o-matic
+
+MYPN=pytorch
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="A deep learning framework"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ffmpeg? ( opencv )
+	mpi? ( distributed )
+	tensorpipe? ( distributed )
+" # ?? ( cuda rocm )
+
+# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/gflags:=
+	>=dev-cpp/glog-0.5.0
+	dev-libs/cpuinfo
+	dev-libs/libfmt
+	dev-libs/protobuf:=
+	dev-libs/pthreadpool
+	dev-libs/sleef
+	sci-libs/lapack
+	>=sci-libs/onnx-1.12.0
+	sci-libs/foxi
+	cuda? (
+		=dev-libs/cudnn-8*
+		dev-libs/cudnn-frontend:0/8
+		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	mpi? ( sys-cluster/openmpi )
+	nnpack? ( sci-libs/NNPACK )
+	numpy? ( $(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		') )
+	opencl? ( virtual/opencl )
+	opencv? ( media-libs/opencv:= )
+	qnnpack? ( sci-libs/QNNPACK )
+	tensorpipe? ( sci-libs/tensorpipe )
+	xnnpack? ( sci-libs/XNNPACK )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen
+	cuda? ( dev-libs/cutlass )
+	dev-libs/psimd
+	dev-libs/FP16
+	dev-libs/FXdiv
+	dev-libs/pocketfft
+	dev-libs/flatbuffers
+	sci-libs/kineto
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.13.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+	"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+	"${FILESDIR}"/${PN}-1.12.0-clang.patch
+	"${FILESDIR}"/${P}-tensorpipe.patch
+)
+
+src_prepare() {
+	filter-lto #bug 862672
+	cmake_src_prepare
+	pushd torch/csrc/jit/serialization || die
+	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+	popd
+}
+
+src_configure() {
+	if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
+		ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+		ewarn "These may not be optimal for your GPU."
+		ewarn ""
+		ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
+		ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
+		ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5,3.5"
+		ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
+		ewarn ""
+		ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+		ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_CUSTOM_PROTOBUF=OFF
+		-DBUILD_SHARED_LIBS=ON
+
+		-DUSE_CCACHE=OFF
+		-DUSE_CUDA=$(usex cuda)
+		-DUSE_CUDNN=$(usex cuda)
+		-DUSE_FAST_NVCC=$(usex cuda)
+		-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+		-DUSE_DISTRIBUTED=$(usex distributed)
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_FAKELOWP=OFF
+		-DUSE_FBGEMM=OFF # TODO
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GFLAGS=ON
+		-DUSE_GLOG=ON
+		-DUSE_GLOO=OFF
+		-DUSE_KINETO=OFF # TODO
+		-DUSE_LEVELDB=OFF
+		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+		-DUSE_MKLDNN=OFF
+		-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
+		-DUSE_NNPACK=$(usex nnpack)
+		-DUSE_QNNPACK=$(usex qnnpack)
+		-DUSE_XNNPACK=$(usex xnnpack)
+		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
+		-DUSE_TENSORPIPE=$(usex tensorpipe)
+		-DUSE_PYTORCH_QNNPACK=OFF
+		-DUSE_NUMPY=$(usex numpy)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_ROCM=OFF # TODO
+		-DUSE_SYSTEM_CPUINFO=ON
+		-DUSE_SYSTEM_PYBIND11=ON
+		-DUSE_UCC=OFF
+		-DUSE_VALGRIND=OFF
+		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DUSE_ITT=OFF
+		-DUSE_SYSTEM_EIGEN_INSTALL=ON
+		-DUSE_SYSTEM_PTHREADPOOL=ON
+		-DUSE_SYSTEM_FXDIV=ON
+		-DUSE_SYSTEM_FP16=ON
+		-DUSE_SYSTEM_GLOO=ON
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	rm -rf python
+	mkdir -p python/torch/include || die
+	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
+	mv "${ED}"/usr/include/torch python/torch/include || die
+	cp torch/version.py python/torch/ || die
+	rm -r "${ED}"/var/tmp || die
+	python_domodule python/caffe2
+	python_domodule python/torch
+}
diff --git a/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch b/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch
new file mode 100644
index 000000000000..ae0cac9fb947
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-1.13.1-tensorpipe.patch
@@ -0,0 +1,10 @@
+--- a/cmake/Dependencies.cmake	2023-02-28 14:14:49.099057348 +0100
++++ b/cmake/Dependencies.cmake	2023-02-28 14:15:05.326790806 +0100
+@@ -1404,7 +1404,6 @@
+ 
+     # Tensorpipe uses cuda_add_library
+     torch_update_find_cuda_flags()
+-    add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
+ 
+     list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe)
+     if(USE_CUDA)
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
index 25a171ff1680..531b9cbf5879 100644
--- a/sci-libs/caffe2/metadata.xml
+++ b/sci-libs/caffe2/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="cuda">Add support for CUDA processing</flag>
+		<flag name="distributed">Support distributed applications</flag>
 		<flag name="ffmpeg">Add support for video processing operators</flag>
 		<flag name="nnpack">Use NNPACK</flag>
 		<flag name="numpy">Add support for math operations through numpy</flag>
@@ -18,6 +19,7 @@
 		<flag name="opencv">Add support for image processing operators</flag>
 		<flag name="openmp">Use OpenMP for parallel code</flag>
 		<flag name="qnnpack">Use QNNPACK</flag>
+		<flag name="tensorpipe">Use tensorpipe</flag>
 		<flag name="xnnpack">Use XNNPACK</flag>
 	</use>
 	<upstream>
diff --git a/sci-libs/gsl/files/gsl-2.7.1-configure-clang16.patch b/sci-libs/gsl/files/gsl-2.7.1-configure-clang16.patch
new file mode 100644
index 000000000000..ba239563a38e
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-2.7.1-configure-clang16.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/898410
+https://savannah.gnu.org/bugs/?63679
+
+Avoid calling the undeclared exit function and future failures
+with compilers which do not support implicit function declarations.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -449,7 +449,7 @@ int main (void)
+    inf = exp(1.0e10);
+    nan = inf / inf ;
+    status = (nan == nan);
+-   exit (status);
++   return status;
+ }]])],[ac_cv_c_ieee_comparisons="yes"],[ac_cv_c_ieee_comparisons="no"],[ac_cv_c_ieee_comparisons="yes"])
+ ])
+ 
+@@ -469,7 +469,7 @@ int main (void)
+    for (i = 0; i < 5; i++) { z = z / 10.0 ; };        
+    for (i = 0; i < 5; i++) { z = z * 10.0 ; };
+    status = (z == 0.0);
+-   exit (status);
++   return status;
+ }]])],[ac_cv_c_ieee_denormals="yes"],[ac_cv_c_ieee_denormals="no"],[ac_cv_c_ieee_denormals="yes"])
+ ])
+ 
diff --git a/sci-libs/gsl/gsl-2.7.1-r1.ebuild b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
deleted file mode 100644
index 64e427099641..000000000000
--- a/sci-libs/gsl/gsl-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2"
-
-LICENSE="GPL-3+"
-# Usually 0/${PV} but check
-SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external +deprecated static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-2.7-cblas.patch
-)
-
-src_prepare() {
-	filter-flags -ffast-math
-
-	default
-
-	if use deprecated; then
-		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-
-	econf \
-		--enable-shared \
-		$(use_with cblas-external) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	local MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/gsl/gsl-2.7.1-r2.ebuild b/sci-libs/gsl/gsl-2.7.1-r2.ebuild
new file mode 100644
index 000000000000..e65ec799e0d2
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.7.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2"
+
+LICENSE="GPL-3+"
+# Usually 0/${PV} but check
+SLOT="0/27"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external +deprecated static-libs"
+
+RDEPEND="cblas-external? ( virtual/cblas:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-2.7-cblas.patch
+	"${FILESDIR}"/${PN}-2.7.1-configure-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	if use deprecated; then
+		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -ffast-math
+
+	if use cblas-external; then
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+	fi
+
+	econf \
+		--enable-shared \
+		$(use_with cblas-external) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	local MAKEOPTS="${MAKEOPTS} -j1"
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index 2f557e15f07c..d60254a6ef32 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -1 +1,2 @@
 DIST libbraiding-1.1.tar.gz 377161 BLAKE2B 48a80823f15920fce17c7d67cdc0a7e851855a4d6dfa5e9e461c8ce408c9c73d8aeeeacd27ac1c5f33c4436e8174c6ae9be275a71187d3a9887d37cf3bc8b8db SHA512 3032a290d0c7c0c13519136e111500a9e22f36ae7f9cc36df5a22670f18ebbce03a01e72c81e556ef4f6eea1ccf10e90ba6a9343be4a229e420e2f7da6289115
+DIST libbraiding-1.2.tar.gz 380852 BLAKE2B 8d88861879e7566fa88f3a269c20efa4f37a692da6fd32736b695628a414cec0e03a01cb7a0cfcf20bd233fd21c15b070d9df3e0ee4951c9511949962b012f61 SHA512 f3dcfa77d5313ecfa91c0b9a61988eb2048dd27ed77f46a5c34fc57adb9eee53b250946a7158918b3198559bd016c723dba98465036d01c482b5c6000ab59d8a
diff --git a/sci-libs/libbraiding/libbraiding-1.2.ebuild b/sci-libs/libbraiding/libbraiding-1.2.ebuild
new file mode 100644
index 000000000000..36538840bff4
--- /dev/null
+++ b/sci-libs/libbraiding/libbraiding-1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Expose the functionality of cbraid as a shared library"
+HOMEPAGE="https://github.com/miguelmarco/libbraiding"
+
+SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+# A few source headers still say GPLv2, but I believe that to be an
+# oversight: https://github.com/jeanluct/cbraid/issues/4
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index d451b6bee231..b84236e6edb8 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -4,3 +4,5 @@ DIST libcifpp-2.0.4.tar.gz 960402 BLAKE2B 4650478b187ece13d38c0a5f13c94e6098e327
 DIST libcifpp-3.0.0.tar.gz 950896 BLAKE2B 8aad3ebea5cc82c2615b6dc6a8a50654375dd9f58ff6c27306bf1415d9658f29f196c5ea9bf0e4f913400b3eba48f19bc11dd97c84b59cf2df94f87afb06d5b7 SHA512 507abed829e4d5194eb22fe73d261295a9814577d7bc53743731e7a1ccb032f763f4bfa0e1b23665d52fabbfa38baca20e6373c14db029705427b6fa773df976
 DIST libcifpp-5.0.5-components.cif.gz 88604747 BLAKE2B 05b914efaff697fa756a2ccd79836aa0a27a5fcf966eece7a3b5476fb37c876449047de00fea852a224b266188d00d1e5e5fa0148f24a1ae0fea01c0ad3415aa SHA512 a39144034836fbac5ff793c6a87d0e1519e63f16175357a3863d56edf2bf015af4dd6859b9afc8c8d9621c7dab752df5a8557149db2cb37983ab095a831fc2fd
 DIST libcifpp-5.0.5.tar.gz 1869555 BLAKE2B 515e27aeebb5e12130649a52ac92d69bbec910ec67fef992100a785f21ee6acaf34e951b2cc430acbfc52336a88337f0b54d6ecd030d784fc3ebe2065321f813 SHA512 730d212a681009b932f61e99dcde77d89ff5ec618781abf897f5e91c103d334ca560329975d32715a2d84f02026b073f46cba3f10a1b382ff82422d49b8dd50e
+DIST libcifpp-5.0.8-components.cif.gz 89984770 BLAKE2B d42147d4da56589ac30de9fc3cdacd43e036f548eebf80a19d878c4bf0be535578eec6b78625e1ba60db53090ce5e4b9a3e59b06705f208b660fb2e37e79d1c2 SHA512 5f9705714816656aa910b571d77966926d66b2724136119857138975f8be5bb2e889e0c9b28ef1340a72857afb5831dba529b96e8dfc796f739e24b0dcab0424
+DIST libcifpp-5.0.8.tar.gz 1873629 BLAKE2B 07257a898b1253995880fea9b416b3a7681122b544f8397d353fda4069c33f4a6c2d5cf2210983acf68dc56cb27a20d780461c7c2485a445855e7b45cccd326d SHA512 4ea67fa4a93218fe96289de95591faa9411508e41e308f4ff470033fb0deb4029a86eafb7ba9295807fe3b350e8cc9f2267f7735ee8b1dbb431ee0275db2b8cc
diff --git a/sci-libs/libcifpp/libcifpp-5.0.8.ebuild b/sci-libs/libcifpp/libcifpp-5.0.8.ebuild
new file mode 100644
index 000000000000..856007e7bd81
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-5.0.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Code to work with mmCIF and PDB files"
+HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
+# Update components file on every bump
+# ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
+SRC_URI="
+	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	cp "${WORKDIR}"/${P}-components.cif data/components.cif || die
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCIFPP_DOWNLOAD_CCD=OFF
+		-DCIFPP_INSTALL_UPDATE_SCRIPT=OFF
+		-DENABLE_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
deleted file mode 100644
index ef282ece33cc..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit python-r1 java-pkg-opt-2 udev xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="+cxx ftdi java parport python serial static-libs test +udev usb"
-REQUIRED_USE="java? ( cxx )
-	python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND="
-	>=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
-	parport? ( sys-libs/libieee1284[static-libs(+)] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )
-"
-RDEPEND="
-	java? ( >=virtual/jre-1.8:* )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )
-"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	cxx? ( app-doc/doxygen )
-	java? (
-		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.8:*
-	)
-	python? (
-		>=dev-lang/swig-3.0.6
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	test? ( >=dev-libs/check-0.9.4 )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
-	"${FILESDIR}/${P}-swig-4.patch"
-	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
-	"${FILESDIR}/${P}-check-0.15.patch"
-)
-
-pkg_setup() {
-	use python && python_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
-}
-
-sigrok_src_prepare() {
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_prepare() {
-	default
-	sigrok_src_prepare
-	use python && python_copy_sources
-}
-
-sigrok_src_configure() {
-	econf \
-		$(use_with ftdi libftdi) \
-		$(use_with parport libieee1284) \
-		$(use_with serial libserialport) \
-		$(use_with usb libusb) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		$(use_enable static-libs static) \
-		"${@}"
-}
-
-each_python_configure() {
-	cd "${BUILD_DIR}"
-	sigrok_src_configure --disable-ruby --enable-python
-}
-
-src_configure() {
-	sigrok_src_configure --disable-ruby --disable-python
-	use python && python_foreach_impl each_python_configure
-}
-
-each_python_compile() {
-	cd "${BUILD_DIR}"
-	emake python-build
-}
-
-src_compile() {
-	default
-	use python && python_foreach_impl each_python_compile
-}
-
-src_test() {
-	emake check
-}
-
-each_python_install() {
-	cd "${BUILD_DIR}"
-	emake python-install DESTDIR="${D}"
-	python_optimize
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl each_python_install
-	use udev && udev_dorules contrib/*.rules
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index f4fa7b02de2c..8a010fd267af 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
 
@@ -144,9 +144,11 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }
 
 pkg_postrm() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 32e030d01b3b..242b275a45d7 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1 java-pkg-opt-2 udev xdg-utils
 
@@ -139,9 +139,11 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }
 
 pkg_postrm() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	udev_reload
 }
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
index c416b04dac3c..617e1edb0d21 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools python-single-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -49,5 +49,6 @@ src_test() {
 
 src_install() {
 	default
+	python_optimize "${D}"/usr/share/libsigrokdecode/decoders
 	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index 3fb445840af0..8f04c30aebba 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools python-single-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -49,5 +49,6 @@ src_test() {
 
 src_install() {
 	default
+	python_optimize "${D}"/usr/share/libsigrokdecode/decoders
 	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch b/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch
new file mode 100644
index 000000000000..9b8583fa61e2
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch
@@ -0,0 +1,21 @@
+https://894646.bugs.gentoo.org/attachment.cgi?id=851914
+https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2972/diffs
+
+From be96ea7d85fefcad876729377c1b73a295d1c732 Mon Sep 17 00:00:00 2001
+From: "Luke A. Guest" <laguest@archeia.com>
+Date: Thu, 16 Feb 2023 16:57:32 +0000
+Subject: [PATCH] Fix compilation error with CUDA 12.
+
+--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h
++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ExecutionPolicy.h
+@@ -17,6 +17,7 @@
+ #include <vtkm/exec/cuda/internal/ThrustPatches.h>
+ VTKM_THIRDPARTY_PRE_INCLUDE
+ #include <thrust/execution_policy.h>
++#include <thrust/sort.h>
+ #include <thrust/system/cuda/execution_policy.h>
+ #include <thrust/system/cuda/memory.h>
+ VTKM_THIRDPARTY_POST_INCLUDE
+-- 
+2.39.1
+
diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
index 88721c38e704..eb117e951095 100644
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild
@@ -163,6 +163,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9.2.2-link-with-glut-library-for-freeglut.patch
 	"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch
 	"${FILESDIR}"/${PN}-9.2.5-Add-include-cstdint-for-gcc-13.patch
+	"${FILESDIR}"/${PN}-9.2.5-Fix-compilation-error-with-CUDA-12.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 65bbc607fd91..441d7f6e6a83 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest
index 80795b1f230c..ba98b1642ec6 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -1,3 +1,4 @@
 DIST HepMC-2.06.09.tar.gz 4612637 BLAKE2B 6bbf1a6a8410b6717ddff29fc3643247582f7a61a05fd9e52a0b09f78bf75de587c1c55525f6a1367b306a26a4687ce55b64908c049d91bdb2db3d40467af62b SHA512 1030f31ad9d19d8ae184145a693c4a3092131f485e2ed89598b7172992a825ad9aa46fb44a9199a00c4a6bd7e163daead9452e9bc4fe32cb3b97351cf22906c4
 DIST HepMC3-3.2.5.tar.gz 9217649 BLAKE2B 520e4621cdfa277376e94b87a070f23e6479867bbf696dc972e7496c54504c7da921932fbeaf7713cbaab18c72101ad3fa79396fe8ee1737180946696dcd1fbd SHA512 de60aaa686f6499c62112c265438b9ba41a7ed312b767ddc3409178b6e908e4fffd6a1153bd9f2929cf479074b14bcbec33d377f51a11cfcd4c67e45fc9bb2b9
+DIST HepMC3-e05d32ebac8705c0097e9e7d00ce815a205110db.tar.gz 9346161 BLAKE2B 9304d329332c2d4eb0ef6526a3308aecd29a38c569d3ba57d94767fd38ad052514f75a7a90f301c54185230d7693a67e48d59b66b12f42626a7ef900e309f743 SHA512 45f9edc6c56f9f8494b416bff147dccca64c52a90e0e169ede560ae8cf9e9255258b7af1586dd1c856f4010c22b2e668511bab160487a3ba802b629d03015e55
 DIST hepmc2.06.11.tgz 4893958 BLAKE2B ac8eef250cb330a167c9e0f4bd1aaf8df82e0ffec3557ab5cdaf8bc5b0b7333d6a45f73710ce63abab52d2c5758d5663c15c2a7c940a09504b3ef2fd4517aa0b SHA512 81c100d4931e0e4de62c8ffd18cc06e7996a642fecc092892988bdc0dd0dc3c0f5b336e85f09ceb8f5e0e09456775ae5928d37daf28d82923476089bc0e910f2
diff --git a/sci-physics/hepmc/hepmc-3.2.5_p20230225.ebuild b/sci-physics/hepmc/hepmc-3.2.5_p20230225.ebuild
new file mode 100644
index 000000000000..4f6201190a03
--- /dev/null
+++ b/sci-physics/hepmc/hepmc-3.2.5_p20230225.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-single-r1
+
+MYPN=HepMC3
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Event Record for Monte Carlo Generators"
+HOMEPAGE="https://hepmc.web.cern.ch/hepmc/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.cern.ch/hepmc/HepMC3"
+else
+	COMMIT="e05d32ebac8705c0097e9e7d00ce815a205110db"
+	SRC_URI="https://gitlab.cern.ch/${PN}/${MYPN}/-/archive/${COMMIT}/${MYPN}-${COMMIT}.tar.gz"
+	S="${WORKDIR}/${MYPN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="3"
+IUSE="doc test examples python root"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	root? ( sci-physics/root:= )
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHEPMC3_ENABLE_ROOTIO=$(usex root ON OFF)
+		-DHEPMC3_ENABLE_PYTHON=$(usex python ON OFF)
+		-DHEPMC3_ENABLE_TEST=$(usex test ON OFF)
+		-DHEPMC3_BUILD_DOCS=$(usex doc ON OFF)
+		-DHEPMC3_BUILD_EXAMPLES=$(usex examples ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+	python_optimize
+}
diff --git a/sci-physics/hepmc/hepmc-9999.ebuild b/sci-physics/hepmc/hepmc-9999.ebuild
new file mode 100644
index 000000000000..4701177b3f45
--- /dev/null
+++ b/sci-physics/hepmc/hepmc-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-single-r1
+
+MYP=HepMC3-${PV}
+
+DESCRIPTION="Event Record for Monte Carlo Generators"
+HOMEPAGE="https://hepmc.web.cern.ch/hepmc/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.cern.ch/hepmc/HepMC3"
+else
+	SRC_URI="https://hepmc.web.cern.ch/hepmc/releases/${MYP}.tar.gz"
+	S="${WORKDIR}/${MYP}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="3"
+IUSE="doc test examples python root"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	root? ( sci-physics/root:= )
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHEPMC3_ENABLE_ROOTIO=$(usex root ON OFF)
+		-DHEPMC3_ENABLE_PYTHON=$(usex python ON OFF)
+		-DHEPMC3_ENABLE_TEST=$(usex test ON OFF)
+		-DHEPMC3_BUILD_DOCS=$(usex doc ON OFF)
+		-DHEPMC3_BUILD_EXAMPLES=$(usex examples ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+	python_optimize
+}
diff --git a/sci-physics/root/root-6.26.08.ebuild b/sci-physics/root/root-6.26.08.ebuild
index ec8f9983775c..c83e19af3636 100644
--- a/sci-physics/root/root-6.26.08.ebuild
+++ b/sci-physics/root/root-6.26.08.ebuild
@@ -139,9 +139,9 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 
 	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "You can use the environment variable MYCMAKEARGS to enable"
 	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+	elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
 }
 
 src_prepare() {
@@ -290,7 +290,6 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		"${EXTRA_ECONF}"
 	)
 
 	cmake_src_configure
diff --git a/sci-physics/root/root-6.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild
index ec8f9983775c..c83e19af3636 100644
--- a/sci-physics/root/root-6.26.9999.ebuild
+++ b/sci-physics/root/root-6.26.9999.ebuild
@@ -139,9 +139,9 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 
 	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "You can use the environment variable MYCMAKEARGS to enable"
 	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+	elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
 }
 
 src_prepare() {
@@ -290,7 +290,6 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		"${EXTRA_ECONF}"
 	)
 
 	cmake_src_configure
diff --git a/sci-physics/root/root-6.28.00.ebuild b/sci-physics/root/root-6.28.00.ebuild
index e25434a11de7..473a60acd759 100644
--- a/sci-physics/root/root-6.28.00.ebuild
+++ b/sci-physics/root/root-6.28.00.ebuild
@@ -143,9 +143,9 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 
 	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "You can use the environment variable MYCMAKEARGS to enable"
 	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+	elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
 }
 
 src_prepare() {
@@ -307,7 +307,6 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		"${EXTRA_ECONF}"
 	)
 
 	# Needs to be here, otherwise gets overriden by cmake.eclass
diff --git a/sci-physics/root/root-6.28.9999.ebuild b/sci-physics/root/root-6.28.9999.ebuild
index e25434a11de7..473a60acd759 100644
--- a/sci-physics/root/root-6.28.9999.ebuild
+++ b/sci-physics/root/root-6.28.9999.ebuild
@@ -143,9 +143,9 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 
 	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "You can use the environment variable MYCMAKEARGS to enable"
 	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+	elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
 }
 
 src_prepare() {
@@ -307,7 +307,6 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		"${EXTRA_ECONF}"
 	)
 
 	# Needs to be here, otherwise gets overriden by cmake.eclass
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index e25434a11de7..473a60acd759 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -143,9 +143,9 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 
 	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "You can use the environment variable MYCMAKEARGS to enable"
 	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+	elog "MYCMAKEARGS=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
 }
 
 src_prepare() {
@@ -307,7 +307,6 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		"${EXTRA_ECONF}"
 	)
 
 	# Needs to be here, otherwise gets overriden by cmake.eclass
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 5cc802a383f7..7afda8520281 100644
Binary files a/sec-keys/Manifest.gz and b/sec-keys/Manifest.gz differ
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index e13cbf899b3c..ebd2cba70978 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,3 +1,6 @@
 DIST openpgp-keys-apache-tomcat-10.1.5-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
+DIST openpgp-keys-apache-tomcat-10.1.6-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-8.5.85-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.86-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.71-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-9.0.72-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild
new file mode 100644
index 000000000000..f17ae55806f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-80.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.72.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.72.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.72.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild
index c90434400930..adbb0e08f014 100644
--- a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20230207.ebuild
@@ -56,7 +56,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f1860a87f310..4f8d1d659bff 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/accountsservice/accountsservice-22.08.8-r1.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8-r1.ebuild
new file mode 100644
index 000000000000..f40751c3540d
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-22.08.8-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson python-any-r1 systemd
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+
+IUSE="doc elogind gtk-doc +introspection selinux systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+CDEPEND="
+	>=dev-libs/glib-2.63.5:2
+	sys-auth/polkit
+	virtual/libcrypt:=
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	systemd? ( >=sys-apps/systemd-186:0= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-accountsd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dadmin_group="wheel"
+		$(meson_use elogind)
+		$(meson_use introspection)
+		$(meson_use doc docbook)
+		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# This directories are created at runtime when needed
+	rm -r "${ED}"/var/lib || die
+}
diff --git a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
deleted file mode 100644
index 9f34a6d97636..000000000000
--- a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson python-any-r1 systemd
-
-DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="doc elogind gtk-doc +introspection selinux systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-CDEPEND="
-	>=dev-libs/glib-2.63.5:2
-	sys-auth/polkit
-	virtual/libcrypt:=
-	elogind? ( >=sys-auth/elogind-229.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	systemd? ( >=sys-apps/systemd-186:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	)
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-accountsd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-		-Dadmin_group="wheel"
-		$(meson_use elogind)
-		$(meson_use introspection)
-		$(meson_use doc docbook)
-		$(meson_use gtk-doc gtk_doc)
-		-Dvapi=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
-	if use doc; then
-		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# This directories are created at runtime when needed
-	rm -r "${ED}"/var/lib || die
-}
diff --git a/sys-apps/accountsservice/files/accountsservice-22.08.8-configure-clang16.patch b/sys-apps/accountsservice/files/accountsservice-22.08.8-configure-clang16.patch
new file mode 100644
index 000000000000..939418752731
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-22.08.8-configure-clang16.patch
@@ -0,0 +1,33 @@
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/453f893e3c38c209ae9dff47bca74ccb33a5bd34
+
+From 453f893e3c38c209ae9dff47bca74ccb33a5bd34 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 28 Feb 2023 02:31:50 +0000
+Subject: [PATCH] meson.build: fix -Wimplicit-function-declaration in configure
+ tests for printf
+
+<stdio.h> needs to be included for printf. Newer compilers like Clang 16 make
+implicit function declarations an error by default which can cause misleading
+or incorrect configure test results.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/meson.build
++++ b/meson.build
+@@ -79,6 +79,7 @@ endforeach
+ 
+ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+   code = '''#define _GNU_SOURCE
++  #include <stdio.h>
+   #include <utmpx.h>
+   int main (int argc, char **argv) {
+     printf ("%s\n", WTMPX_FILENAME);
+@@ -91,6 +92,7 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC
+   config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+   code = '''#include <paths.h>
++  #include <stdio.h>
+   int main (int argc, char **argv) {
+     printf ("%s\n", _PATH_WTMPX);
+     return 0;
+-- 
+GitLab
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 4bd656e60243..c31f263db770 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -8,6 +8,7 @@ DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bat-0.20.0.tar.gz 1698850 BLAKE2B 99d150010b40246af8529490411a781aebeb06730dadbc10969e25a4825bf30402b2ae75a2c752b199d8212ea48a19cbb7cb5afceaf9fe0b42e3845030729d33 SHA512 22b4ad8f8a5ba55cb8b16aefda29e95fd55e60ed8c2d3f0de36f6a00b770d9ee7f86f4e5ca35bee4e9f22772ab4b3c327d21ebbec25dc0350d9fb89a9f9f22e7
 DIST bat-0.21.0.tar.gz 1786921 BLAKE2B 158d1c57723cc56adaee3e60ce0ecc2e0cb8f0f733b72ad6ae1acb53520b5bf4a13ac6fa7bd285a26ebeabfe816104eed24c2c0d871d6a14b71f927deb81db9d SHA512 113a8225bd297d9a18ad620c5509db1c4028d92387b70fb3eacc34b0ab9dabdd01a206d1b3062632830d8cf34cb12ea8ca6788a8ea985c5e5de57bf71306be70
+DIST bat-0.22.1.tar.gz 1795451 BLAKE2B c608b325fc1fdac193b60121b98ff47f6fc78cc2141cbe5860010bcad0644060d4f43e8495b8ae34a0297e6ceddc771beceaed9209b8f312058b5dbd8ba00c7e SHA512 9d31ab4f5453c3806252bedad31809d296f1529e6086090ad9385adfd76c164a1e15031150c374076d5f689844276c8fae7087a9382154609870be8f4b80c8ad
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
@@ -20,8 +21,11 @@ DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST clap-3.2.20.crate 214114 BLAKE2B b8bf14d5b60ac0a1156718e2993df45bd867519a195414de591ae92e009930121c674bd53ce8e5cad53659a1b9b72810a7cbbabc92d3552b2131cf3836083a4f SHA512 85a1aa5f777a172aca71459225d72282fc7f21122ad7ade496a4734ffdd140476fd73d67da900fe323dd6a72d09401536e318b9654674a9f4f61dab822fe54a9
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clircle-0.3.0.crate 9837 BLAKE2B adeb2d11238c343363475f9e517d01c9b596fa61b7d520f9c92de038f0a106e48263d06045e7f9d0cb5538384d4b2cffc2c969e9a129045b8839bf04ab1bad75 SHA512 a4db35d05ea4ca03155c7308a79b529091dddd4d2d579d787fc3770d80cb7c22ca4a239bcfe7b6a2a85870249754991f8dc960846b80ee7a46b763edfb084b2b
 DIST console-0.15.0.crate 23507 BLAKE2B 49694683baddb53e0f35584403aa93616164c2d3b94b39e0e35ebc4f915c37c8e794619d57b44ac0ea460ddbf7ec43323adecf657cc6f2869f313b3cdbf3a46a SHA512 70bd6abfafa533903f273ec3b34da6783856bd1abedaf139fddafac0dbb03fa9154f8e1e1bef01fd8de3c53100bbaa93313518c42f8ce51217c23ef34d3f9d62
+DIST console-0.15.1.crate 31674 BLAKE2B 4dedaa4c2bf5b533e4f1fb007d7fd1a2b7e37e901f09e1d8d43d0ca79c95eaecb1d238597b338a8da9a1de78efc4ed830a0e55e7e59f4066ff7494ecbb0d6eb6 SHA512 af00a4c8c7ffdd4e6f6c638b52dd4e829b90235b63256215ce04ffc9e3fec8384a032ca664fc4f00a912ce6b5db04990cdf7f60873fe657bf99e811525acc8c2
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
 DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
@@ -41,6 +45,7 @@ DIST fancy-regex-0.7.1.crate 78178 BLAKE2B c5887ef60d0427b5964cb296696749c5dff68
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
+DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
@@ -49,8 +54,10 @@ DIST git-version-0.3.5.crate 3203 BLAKE2B f73d2f076c79c10c7395e584d811b6fffc7f34
 DIST git-version-macro-0.3.5.crate 4302 BLAKE2B 39173a36199b34cec11a1924faed795334586b21e3042bb91f3d38cee2d8b97ffb5bb4dd45a3c192d8c1b8d2b2a5bf4e0d3b23927b6f4212cfeb7cb9dbb16d4e SHA512 319729646469ab6508e16e6f3b88f588580fe7089479f70522edd6ac7eadb3c4576f0a57863bd3927d1ada693c3fe3706dc6a75e6cd75723db7f23199dc69ae0
 DIST git2-0.13.25.crate 194192 BLAKE2B 7286ce8f37421e5cb626c3b3d4f0005d4ddbf4f893fa4885a9bad28ba3f0e24d4b2161df8788430d909394ceff77eae586b26ffe343d6b0ca287ea0b63087068 SHA512 666f11464f34d82abd994f00a0b81e960551c4c524b4f00d28e5c728172dfa894fec65050767cc96d18d1d5de57f1e901154fe8d70e2e31b93b93790bce021ab
 DIST git2-0.14.2.crate 196856 BLAKE2B 09ed89e5eaf632b1bd9c33ff7afff78808599823804668cb6f85925a8d61359300b460db8b34e6562b8289b79b53094df4c184e013a8d4d4b58c510447fd0ec8 SHA512 7e4c0660fb7f48fda3ed73bcd577e2a40eb44005bd1130f9fbc0c515bfd155ec75a2efabdde99661a7c4590e52a749be4342397b79a47bbfe8f4fb8fe160dd22
+DIST git2-0.15.0.crate 198983 BLAKE2B 0e340dedef36339cc6ce4cf9ac79014e7bcbdf9ebf688986d1836c3e2f480998a60a2722017381124682edc5dc511368497f03c9bd9a8c4d0e7690682789bf88 SHA512 8ea32850e592cb9bc8caa0d7a04042e284c11b9d46959807d8e6d496d93946342dc37fcdf1ed354010434798a404f415e8e980fee2ce4f5cb998e0f8736b5bc5
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
+DIST globset-0.4.9.crate 22929 BLAKE2B 91dfaeb99a3f6f40a5a025ad8527c91770545487324e191801eedb6f916739b5efe687d84a43eb8b712cd181d98d3ab17b839f30c19e0da041b4c34d9286089f SHA512 66841495098b028b8d294c0832276b8864760df3a16b93b57222037c351591ac7773a99a65b85a20c438fbfc04c56ea4901188cb18ed470d3481eeef29eab708
 DIST grep-cli-0.1.6.crate 18949 BLAKE2B fe0c1c615cd2b1dbb8b7ad3980292308d9f06390ead08f42719b835805efed8a8243a7ab9e5bbf3cc6aa5c2890aa2bd53366a0bf65d66c19ec706f76beb58cbc SHA512 ffacb90586bb28afc3ab2a780be10c78f32b83c5ef5b28c7729ed61353ff5197bdafa485e87371d5ea10198bc9c28c46a22172a9fdb0adad0119274c503214ab
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
@@ -67,6 +74,7 @@ DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea
 DIST libc-0.2.125.crate 589236 BLAKE2B 57ca3aa19687b5c5702b66ad690a86ec7639dca41c5846c7cc3500f2d0fffcfee95a2def7695652174862fb6b8d211e7564fef6bef6d1197c481b5b8f18a9c74 SHA512 64ea5bb20120b9893bf5a3648f28da07384972e3cbad13da40c3ecc501efe1bff0bd6b71f52d5f253f00d7a97c2f69d86fba490955e8d70ca1360b8db1e431cf
 DIST libgit2-sys-0.12.26+1.3.0.crate 1476836 BLAKE2B 953756b4ed1e6f90d9eabf03dd9f3db50a085ecee4018c6f5e598b2b030e3332a6281f5e033810134356a48b92a4b910fd534813f2111cefc6de3bbf2954e1c8 SHA512 de30865b3d4ab0288e090381e5646e3e8028c341fac93014168fcfa5f166f7fbad9fc4ebd285919247cc6bac178658eb936ea1fdf168068248be07ad34ecc54d
 DIST libgit2-sys-0.13.2+1.4.2.crate 1492799 BLAKE2B 9ac165dff195d4ed18677f9cc9f85e79a219c60c3477880a35340d5bcd0308c7aca4015fa3c213ce56fc20a237c5f1d506ae936335db4eddf06617c6072146ab SHA512 54d7c11d930554dd10b112d878dc7ea473c7d45e74d394e21e99f5d4632741f49aa31746bf2594705d337b5b64e6b877e510938ceb2117837c9a6f685ef8824f
+DIST libgit2-sys-0.14.0+1.5.0.crate 1740370 BLAKE2B 0bdcec13f78292ad7849f88bbf21a8168371e9d4b15dcd09863b2ef703caa8e94a33da01164214620e11ff6f75038cf9ee6257c44aed5e07c52af044abca9952 SHA512 b2e1e54b172e6b0c71fdd02da0800e9120a3fe1b9c33b5fee4e667e9aa627979012865397b406fe91437425bf52e52a26245cfb7fa84f3ba64269dbe204582d6
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
@@ -79,12 +87,15 @@ DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c6
 DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
 DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
 DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
+DIST nix-0.24.2.crate 264176 BLAKE2B 2da44a51beba8549a558730567f6ea36ab0da81053dac10db637beb3901ce7c32b6efebba519af37068fa32270186d733ef55661b58621eb7e946fb16690cd6c SHA512 9502f899868466165d898b1dee676188e9761cbf7ad7be21e231d6d5c993f109b48edf06b659f547712ccec2d648dcdb689626845ecce22965aad2dfd7ed75ff
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST once_cell-1.13.1.crate 31335 BLAKE2B f8455c5aa78073289669b8f277490ac9bfeafca3249bd54af91a51709262562f07e3154287f7a7db1711d0884fa2804aa82df5d7efb90b8ce5b2380c851be23c SHA512 492831607d12846923107b464a70de62f5997845faaae1625f3e54e2610e96b0355ce9e554051c2fae28f7e6e558ed456a6fc0b3c6a71b26f7443ede5eff5b32
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST onig-6.3.1.crate 30879 BLAKE2B e371f003ee19bdbb9cf9fa0e5f18ef14841cbae40f66bfbb367401c15b1eb50b3661accc0609a43dce41f8272ffad8a4b41f75ea23267ab8c7cdf4556d67a7cd SHA512 5c487063b669532e31acce0788b690c53a8d95eb628cea970dd335bb721fa99e67bb6c531b0a9a388354b7e1a6e1621cc953e029f1791dde43736a577002d955
 DIST onig_sys-69.7.1.crate 631301 BLAKE2B 4c593f3b7a83d32edc92db67d6f2f0460e43bf34611751f8a5941ad3cded459cdd582e9067291d1fa1e2dfc316b276080b99f85f0a98dc9bfcc531af2f289b7e SHA512 5be8c31049ad741fa06247bd22813374f71397481cea22be3d83bed720b512b9cb10d6028072fd92cc09ac0e9ca8fb977ca49fb59d934dd61f84c4634d28ffb3
+DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST path_abs-0.5.1.crate 31072 BLAKE2B 5f7041fc98db906183a42523ff6ed3ae23c1a8119c61860f71dc3b496845a9a0cd172151ba21c2cbb9933b0e2fa3e08ddf467700f4d2aef934d101e090b50fb9 SHA512 fd382fb0233b4029b9c6208b0b574c619cba8c3e6b6ffe39f63ff9e1cfd55240acd061d1aa82180987d72c8499802171f074eb35b9b0c60bc11cb48e248ee0ca
@@ -99,13 +110,16 @@ DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
+DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rgb-0.8.31.crate 16087 BLAKE2B c597b0961803685c80bc154b7d2fabeeb88c36bdc6f79fe6c6d99b9069bf3a3914eff0433cd6b068aa87ca608e90e408dca18a9f2deb900c1a8e5592462058a9 SHA512 a9b307c88dbe24b383e38311a411365a709d4d7fe8d5e0e35f29200af3f2b912e1251a68b268c383a2f00538a93fffd05f0bdf1ca15e5bd3f56000c789ecc144
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
@@ -113,12 +127,16 @@ DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST semver-1.0.13.crate 29653 BLAKE2B 382a1fd00b20e55d5c5f8bf536ee012f8bc4c21633f47fc7f39efa46a547b720a349f0c6ff22dcb9faa3acd82022a5f82f182824fa262d96687866da0125aa73 SHA512 c4c1e5c5118f99de10fa2800a057e1eeb4cb5267752ed2093f57dc1d03e9817a42d6a34ea6165132e0bc84bcc573b93d608668d3681216e28da9fa8da49860b3
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
+DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
+DIST serde_derive-1.0.144.crate 54867 BLAKE2B d1eabf53f4efdf95c3c12a907090617e0aa02661fa0e3cc51bf0ef8dcdbf45f0382a57588565ce26ef7baca330c19ad216a8a0975247bc02af37c4440bdd6859 SHA512 d41208452b36b8d3f0644e58164c9c4e75f8cab2d8be09cfd1b38bdfc690e880a062e0eafe46dd4400d01f541b34c9acd3574504c4aa856afb00cfc2e9617a0a
 DIST serde_json-1.0.74.crate 115919 BLAKE2B 230d205687c29f361705f80192e26a15e97c5dc1497a02bd56fa8399a4d562d087461729d17fbefe61af9662886381f8674aee91471b10f11f29e9ad9c14a39d SHA512 da070221e805495b9b8c56a203ded1b2651b81851ae473a73dbf46656c44375cd5ef7db01272792684abb4d7836e193c85a622e83c59125a393fb484431fb061
 DIST serde_yaml-0.8.23.crate 42140 BLAKE2B 49d28913954173d1c062fe4668c2228286adde3d3e210befd09e04f8e43dcde469c6aeb86349a7a604188343d0c211078c9520c079249780923a4d70e3132d9b SHA512 7831299cedf0fa9155a76b61436ec1cbc06adfe672a102973e8cffc8b277d99b4104d70951ed16b18283f3291c8047d6af413e0438da3e6bc6745bfb6816628a
+DIST serde_yaml-0.8.24.crate 42102 BLAKE2B cf389f5438636ba60eb2525113f785859d4124efc23604a015ba52363a5c784d4ec552e46f5231e53d703042c96ac7902863902f96db121dc58391c16b979b8e SHA512 f32d3138a7879b6ec9329c48e691cd2d8e152058220402788309dbe830d90e37bcdf9d3538d79b845547b2135706b3060ff40a943d357f9d3b6dec478af400c9
 DIST serial_test-0.5.1.crate 2993 BLAKE2B c72cfcfe441d1d23128d442a3d24e83858e598dd95bccef0a462c675793db0aa1ad2cd03daa73441e84c8389b8dcef9b4698cb8eba8bb5dfbf69e524331950d7 SHA512 e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e
 DIST serial_test-0.6.0.crate 4494 BLAKE2B d68c70c5cb079cae1a22173d90045789b578d8f50407c56df80a30ee7e4abab26445f0a304693e0c3936d466fb1778de71c9f3f9185fd690f595dc02f5a1f588 SHA512 36340e6234b44ef99d0e4f25a6f98dbe080cb0c2b0de06bdb8fe72cf7c6398110ca0489e556b7ba24be708e7fae3fc63400075e1d061a86d5d612d70b216d46f
 DIST serial_test_derive-0.5.1.crate 3609 BLAKE2B 54e408dc15f15c26e116157046ac609356b6d92d3e5bd27e08c31da537ec526eef8e6e52df1f06521b98c6c0695197b0b2ed654f0e46a45cf15156db82688d08 SHA512 e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e
@@ -128,8 +146,10 @@ DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d42
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
 DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
+DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba92cba9f31e567e9de2bcb129b7b415cbaf692c1e1021b12184bb3b064ed1996654581aab3d5f09e992c0eb5d SHA512 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba
 DIST syntect-5.0.0.crate 809452 BLAKE2B d76194d2234c77decac13d1bd2036862231718ce0ee050469fbbff094a11bc8f4ae2669077f6433d59a113d058c449f6e4d091cf520a985a9ef92dcab058f136 SHA512 b444424ad5f2ff9897707d6c2d0a39cf4e48a8d9a838286fc9f7bd9db6f1b4228bd2a5c985f5f88c014e75a7ee94bffdfee1cca45bd68e6db52e624e71923dc9
 DIST sys-info-0.9.1.crate 20589 BLAKE2B fb3c43a1368c9206393b28064b38a1560aeb863b9b0bc89c9bf6ccc344a46a590296df3596f421218d78c26ae90d3f869ef0457c8c34e8e8dcb9bbd92fee0450 SHA512 52e23efd5bba1ce07d7fffb8c2d6864a8056b1e8ce1b85c4d2d4b37b9d57dfa5a6c0eae9e2018e07af47469c3f7812ccbd27351cbd6c95a7b788ec87cd544b2e
@@ -139,14 +159,18 @@ DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST termtree-0.2.3.crate 6926 BLAKE2B 390aad5f90602785674fddf6dd5ffe5ddb37b5f2eea7cfd330e04e4b3f482c8ab3bca63fa595ee409a8bed3ffd27684bc6a1227ca679763f94cf5a75ad55ee93 SHA512 183a99ece5ba686e6fc9884c3dc702083a6f7918514a20e3af460195d8f171d9ec91fccb8e2a93319f844ca7164455c9490e4a6478ef096f44c1b57e532a7a76
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
+DIST thiserror-1.0.33.crate 17252 BLAKE2B 234ba49ca99379cf666f6fdc1e4cccaf59c565b116275f423b3052924d29a61f56c8579e02b91273eb8b04c4dc87b5b2455d5cb27580a8cc08769236818a158d SHA512 7bc7cba1e9beb48d8938c5f6b75eb7b3c2966b87d7adb3a29c1f28db94643fd6b630b4e17f4dcd8f544d1656b5e8ea89fff292f3017e73f0a1fec96461602b18
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
+DIST thiserror-impl-1.0.33.crate 15429 BLAKE2B 2713d79ac5e04fa5ba3f759541910416d5acd266a564a3effb8aac2d6a17a43f19453417e097aca51728a126b2a4e75bb2e9846e8ba9945363b2f7c818ace339 SHA512 e8d057851992abf0de9310d525efdd55bec6876d0f95e05868b08e0585fdce5b0514ec38fa88f3a717575ed2abf1b0d24e7c19b0ad2d9e64d21925ae2711402a
 DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
+DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
@@ -158,6 +182,7 @@ DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f73
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
+DIST wild-2.1.0.crate 7548 BLAKE2B 51de93b588b1d2934a7b41a8a259a3948db846383e966ac4d1d0fde68927dedd6aac08eb659ceee893a2c1005a33e320bd7ee1b3af17c05a3f0ad6e213ef3230 SHA512 458716b78fde64c65a10ae28d9ac75494c5362a834dd48f5d29efbf7bc54323033f524cfa8ec9d4c851121cfc357d3935129069fcb746e656b8ae397cb9b197c
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
diff --git a/sys-apps/bat/bat-0.22.1.ebuild b/sys-apps/bat/bat-0.22.1.ebuild
new file mode 100644
index 000000000000..9c75d942ccce
--- /dev/null
+++ b/sys-apps/bat/bat-0.22.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	aho-corasick-0.7.18
+	ansi_colours-1.1.1
+	ansi_term-0.12.1
+	assert_cmd-2.0.4
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bincode-1.3.3
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bitflags-1.3.2
+	bstr-0.2.17
+	bugreport-0.5.0
+	bytemuck-1.7.3
+	bytesize-1.1.0
+	cc-1.0.72
+	cfg-if-1.0.0
+	clap-3.2.20
+	clap_lex-0.2.4
+	clircle-0.3.0
+	console-0.15.1
+	content_inspector-0.2.4
+	crc32fast-1.3.0
+	difflib-0.4.0
+	dirs-next-2.0.0
+	dirs-sys-next-0.1.2
+	doc-comment-0.3.3
+	either-1.6.1
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	fancy-regex-0.7.1
+	fastrand-1.7.0
+	flate2-1.0.24
+	float-cmp-0.9.0
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	getrandom-0.2.3
+	git-version-0.3.5
+	git-version-macro-0.3.5
+	git2-0.15.0
+	glob-0.3.0
+	globset-0.4.9
+	grep-cli-0.1.6
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	idna-0.2.3
+	indexmap-1.7.0
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-0.4.8
+	itoa-1.0.1
+	jobserver-0.1.24
+	lazy_static-1.4.0
+	libc-0.2.125
+	libgit2-sys-0.14.0+1.5.0
+	libz-sys-1.1.3
+	line-wrap-0.1.1
+	linked-hash-map-0.5.4
+	lock_api-0.4.5
+	log-0.4.14
+	matches-0.1.9
+	memchr-2.4.1
+	miniz_oxide-0.5.1
+	nix-0.24.2
+	normalize-line-endings-0.3.0
+	num-traits-0.2.14
+	once_cell-1.13.1
+	onig-6.3.1
+	onig_sys-69.7.1
+	os_str_bytes-6.3.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	path_abs-0.5.1
+	percent-encoding-2.1.0
+	pkg-config-0.3.24
+	plist-1.3.1
+	predicates-2.1.1
+	predicates-core-1.0.2
+	predicates-tree-1.0.4
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.39
+	quote-1.0.14
+	redox_syscall-0.2.10
+	redox_users-0.4.0
+	regex-1.6.0
+	regex-automata-0.1.10
+	regex-syntax-0.6.27
+	remove_dir_all-0.5.3
+	rgb-0.8.31
+	rustversion-1.0.6
+	ryu-1.0.9
+	safemem-0.3.3
+	same-file-1.0.6
+	scopeguard-1.1.0
+	semver-1.0.13
+	serde-1.0.144
+	serde_derive-1.0.144
+	serde_json-1.0.74
+	serde_yaml-0.8.24
+	serial_test-0.6.0
+	serial_test_derive-0.6.0
+	shell-escape-0.1.5
+	shell-words-1.1.0
+	smallvec-1.7.0
+	std_prelude-0.2.12
+	strsim-0.10.0
+	syn-1.0.95
+	syntect-5.0.0
+	sys-info-0.9.1
+	tempfile-3.3.0
+	termcolor-1.1.2
+	terminal_size-0.1.17
+	termtree-0.2.3
+	textwrap-0.15.0
+	thiserror-1.0.33
+	thiserror-impl-1.0.33
+	time-0.3.5
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	unicode-bidi-0.3.7
+	unicode-ident-1.0.0
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	url-2.2.2
+	vcpkg-0.2.15
+	version_check-0.9.4
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wild-2.1.0
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	xml-rs-0.8.4
+	yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
+HOMEPAGE="https://github.com/sharkdp/bat"
+SRC_URI="
+	https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)
+"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 LGPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=dev-libs/libgit2-1.1.0:=[threads]
+	dev-libs/oniguruma:=
+	sys-libs/zlib
+"
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
+RDEPEND="${DEPEND}
+	!>app-backup/bacula-9.2[qt5]
+"
+
+DOCS=( README.md CHANGELOG.md doc/alternatives.md )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die "Cannot change directory to ${PN} build"
+
+	doman assets/manual/bat.1
+
+	newbashcomp assets/completions/${PN}.bash ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins assets/completions/${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins assets/completions/${PN}.fish
+}
diff --git a/sys-apps/bat/metadata.xml b/sys-apps/bat/metadata.xml
index 9b007f050989..4c7373fea252 100644
--- a/sys-apps/bat/metadata.xml
+++ b/sys-apps/bat/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>hoelbezier@riseup.net</email>
+		<name>Hoël Bézier</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		A cat(1) clone with wings
 
diff --git a/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild b/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..3cc4297cdb73
--- /dev/null
+++ b/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite(+)"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit desktop distutils-r1 virtualx
+
+DESCRIPTION="Clean junk to free disk space and to maintain privacy"
+HOMEPAGE="https://www.bleachbit.org"
+SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3
+"
+BDEPEND="
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]')
+	)
+"
+
+distutils_enable_tests unittest
+
+# tests fail under FEATURES=usersandbox
+RESTRICT="test"
+
+python_prepare_all() {
+	if use test; then
+		# avoid tests requiring internet access
+		rm tests/Test{Chaff,Update}.py || die
+
+		# fails due to non-existent $HOME/.profile
+		rm tests/TestInit.py || die
+
+		# only applicable to Windows installer
+		rm tests/TestNsisUtilities.py || die
+
+		# these fail on upstream Travis CI as well as on Gentoo
+		sed -e "s/test_notify(self)/_&/" \
+			-i tests/TestGUI.py || die
+
+		sed -e "s/test_get_proc_swaps(self)/_&/" \
+			-i tests/TestMemory.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C po local
+}
+
+python_test() {
+	virtx emake tests
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript ${PN}.py ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	emake -C po DESTDIR="${D}" install
+
+	insinto /usr/share/bleachbit/cleaners
+	doins cleaners/*.xml
+
+	insinto /usr/share/bleachbit
+	doins data/app-menu.ui
+
+	doicon ${PN}.png
+	domenu org.${PN}.BleachBit.desktop
+}
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 2734051b198c..a40e824b70fd 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1 +1,2 @@
 DIST bubblewrap-0.7.0.tar.xz 147700 BLAKE2B 379feff513a509e6e00c933ca6bafdeef43827e406fbf31e56c1d16feb099a887f88125fb52d038e78b1604c504bdba771aeaeb3274e8d11163492f00fe9633c SHA512 3d163eecd79774e02d082141d027b7ac13f7d3a29c22f6513203e1088f53d53d8dde50e36fc4c8a34e8cde2f3e2a692e00b741f4bee2cc2bb21b9deb600271b5
+DIST bubblewrap-0.8.0.tar.xz 149088 BLAKE2B 5853cf42a7ab653540ec5134866c6f2459aa101e9eea724a4f283405cbcae2beb3551b7c1a7aa93d82016d4eb0d12f9c97c47df53a6d9b589db40483696253de SHA512 1cbc33f3c834ff83f4c1808d3ec2555921277d495f903ad152cbd5065a6e100c5420b4b5c62386bb2d303eb1734e074b09625013e55e3bd8631cfb3582d70e1c
diff --git a/sys-apps/bubblewrap/bubblewrap-0.8.0.ebuild b/sys-apps/bubblewrap/bubblewrap-0.8.0.ebuild
new file mode 100644
index 000000000000..fa95d51552b8
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson
+
+DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
+HOMEPAGE="https://github.com/containers/bubblewrap/"
+SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux suid"
+
+RDEPEND="
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+# tests require root privileges
+RESTRICT="test"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion=enabled
+		-Dman=enabled
+		-Dtests=false
+		-Dzsh_completion=enabled
+		$(meson_feature selinux)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use suid; then
+		chmod u+s "${ED}"/usr/bin/bwrap
+	fi
+}
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch
new file mode 100644
index 000000000000..0b703a41d2e6
--- /dev/null
+++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-efi_ld_override.patch
@@ -0,0 +1,26 @@
+--- a/efi/meson.build
++++ b/efi/meson.build
+@@ -1,6 +1,7 @@
+ generate_sbat = find_program('generate_sbat.py', native: true)
+ generate_binary = find_program('generate_binary.py', native: true)
+ 
++efi_ld = get_option('efi-ld')
+ efi_ldsdir = get_option('efi-ldsdir')
+ efi_incdir = get_option('efi-includedir')
+ 
+@@ -226,7 +227,7 @@
+ so = custom_target('fwup.so',
+                    input : [o_file1, o_file2, o_file3, o_file4, o_file5],
+                    output : 'fwup.so',
+-                   command : [ld, '-o', '@OUTPUT@'] +
++                   command : [efi_ld, '-o', '@OUTPUT@'] +
+                              efi_ldflags + ['@INPUT@'] +
+                              ['-lefi', '-lgnuefi', libgcc_file_name],
+                    depends: fwupd_so_deps)
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
++option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules')
+ option('efi-libdir', type : 'string', description : 'path to the EFI lib directory')
+ option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory')
+ option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory')
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
index d90dd1db3a4e..a10efcfde644 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit meson python-any-r1
+inherit meson python-any-r1 toolchain-funcs
 
 DESCRIPTION="EFI executable for fwupd"
 HOMEPAGE="https://fwupd.org"
@@ -31,6 +31,10 @@ DEPEND="sys-boot/gnu-efi"
 
 RDEPEND="!<sys-apps/fwupd-1.6.0"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-efi_ld_override.patch	# Bug #892339
+)
+
 python_check_deps() {
 	python_has_version "dev-python/pefile[${PYTHON_USEDEP}]"
 }
@@ -43,6 +47,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${EPREFIX}"/usr/$(get_libdir)
 		-Defi_sbat_distro_id="gentoo"
 		-Defi_sbat_distro_summary="Gentoo GNU/Linux"
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 4ab49339662b..4307eabb5eb0 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,6 +1,6 @@
 DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
-DIST grep-3.8.11-908f.tar.xz 1658032 BLAKE2B d217a3b15f2597e2ffd54b941aae179c038697e4b620f09a61fe3655c1ae0777186311ec2cccdbf1266b0182eede232778e19e1f9dc87d7c5621e624e3857052 SHA512 a065c0e13c3c1cf87eb7011d1dd55f6b3386e9fd21dad9262fbe6ec7e830f3955c563050ef27a485b612f620285bbe4729e326e9f2ca24e42011a1040bec3d78
-DIST grep-3.8.11-908f.tar.xz.sig 833 BLAKE2B 460e7eb98f803995de43e919cae2d01e261380fde100c4570c50304035585573c358d0154e98102aafbfdd23ce726c15a59adbdfa3922408a4dada4095be13e4 SHA512 b4d9d517746633ee1fbbd8277fb22499634163b77e320be0721d1e48c4d8f1fbc4ec63177698cdac3f7d411403f51afbf7b7e302b78ccd7cf581361eb3963277
+DIST grep-3.8.35-c860.tar.xz 1678936 BLAKE2B ad22efff54d8ee68ae8107728e35c7201c0ebffffb34c46a3234838f3d3f7858701b4f5bde737a670034a3fc0870a4232dcc025f460493bf115eebce80394ec2 SHA512 8b220d02c5cad352d1f5da14df81de98e6f6e60b7127b42308a92d78955bd49fba22f1f198b50de3c719539b482e0c927f903065b11af4eb82061df54e1cb671
+DIST grep-3.8.35-c860.tar.xz.sig 833 BLAKE2B 611424a4e4b66cdc5230b3de8bef406262f724b9a962f73f267208bc5f9f24c62b4e9060f0d0846a37e7bad2a9e6c6d6beb77c90ad97104fd7a87e2d0ebb11f2 SHA512 21a8a2beeb3dfdddf4d4bde7ee9add5af619b817bf35210c8f6f87a19755b9fb981d3dc796e2435ed2e27a835a29f73ae5a8fbe10d567efd6760a9ebc4180ea4
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
diff --git a/sys-apps/grep/grep-3.8_p20221230.ebuild b/sys-apps/grep/grep-3.8_p20221230.ebuild
deleted file mode 100644
index 8324903211cd..000000000000
--- a/sys-apps/grep/grep-3.8_p20221230.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Subscribe to the 'platform-testers' ML to find these.
-	# Useful to test on our especially more niche arches and report issues upstream.
-	MY_COMMIT="11-908f"
-	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
-	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}"/${MY_P}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+egrep-fgrep nls pcre static"
-
-# We lack dev-libs/libsigsegv[static-libs] for now
-REQUIRED_USE="static? ( !sparc )"
-
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
-	sparc? ( dev-libs/libsigsegv )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	nls? ( virtual/libintl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-grep )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	default
-
-	# bug #523898
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		-e "s:@grep@:${EPREFIX}/bin/grep:" \
-		src/egrep.sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# We used to turn this off unconditionally (bug #673524) but we now
-	# allow it for cases where libsigsegv is better for userspace handling
-	# of stack overflows.
-	# In particular, it's necessary for sparc: bug #768135
-	export ac_cv_libsigsegv=$(usex sparc)
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable nls)
-		$(use_enable pcre perl-regexp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use egrep-fgrep ; then
-		# Delete the upstream wrapper variants which warn on egrep+fgrep use
-		rm "${ED}"/bin/{egrep,fgrep} || die
-
-		into /
-		# Install egrep, fgrep which don't warn.
-		#
-		# We do this by default to avoid breakage in old scripts
-		# and such which don't expect unexpected output on stderr,
-		# we've had examples of builds failing because foo-config
-		# starts returning a warning.
-		#
-		# https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
-		newbin - egrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -E "\$@"
-		EOF
-
-		newbin - fgrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -F "\$@"
-		EOF
-	fi
-}
diff --git a/sys-apps/grep/grep-3.8_p20230227.ebuild b/sys-apps/grep/grep-3.8_p20230227.ebuild
new file mode 100644
index 000000000000..f5ffdbfa43fd
--- /dev/null
+++ b/sys-apps/grep/grep-3.8_p20230227.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Subscribe to the 'platform-testers' ML to find these.
+	# Useful to test on our especially more niche arches and report issues upstream.
+	MY_COMMIT="35-c860"
+	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+egrep-fgrep nls pcre static"
+
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
+	sparc? ( dev-libs/libsigsegv )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-grep )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	default
+
+	# bug #523898
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# We used to turn this off unconditionally (bug #673524) but we now
+	# allow it for cases where libsigsegv is better for userspace handling
+	# of stack overflows.
+	# In particular, it's necessary for sparc: bug #768135
+	export ac_cv_libsigsegv=$(usex sparc)
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use egrep-fgrep ; then
+		# Delete the upstream wrapper variants which warn on egrep+fgrep use
+		rm "${ED}"/bin/{egrep,fgrep} || die
+
+		into /
+		# Install egrep, fgrep which don't warn.
+		#
+		# We do this by default to avoid breakage in old scripts
+		# and such which don't expect unexpected output on stderr,
+		# we've had examples of builds failing because foo-config
+		# starts returning a warning.
+		#
+		# https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
+		newbin - egrep <<-EOF
+		#!/usr/bin/env sh
+		exec "${EPREFIX}/bin/grep" -E "\$@"
+		EOF
+
+		newbin - fgrep <<-EOF
+		#!/usr/bin/env sh
+		exec "${EPREFIX}/bin/grep" -F "\$@"
+		EOF
+	fi
+}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 46a99b17fbb3..7763951a20f2 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,3 +1,2 @@
 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
-DIST less-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280
-DIST less-623-beta.tar.gz 373094 BLAKE2B 661fdb129678a57ef2188b4cd89809b14eaae62b98bb8ec2394cb7b48faf10a3ccdb690f371178e9ed43548ebce1af840cb5042e9019fa747bcec2dca4158dc7 SHA512 60843c668f90ae47cdf4d10849a63481ab67af679b831cbe8955861ae9f238006322734ec3ae49d9aced7927018bf3e0d9fdab98077289b4ffc78f6075041667
+DIST less-629-beta.tar.gz 374918 BLAKE2B 0276006cf81f310a3d25add7cfaedfd678b03f99d48b75eb462fb6dda6e171c495fa6af170257fb286a35b0d6f380136c5d37b6d9a088ee08d42d4f32033afcb SHA512 5b5d7f86b0e2d00d65257b1d27511fdab21fda52f60102f7dd6c31d1314edcf75754dc9a268c03ebfe08ffc7b88f3b7cad0fa5a9504d66b11bc13f5f52cab558
diff --git a/sys-apps/less/less-618_beta.ebuild b/sys-apps/less/less-618_beta.ebuild
deleted file mode 100644
index afce93c3d215..000000000000
--- a/sys-apps/less/less-618_beta.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE=none
-WANT_LIBTOOL=none
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gwsw/less"
-	inherit git-r3
-fi
-
-inherit autotools
-
-# Releases are usually first a beta then promoted to stable if no
-# issues were found. Upstream explicitly ask "to not generally distribute"
-# the beta versions. It's okay to keyword beta versions if they fix
-# a serious bug, but otherwise try to avoid it.
-
-MY_PV=${PV/_beta/-beta}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P/?beta}
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="pcre"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre2 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	# Per upstream README to prepare live build
-	[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
-	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
-	# https://bugs.gentoo.org/870412
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-623_beta.ebuild b/sys-apps/less/less-623_beta.ebuild
deleted file mode 100644
index 84957e8eccd9..000000000000
--- a/sys-apps/less/less-623_beta.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE=none
-WANT_LIBTOOL=none
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gwsw/less"
-	inherit git-r3
-fi
-
-inherit autotools
-
-# Releases are usually first a beta then promoted to stable if no
-# issues were found. Upstream explicitly ask "to not generally distribute"
-# the beta versions. It's okay to keyword beta versions if they fix
-# a serious bug, but otherwise try to avoid it.
-
-MY_PV=${PV/_beta/-beta}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P/?beta}
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="pcre"
-# As of 623_beta, lesstest is not included in dist tarballs
-RESTRICT="test"
-
-DEPEND="
-	>=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:=
-	pcre? ( dev-libs/libpcre2 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	# Per upstream README to prepare live build
-	[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
-	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
-	# https://bugs.gentoo.org/870412
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check VERBOSE=1
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-629_beta.ebuild b/sys-apps/less/less-629_beta.ebuild
new file mode 100644
index 000000000000..3dc457ca05ff
--- /dev/null
+++ b/sys-apps/less/less-629_beta.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE=none
+WANT_LIBTOOL=none
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gwsw/less"
+	inherit git-r3
+fi
+
+inherit autotools
+
+# Releases are usually first a beta then promoted to stable if no
+# issues were found. Upstream explicitly ask "to not generally distribute"
+# the beta versions. It's okay to keyword beta versions if they fix
+# a serious bug, but otherwise try to avoid it.
+
+MY_PV=${PV/_beta/-beta}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P/?beta}
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+SLOT="0"
+if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="pcre"
+# As of 623_beta, lesstest is not included in dist tarballs
+# https://github.com/gwsw/less/issues/344
+RESTRICT="test"
+
+DEPEND="
+	>=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:=
+	pcre? ( dev-libs/libpcre2 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	# Per upstream README to prepare live build
+	[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
+	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
+	# https://bugs.gentoo.org/870412
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre2 posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild
index 84957e8eccd9..3dc457ca05ff 100644
--- a/sys-apps/less/less-9999.ebuild
+++ b/sys-apps/less/less-9999.ebuild
@@ -27,9 +27,12 @@ S="${WORKDIR}"/${MY_P/?beta}
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
 IUSE="pcre"
 # As of 623_beta, lesstest is not included in dist tarballs
+# https://github.com/gwsw/less/issues/344
 RESTRICT="test"
 
 DEPEND="
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index b89584ac9ba6..8b08676d77bf 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1 +1,2 @@
 DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
+DIST lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz 2482679 BLAKE2B 00cc7512a020e05577d82b6ab528524f929ef51455502eb8d9abbb3a2f75cac25d837a888ecf1e55a9c4251bb6515aedf4586da0c3f2f6b587ff0413acda3865 SHA512 d0ea5706850a07bbc82c627ce25a2774bbda6f565e259136d89774ec5e85770d8c2373ead46f6f7b1586c85aebdf1383b7ae1539b3f2f9d1b33fa777bc5589f5
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
new file mode 100644
index 000000000000..f190fc882373
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca es fr"
+
+inherit desktop flag-o-matic plocale toolchain-funcs xdg
+
+MY_COMMIT=42fef565731411a784101de614a54bff79d1858e
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
+
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk !sqlite )"
+
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/hwdata
+	gtk? ( x11-libs/gtk+:3 )
+	sqlite? ( dev-db/sqlite:3 )"
+BDEPEND="gtk? ( virtual/pkgconfig )
+	sqlite? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
+
+PATCHES=( "${FILESDIR}"/lshw-02.19.2b-respect-LDFLAGS.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes "src/po" "" ".po" || die
+	sed -i \
+		-e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
+		src/po/Makefile || die
+	sed -i \
+		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
+		-e 's:+\?make -C:${MAKE} -C:' \
+		-e '/^CXXFLAGS/s:=-g: +=:' \
+		-e '/^CXXFLAGS/s:-g ::' \
+		-e '/^LDFLAGS/s: -g::' \
+		-e '/^all:/s: $(DATAFILES)::' \
+		-e '/^install:/s: all::' \
+		src/Makefile src/gui/Makefile || die
+	sed -i \
+		-e '/^CXXFLAGS/s:\?=-g: +=:' \
+		-e '/^LDFLAGS=/d' \
+		src/core/Makefile || die
+	sed -i \
+		-e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/hwdata/pci.ids":' \
+		src/core/pci.cc || die
+	sed -i \
+		-e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/hwdata/usb.ids":' \
+		src/core/usb.cc || die
+}
+
+src_compile() {
+	tc-export CC CXX AR PKG_CONFIG
+	use static && append-ldflags -static
+
+	# Need two sep make statements to avoid parallel build issues. #588174
+	local sqlite=$(usex sqlite 1 0)
+	emake VERSION=${MY_PV} SQLITE=${sqlite} all
+	use gtk && emake SQLITE=${sqlite} gui
+}
+
+src_install() {
+	emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+	if use gtk ; then
+		newicon -s scalable src/gui/artwork/logo.svg lshw.svg
+		make_desktop_entry \
+			"${EPREFIX}"/usr/sbin/gtk-lshw \
+			"${DESCRIPTION}"
+	fi
+}
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index d64f2f0d3445..70b13dff8acc 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -1,2 +1,4 @@
 DIST moar-1.11.4-deps.tar.xz 25976728 BLAKE2B b1686e6608c8f27afa8704f7158a3d48482a580d8738389af78010a8d33c318152f6155b7c7be42058695653457eab75edb75905614c874f8a5ef15961b6689e SHA512 84b92f2b7d6b0cbc885e5486ca0d1051e3f3febe6a74e1e3afb11193c4b045dac28311d1f8f3a70eb996780c981f3f935174e2885c177c6a5f2c08c622b36fb5
 DIST moar-1.11.4.tar.gz 2777910 BLAKE2B 7d192436c3c53200d8d29e7251d3f73b825b2a9364341d53d3b5a594d93c10bb5b1db4d9658adbce57d9fa111b140bd354c84211b776eb48fd2f27bda0f6dc77 SHA512 56fac97a8b897b4e9d086088153816b98b45897d4ddec173fbe25f8b3526207d7a3f8f7d5821dc1fc243acfad701c2920c6d4b68cdf513984bdcf5fbc4112268
+DIST moar-1.12.0-deps.tar.xz 26291664 BLAKE2B ebc16cbe23c26eacd84376b6e99d7484c753a065edd26d3d0ed7708595de61d6038f53f27c1bdc05032576eb11be3e2cbedbf9bdd2ecf8f8d467fd89eaf0a580 SHA512 dfd236a76bf4bb680b25a938e08bbd6874a554e9668f73af23d695c20403d1967f89fbeebfd54bb333bd86a7ca3e652a8418c6b9ada212aeb861cce4a70f0faf
+DIST moar-1.12.0.tar.gz 2777752 BLAKE2B fa2f442e2b0e6d909e77be8df873c7b08a82b43d881583a7f1c4a3591f2bbe90b5adc77524b92e0fcf071ce4a1c18d8c58c7cce18807974fae7342148d7fbe28 SHA512 bfa15f5fd3ffa4146adec9110fbf8fd3bc31c95877f5e24ab911d1ef9e357dd41b46e2f466f2ce7d2fc986e463dcf2e1132c0a42ebfe2c46a8cd216355c4b98b
diff --git a/sys-apps/moar/moar-1.12.0.ebuild b/sys-apps/moar/moar-1.12.0.ebuild
new file mode 100644
index 000000000000..766ab4317b72
--- /dev/null
+++ b/sys-apps/moar/moar-1.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A pager designed to do the right thing without any configuration"
+HOMEPAGE="https://github.com/walles/moar"
+SRC_URI=" https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!dev-lang/moarvm"
+
+src_compile() {
+	# https://github.com/walles/moar/blob/master/build.sh#L28
+	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
+}
+
+src_test() {
+	# From test.sh (we don't run that because it has some linting etc)
+	ego test -timeout 20s ./...
+}
+
+src_install() {
+	dobin moar
+	doman moar.1
+	einstalldocs
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 0613dfb5d1de..0e8c41564cb8 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,3 +1,4 @@
 DIST pkgcore-0.12.17.tar.gz 615375 BLAKE2B 9aabdeead2997e53ee3c966c908a231ff5e3b85422844538f47ff7bed03611459224ad7e931a9e94f0e376f221bd5c54f0f77f7883543cbd5b03c4dba6ba591b SHA512 9bad9b6e6177873b9187cff66b6b51c644a59a2d9f01b8ca110bc49006d6f0221c2c3b145d7cf5cec6f3c7526b6751100d56df13350b674a68ab5bbf19f10131
 DIST pkgcore-0.12.18.tar.gz 630331 BLAKE2B a3be66c1af3b455733cadfeb0117f37593187dda3d8653532a5f32b6292e9350363514b3d6bf0fcd10b32187b5f257f90985cd752739998bfe4d2f6aa2cab2c7 SHA512 c8ca97cd27f5ba37f6baa160e1a387789e1477ca689e477e9f3f68cb8acd1a27b9fb9f77f3eb11e0babad7461f0c27ce08ec619abfd4c259fdcfd203ec325dc0
 DIST pkgcore-0.12.19.tar.gz 631185 BLAKE2B e088e187bb261c2db29d3d2b830a71552dc8982f30ca6e82baff325fae2c00168f10228145588a05ce0c0fa9aa773206acfecf1c831482917b4e3ca386dfb097 SHA512 9fd6c86370dea4c67a31551216b6d372ae0793c5122472a56a103c42029268dc2c0a23b5071d3fefb6bbea73f5e590a1f03b81d2c63e51a0275c18c3082e92dd
+DIST pkgcore-0.12.20.tar.gz 629420 BLAKE2B d98f992fd37bb6487aaaab39dd15101bddabb24597c2ea05cdf29f3024f0362609701315e3683ac67ce0e5bb64ebc4e348a65f4e74925456bff8c197149c179f SHA512 9ceb254998a522b4a1d519798e6ebb0ea728a20c6d9e5a9e9da7dde0916cf5746b9d22093b5b14b21ccdd177f5e4d23e6c8d069230685bc4476d5a07478aae4d
diff --git a/sys-apps/pkgcore/pkgcore-0.12.20.ebuild b/sys-apps/pkgcore/pkgcore-0.12.20.ebuild
new file mode 100644
index 000000000000..d3729011c276
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.20.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git
+		https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e7cafaec4bb1..a99559657375 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691
 DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0 SHA512 d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e
+DIST portage-3.0.45.1.tar.bz2 1146037 BLAKE2B 562900b41684a4da3b10a91d796e91b75d631267145c36f0e46d0b3bc749b2e88bbc7e20c4a3c1a8cba74e8bfb25dc1ffc9ffd481ec11a2a2e1d23f9cae770a3 SHA512 961630cd0959001a841d62b3a293458442aeb7725241d6808d4052dd47209bf5d0abdf229a48013d91f9c441349075117747229639a1228fccd5bf6f75e947fd
diff --git a/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch b/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch
new file mode 100644
index 000000000000..a621ab65d719
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch
@@ -0,0 +1,29 @@
+From eca90b6049a9ce42ec6868f64abcab403c9f4190 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 28 Feb 2023 03:10:26 +0000
+Subject: [PATCH] install-qa-check.d/90config-impl-decl: prefix warning with
+ 'QA Notice'
+
+... so tinderboxes can pick it up more easily.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/install-qa-check.d/90config-impl-decl
++++ b/bin/install-qa-check.d/90config-impl-decl
+@@ -92,12 +92,13 @@ config_impl_decl_check() {
+ 	# Drop out early if no impl decls found (all the arrays are the same size)
+ 	[[ ${#files[@]} -eq 0 ]] && return
+ 
+-	eqawarn 'Found the following implicit function declarations in configure logs:'
++	eqawarn 'QA Notice: Found the following implicit function declarations in configure logs:'
+ 	for l in "${!files[@]}"; do
+ 		eqawarn "  ${files[l]}:${lines[l]} - ${funcs[l]}"
+ 		eqatag 'config.log-impl-decl' "line=${lines[l]}" "func=${funcs[l]}" "${files[l]}"
+ 	done
+ 	eqawarn 'Check that no features were accidentally disabled.'
++	eqawarn 'See https://wiki.gentoo.org/wiki/Modern_C_porting.'
+ }
+ 
+ config_impl_decl_check
+-- 
+2.39.2
+
diff --git a/sys-apps/portage/portage-3.0.45.1-r2.ebuild b/sys-apps/portage/portage-3.0.45.1-r2.ebuild
new file mode 100644
index 000000000000..b345f442048e
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.45.1-r2.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )
+"
+DEPEND="
+	!build? ( $(python_gen_impl_dep '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[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+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-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20220101
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=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_USEDEP}] )
+	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
+"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-qa-notice-configure-func-decl.patch
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+	fi
+
+	cd "${S}/cnf" || die
+	if [[ -f "make.conf.example.${ARCH}".diff ]] ; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 3eac8033c3bd..fb5130b9482e 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -151,10 +151,6 @@ python_prepare_all() {
 				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
 				-i cnf/repos.conf || die "sed failed"
 		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
 	fi
 
 	cd "${S}/cnf" || die
diff --git a/sys-apps/systemd/files/systemd-253-initrd-generators.patch b/sys-apps/systemd/files/systemd-253-initrd-generators.patch
new file mode 100644
index 000000000000..60e7b29d7a1f
--- /dev/null
+++ b/sys-apps/systemd/files/systemd-253-initrd-generators.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/896364
+
+Workaround for bug in sys-kernel/dracut.
+
+From 6b25470ee28843a49c50442e9d8a98edc842ceca Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 20 Feb 2023 12:00:30 +0900
+Subject: [PATCH] core/manager: run generators directly when we are in initrd
+
+Some initrd system write files at ourside of /run, /etc, or other
+allowed places. This is a kind of workaround, but in most cases, such
+sandboxing is not necessary as the filesystem is on ramfs when we are in
+initrd.
+
+Fixes #26488.
+---
+ src/core/manager.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 7b394794b0d4..306477c6e6c2 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -3822,8 +3822,8 @@ static int manager_run_generators(Manager *m) {
+         /* If we are the system manager, we fork and invoke the generators in a sanitized mount namespace. If
+          * we are the user manager, let's just execute the generators directly. We might not have the
+          * necessary privileges, and the system manager has already mounted /tmp/ and everything else for us.
+-         */
+-        if (MANAGER_IS_USER(m)) {
++         * If we are in initrd, let's also execute the generators directly, as we are in ramfs. */
++        if (MANAGER_IS_USER(m) || in_initrd()) {
+                 r = manager_execute_generators(m, paths, /* remount_ro= */ false);
+                 goto finish;
+         }
diff --git a/sys-apps/systemd/systemd-253-r1.ebuild b/sys-apps/systemd/systemd-253-r1.ebuild
new file mode 100644
index 000000000000..cb638034f21f
--- /dev/null
+++ b/sys-apps/systemd/systemd-253-r1.ebuild
@@ -0,0 +1,507 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{9..11} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib pam
+inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-253-initrd-generators.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	local -x COLUMNS=80
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+	local sbin=$(usex split-usr sbin bin)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,shutdown} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils && use split-usr; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib usr/sbin; do
+			if [[ ! -L ${EROOT}/${dir} ]]; then
+				eerror "'${EROOT}/${dir}' is not a symbolic link."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-253.ebuild b/sys-apps/systemd/systemd-253.ebuild
deleted file mode 100644
index 77c9145b2914..000000000000
--- a/sys-apps/systemd/systemd-253.ebuild
+++ /dev/null
@@ -1,506 +0,0 @@
-# Copyright 2011-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://systemd.io/"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
-	acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
-	dns-over-tls? ( || ( gnutls openssl ) )
-	homed? ( cryptsetup pam openssl )
-	importd? ( curl lzma || ( gcrypt openssl ) )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
-	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	iptables? ( net-firewall/iptables:0= )
-	openssl? ( >=dev-libs/openssl-1.1.0:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? (
-		sec-policy/selinux-base-policy[systemd]
-		sec-policy/selinux-ntp
-	)
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
-			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-
-		if kernel_is -ge 5 10 20; then
-			CONFIG_CHECK+=" ~KCMP"
-		else
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		fi
-
-		if kernel_is -ge 4 18; then
-			CONFIG_CHECK+=" ~AUTOFS_FS"
-		else
-			CONFIG_CHECK+=" ~AUTOFS4_FS"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-journald-audit-r1.patch"
-		)
-	fi
-
-	# Fails with split-usr.
-	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		$(meson_use split-usr)
-		$(meson_use split-usr split-bin)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Disable compatibility with sysvinit
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		$(meson_native_use_bool gnutls)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool iptables libiptc)
-		$(meson_native_use_bool openssl)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	local -x COLUMNS=80
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-	local sbin=$(usex split-usr sbin bin)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,shutdown} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils && use split-usr; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib usr/sbin; do
-			if [[ ! -L ${EROOT}/${dir} ]]; then
-				eerror "'${EROOT}/${dir}' is not a symbolic link."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild
index f614835c865b..ae549597222c 100644
--- a/sys-apps/util-linux/util-linux-2.38.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild
@@ -19,7 +19,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index c39d1b65c47b..3b3b9800605a 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild
index bfb9799aa94f..ccf1c56b1085 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.12-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="debug kerberos +pam pynslcd sasl test +utils"
 REQUIRED_USE="
 	utils? ( ${PYTHON_REQUIRED_USE} )
diff --git a/sys-auth/solo1/solo1-0.1.1-r1.ebuild b/sys-auth/solo1/solo1-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..bd6a6de61f44
--- /dev/null
+++ b/sys-auth/solo1/solo1-0.1.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=flit
+
+inherit distutils-r1
+
+DESCRIPTION="CLI and Python library for SoloKeys Solo 1"
+HOMEPAGE="https://github.com/solokeys/solo1-cli"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND=">=dev-python/click-7.1.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
+	dev-python/intelhex[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		local ver
+		for ver in ${REPLACING_VERSIONS}; do
+			if ver_test ${ver} -lt 0.1.1; then
+				ewarn "Note that since version 0.1.1 the CLI executable is called '${PN}' rather than 'solo'"
+				ewarn "The old name can still be used for now but is deprecated"
+				break
+			fi
+		done
+	fi
+}
diff --git a/sys-auth/ssh-import-id/metadata.xml b/sys-auth/ssh-import-id/metadata.xml
index fd9ff4351985..77b851e114a2 100644
--- a/sys-auth/ssh-import-id/metadata.xml
+++ b/sys-auth/ssh-import-id/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Piotr Karbowski</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="launchpad">ssh-import-id</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild b/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild
new file mode 100644
index 000000000000..5e367ecf4375
--- /dev/null
+++ b/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to securely retrieve an SSH public key and install it locally"
+HOMEPAGE="https://launchpad.net/ssh-import-id"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	doman usr/share/man/man1/ssh-import-id.1
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 94185f8ff939..5fa070e290fc 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest
index f4f1e0773555..f6b9352e6773 100644
--- a/sys-block/ndctl/Manifest
+++ b/sys-block/ndctl/Manifest
@@ -1,3 +1,4 @@
 DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b27251d1b8a472d8c7705d671acbd6bf646f737baf8556d8fda39db68242f44e11225d7305e95f5d2ec5931f31 SHA512 92fb06ca64455775ce0b89ba0846f70235e02fe3502e2a8a55a858f76f87cb90ae98f5bf01620e5884f667ea78ee2bee2cd9e7a85ffa8f8d9c456e9282ca9ebc
 DIST ndctl-72.1.tar.gz 365324 BLAKE2B 2e061bd1357c0b422f728e8624106d93e9eed2f5c7795428b0c61d041ab45569aa8bb6eb52544360ad538be85f3b7f84f8c9ab1037a8ca5498c2e1a13fa22186 SHA512 7304e23121c99457fa6e22a399fb636f6a66d6d07b090463ec41e424687b06e7e8a1a18623ab9dd5783aaccfa09ff964e3477b63aaa4614ac60f6e6050452f12
 DIST ndctl-75.tar.gz 415393 BLAKE2B f9081b09c2f4ad8a6bc9c53e792b8a49992c7089af09e39917efe0fceea800d81665a31bf14c8e2f6f83c57d1dccebb4513b9bb556a3e81c19c75fbc67e1d7e3 SHA512 0af960e43a363711fbdb5152bb670022bd9b2f6a269c153dd88dca4ad2dcc215679c354ebcc758e9376867462f82c21aebe62bc62ca27333dedf3a818f34b272
+DIST ndctl-76.1.tar.gz 419651 BLAKE2B 52fdbb382a32005873e3be46d3c9b21c80e9ad53b5852c32d73d0ee966c61890d598d2b8d03fd0aa090970e5746daf52e91e70b9a79b328f1a2137a37bfb61a1 SHA512 76d32599df029969734276f8972f3f4bf701e471117c8a48d1f96b62c87a59ac54d59104ee62d1cbbb518a06a779677ca856df32ce6218d758a8c73daa3e5b06
diff --git a/sys-block/ndctl/metadata.xml b/sys-block/ndctl/metadata.xml
index bd6443d4a375..0c16d62874c0 100644
--- a/sys-block/ndctl/metadata.xml
+++ b/sys-block/ndctl/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<use>
+		<flag name="libtracefs">Use <pkg>dev-libs/libtracefs</pkg> to build cxl-monitor binary</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-block/ndctl/ndctl-76.1.ebuild b/sys-block/ndctl/ndctl-76.1.ebuild
new file mode 100644
index 000000000000..e080d73a7e20
--- /dev/null
+++ b/sys-block/ndctl/ndctl-76.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev meson bash-completion-r1
+
+DESCRIPTION="Helper tools and libraries for managing non-volatile memory on Linux"
+HOMEPAGE="https://github.com/pmem/ndctl"
+SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libtracefs systemd test"
+
+DEPEND="
+	dev-libs/iniparser:0=
+	dev-libs/json-c:=
+	sys-apps/keyutils:=
+	sys-apps/kmod:=
+	sys-apps/util-linux:=
+	virtual/libudev:=
+	libtracefs? ( dev-libs/libtracefs:= )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+# tests require root access
+RESTRICT+=" test"
+
+DOCS=(
+	README.md
+	CONTRIBUTING.md
+)
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_feature systemd)
+		$(meson_feature libtracefs)
+		$(meson_feature doc docs)
+		-Dasciidoctor=disabled
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Drootprefix=/usr
+		-Drootlibdir="/usr/$(get_libdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# upstream doesn't install udev rules unless using systemd
+	use systemd || udev_dorules daxctl/90-daxctl-device.rules
+
+	bashcomp_alias ndctl daxctl
+	bashcomp_alias ndctl cxl
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-block/parted/parted-3.5.ebuild b/sys-block/parted/parted-3.5.ebuild
index 73ef2c77cd67..aab692fab586 100644
--- a/sys-block/parted/parted-3.5.ebuild
+++ b/sys-block/parted/parted-3.5.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bcl.asc
-inherit verify-sig
+
+inherit autotools verify-sig
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="https://www.gnu.org/software/parted/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+SRC_URI="
+	mirror://gnu/${PN}/${P}.tar.xz
+	verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -44,8 +47,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.4-posix-printf.patch
 )
 
+# false positive
+QA_CONFIG_IMPL_DECL_SKIP="MIN"
+
 src_prepare() {
 	default
+	eautoconf
 
 	touch doc/pt_BR/Makefile.in || die
 }
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 237332ffef7d..af099cc34300 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,4 +1,2 @@
-DIST tgt-1.0.83.tar.gz 304631 BLAKE2B 64374e3ffa0fd73f25172e24b233d001dc2b70cbc08116f167de9d625d493dca330e84f73683d6cc74ea76f5bd9fa940cec54d43ebc9c41ed1ff54f5dc3a6e39 SHA512 0c97900aada010b84585a7ad2b1c4654db0fdbc4caed1dea05d00518340b23691ba91f4bb3c677b420a3f4e67f4b061055f877c050ea1d758f2ebb75771b1cf5
-DIST tgt-1.0.84.tar.gz 304641 BLAKE2B d5a28547ba637d951b4096ae3e2b49794aac0a7e517f185331fdfa7df9a1715ce82d498f88538fe08a71ba3958a6972251dbebafdddfeb649318c2ff13a72f95 SHA512 a194d95fac7c4525b22257af3977b1ca680d81bbf1aa4c75444f30a6d8d8db22eca3b29b2ece314fe3b0c0d18152e048c912347c9db1146c9f38419be5116971
 DIST tgt-1.0.85.tar.gz 304648 BLAKE2B fb2c004c9e4ac614b0dfd58d5e9f641b6ca061a716cfc2c7888eb205e461178f6b04c4bbddc7abd1fc797bd6623c265bc01fc73f75b83dfa84cc35656a306f61 SHA512 847e4c4f80e9bdc46910eb9ab49a150d985a8fcdb77e67eabf5eb12845d9faafee76f9b7a5d71d5b3504205288d77fcf3e0f04e7f835ab8ad829700c13d783d4
 DIST tgt-1.0.86.tar.gz 304697 BLAKE2B 60233019e9f09dd4288ca70f398992452dc00f7a2f46d82e333a9e1bfa4fe5dcc8583da3d4ce4382b32c60b1b009dd03d36faa9770faa11222b9ec4592bd6d96 SHA512 f4e8e87691be2793c5eee9d7dc744ae3a7b47f710f559141f0533de345f727fb68223a3090282f5c51f70ea55fbf5936d81e3b08ce953b7ac48013295c32bef7
diff --git a/sys-block/tgt/tgt-1.0.83.ebuild b/sys-block/tgt/tgt-1.0.83.ebuild
deleted file mode 100644
index 43d1f60ba296..000000000000
--- a/sys-block/tgt/tgt-1.0.83.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-perl/Config-General
-	rbd? ( sys-cluster/ceph )
-	infiniband? ( sys-cluster/rdma-core )
-"
-RDEPEND="${DEPEND}
-	dev-libs/libaio
-	sys-apps/sg3_utils"
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @& all @g" doc/Makefile || die
-	sed -i -e 's|-Werror||g' usr/Makefile || die
-}
-
-src_compile() {
-	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-	use rbd && myconf="${myconf} CEPH_RBD=1"
-
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-	emake -C doc
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
-	newinitd "${FILESDIR}"/tgtd.initd tgtd
-	newconfd "${FILESDIR}"/tgtd.confd tgtd
-	systemd_dounit "${S}"/scripts/tgtd.service
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.84.ebuild b/sys-block/tgt/tgt-1.0.84.ebuild
deleted file mode 100644
index 276cce8b069e..000000000000
--- a/sys-block/tgt/tgt-1.0.84.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Linux SCSI target framework (tgt)"
-HOMEPAGE="http://stgt.sourceforge.net"
-SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-IUSE="fcoe fcp ibmvio infiniband rbd"
-
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-perl/Config-General
-	rbd? ( sys-cluster/ceph )
-	infiniband? ( sys-cluster/rdma-core )
-"
-RDEPEND="${DEPEND}
-	dev-libs/libaio
-	sys-apps/sg3_utils"
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
-	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @& all @g" doc/Makefile || die
-	sed -i -e 's|-Werror||g' usr/Makefile || die
-}
-
-src_compile() {
-	local myconf
-	use ibmvio && myconf="${myconf} IBMVIO=1"
-	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
-	use fcp && myconf="${myconf} FCP=1"
-	use fcoe && myconf="${myconf} FCOE=1"
-	use rbd && myconf="${myconf} CEPH_RBD=1"
-
-	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
-	emake -C doc
-}
-
-src_install() {
-	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
-	newinitd "${FILESDIR}"/tgtd.initd tgtd
-	newconfd "${FILESDIR}"/tgtd.confd tgtd
-	systemd_dounit "${S}"/scripts/tgtd.service
-	dodir /etc/tgt
-	keepdir /etc/tgt
-}
diff --git a/sys-block/tgt/tgt-1.0.86.ebuild b/sys-block/tgt/tgt-1.0.86.ebuild
index 190b5c32a91a..2fa39d5d7845 100644
--- a/sys-block/tgt/tgt-1.0.86.ebuild
+++ b/sys-block/tgt/tgt-1.0.86.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fujita/tgt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 DEPEND="
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index ade1dd72a9c2..14daeaa1fbb1 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch b/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch
new file mode 100644
index 000000000000..1f5041047a59
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch
@@ -0,0 +1,18 @@
+From 9ce60348a5401fe58b6fd7333d3d7e19f0d6d8ac Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Wed, 8 Feb 2023 12:32:11 +0000
+Subject: [PATCH] Add missing header for std::intmax_t
+
+--- a/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
++++ b/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
+@@ -18,6 +18,7 @@
+ #include <hpx/type_support/lazy_conditional.hpp>
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <iterator>
+ #include <type_traits>
+ 
+-- 
+2.39.2
+
diff --git a/sys-cluster/hpx/hpx-1.8.1.ebuild b/sys-cluster/hpx/hpx-1.8.1.ebuild
index 3de266f8b503..a875850567d3 100644
--- a/sys-cluster/hpx/hpx-1.8.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.8.1.ebuild
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.0-python.patch"
+	"${FILESDIR}/${PN}-1.8.1-fix-intmax-error.patch"
 )
 
 hpx_memory_requirement() {
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0929981c389f..d7060a42848a 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/clang-common/clang-common-16.0.0_rc2.ebuild b/sys-devel/clang-common/clang-common-16.0.0_rc2.ebuild
deleted file mode 100644
index 3c407f5a1af6..000000000000
--- a/sys-devel/clang-common/clang-common-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~loong"
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind )
-		!llvm-libunwind? ( sys-libs/libunwind )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	dodir /usr/include/gentoo
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-		#ifndef _FORTIFY_SOURCE
-			#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
-				#define _FORTIFY_SOURCE ${fortify_level}
-			#endif
-		#endif
-	EOF
-
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			-D_LIBCPP_ENABLE_ASSERTIONS=1
-		EOF
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230211.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230211.ebuild
deleted file mode 100644
index be17e87b775a..000000000000
--- a/sys-devel/clang-common/clang-common-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind )
-		!llvm-libunwind? ( sys-libs/libunwind )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	dodir /usr/include/gentoo
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-		#ifndef _FORTIFY_SOURCE
-			#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
-				#define _FORTIFY_SOURCE ${fortify_level}
-			#endif
-		#endif
-	EOF
-
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			-D_LIBCPP_ENABLE_ASSERTIONS=1
-		EOF
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230218.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230218.ebuild
deleted file mode 100644
index be17e87b775a..000000000000
--- a/sys-devel/clang-common/clang-common-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind )
-		!llvm-libunwind? ( sys-libs/libunwind )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	dodir /usr/include/gentoo
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-		#ifndef _FORTIFY_SOURCE
-			#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
-				#define _FORTIFY_SOURCE ${fortify_level}
-			#endif
-		#endif
-	EOF
-
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			-D_LIBCPP_ENABLE_ASSERTIONS=1
-		EOF
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.0_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.0_rc2.ebuild
deleted file mode 100644
index b4fc2669d5d7..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-KEYWORDS="~loong"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230211.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 67b42357665e..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230218.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 67b42357665e..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index b042f05e1b57..54a74bc2f1be 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,10 +6,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild
index df441961397a..4c59778e088a 100644
--- a/sys-devel/clang/clang-16.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
@@ -270,6 +270,10 @@ multilib_src_configure() {
 
 		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
 
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
 		# libgomp support fails to find headers without explicit -I
 		# furthermore, it provides only syntax checking
diff --git a/sys-devel/clang/clang-16.0.0_rc2.ebuild b/sys-devel/clang/clang-16.0.0_rc2.ebuild
deleted file mode 100644
index c6e614f2973f..000000000000
--- a/sys-devel/clang/clang-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~loong"
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing
-	llvm/utils
-	third-party
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-17.0.0.9999.ebuild b/sys-devel/clang/clang-17.0.0.9999.ebuild
index df441961397a..4c59778e088a 100644
--- a/sys-devel/clang/clang-17.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-17.0.0.9999.ebuild
@@ -270,6 +270,10 @@ multilib_src_configure() {
 
 		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
 
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
 		# libgomp support fails to find headers without explicit -I
 		# furthermore, it provides only syntax checking
diff --git a/sys-devel/clang/clang-17.0.0_pre20230211.ebuild b/sys-devel/clang/clang-17.0.0_pre20230211.ebuild
deleted file mode 100644
index c05b36a1d940..000000000000
--- a/sys-devel/clang/clang-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing
-	llvm/utils
-	third-party
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-17.0.0_pre20230218.ebuild b/sys-devel/clang/clang-17.0.0_pre20230218.ebuild
deleted file mode 100644
index c05b36a1d940..000000000000
--- a/sys-devel/clang/clang-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing
-	llvm/utils
-	third-party
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4e12647a22e5..3ed496c652ac 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -23,6 +23,7 @@ DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131
 DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349
 DIST gcc-12-20230211.tar.xz 79698020 BLAKE2B 0de8d0b8f8823276fc7b0c70225a1c957455645cafd9c46ab8d3cd80d4e641a0d48df03a9d1d5206fde65e9f0dca09a481311b9b68a7993899e4060d44e08cf6 SHA512 6ae3979cfff1376ba2ea639d9a01428e55a67a2cc6582bc77a476b050bfd3ba00e078907067b74a1f59188014febc3fd1e4c5e98fae00421e0c82c9db54f1028
 DIST gcc-12-20230218.tar.xz 79705112 BLAKE2B 28b230d4e66f773a6ea32a3112f66c81ffb787f16ba1c36d3d4d2498b03031a9dbe3c2aefb40b07aab1eca64a32636c1cff2497eae996565d633fa1d70ac890e SHA512 bf2b109a12a981ae97ca4c6d9a27b11adcf1c7acaf167c532936a027dad4217e75b197fd12b2c5e37f6e89fe39a54f483984023accfb76f7517cc3d35ced416a
+DIST gcc-12-20230225.tar.xz 79694748 BLAKE2B 13684d572c3077740639ea10fed3cabf4473cb1913e9e3d90f4d40dad2e1e5d46b12d66fdf864367c4f4bd6a92009b1a11daf1635ed94c6aa5d8c758c36a79a5 SHA512 25889487fe3a03dc4fcce80c6048ef02453aaa0770662b078e1fd4a3c2aaebb8fdf2b77a0898abdb42b2ea1e3ebc03ac720595ddcc22a64a6bf910cf2ece4e16
 DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
@@ -31,6 +32,7 @@ DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfb
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20230212.tar.xz 83949608 BLAKE2B 2c794044b6dc220b109bcb86ed1315f9413ef86e399b7062c4cb918d6ca7eede34db947c854d670201a25034471f57b9feaf2c23ea8f9714d272a1678311966d SHA512 2ed0656ab75abe5aa60f087c1ce5a2e41395cb5d827279d4d67192e6b9e85890849e42982e7b89b89ff5eaf6a81aef292ccf618f29a8b9ccb2d6a8bd56dc76f9
 DIST gcc-13-20230219.tar.xz 84151776 BLAKE2B 3fe1c7926e95072c28374f32eecb4c88cdc04d73e1462de3b560249f5fd7795d0ca911219061386e43114c391f0f9b145bdcc05c8b5c6b267462dd290111ab7e SHA512 7d94e71e7608693569908d24ae7e8648a9d11fbfd366e21a802b9e24294ff8e214802e23b47c7030d41e1273dfae052d125a7634a02cc1f7999c5fd17a6cd3a1
+DIST gcc-13-20230226.tar.xz 84264388 BLAKE2B fea763a1627bff19eb0f7869b83c00337dc2a203178d17143c98c2c1d3fd385d2f853f195ff79ecc1cae659a1f8704c88e7fd77456eed4510bdcba7631e49353 SHA512 38de82dd54e1b57490f5492a4adcd05b9da3ace2235654dff19bade8d378e75be1495f3b2b4e7f7e57ea144351c4ade1e9a5b141546259024f0359f43b2025ac
 DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
 DIST gcc-13.1.0-patches-8.tar.xz 11644 BLAKE2B aaa135a7d22badc22eeba42fe92c2de40e1a779836f42b5ba15884ad3d756020421b99e29b9a27f40368013fb9d8348e3ca1ef3541a6de55129d66f4645caf8f SHA512 a71ef0f215451c840a99d7100489e8364e4e7a71d83e9be42e35fb06d4276afadb64834801ef3469a4edb78eede5a03c18104215fef3039f98da3b3d0c8e69af
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230225.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230225.ebuild
new file mode 100644
index 000000000000..3a7a472a2f2f
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.1_p20230225.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="13"
+PATCH_GCC_VER="12.2.0"
+MUSL_VER="7"
+MUSL_GCC_VER="12.2.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild
new file mode 100644
index 000000000000..6b843430b057
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="8"
+PATCH_GCC_VER="13.1.0"
+MUSL_VER="1"
+MUSL_GCC_VER="13.1.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=$(($(ver_cut 3) - 9998))
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=master
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~loong"
+fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
index e7f594906b2e..9bbd3f845475 100644
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *_rc* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/lld/lld-16.0.0_rc2.ebuild b/sys-devel/lld/lld-16.0.0_rc2.ebuild
deleted file mode 100644
index d22c1fb13951..000000000000
--- a/sys-devel/lld/lld-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-17.0.0_pre20230211.ebuild b/sys-devel/lld/lld-17.0.0_pre20230211.ebuild
deleted file mode 100644
index d22c1fb13951..000000000000
--- a/sys-devel/lld/lld-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-17.0.0_pre20230218.ebuild b/sys-devel/lld/lld-17.0.0_pre20230218.ebuild
deleted file mode 100644
index d22c1fb13951..000000000000
--- a/sys-devel/lld/lld-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/llvm-common/llvm-common-16.0.0_rc2.ebuild b/sys-devel/llvm-common/llvm-common-16.0.0_rc2.ebuild
deleted file mode 100644
index 54af5bde6db7..000000000000
--- a/sys-devel/llvm-common/llvm-common-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~loong"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230211.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230211.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230218.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230218.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index b042f05e1b57..54a74bc2f1be 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -6,10 +6,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
index fcb512276fe7..d05904f7192f 100644
--- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
@@ -360,6 +360,8 @@ multilib_src_configure() {
 		-DLLVM_ENABLE_LIBXML2=$(usex xml)
 		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
 		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
 		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
 		-DLLVM_ENABLE_ZSTD=$(usex zstd)
 
diff --git a/sys-devel/llvm/llvm-16.0.0_rc2.ebuild b/sys-devel/llvm/llvm-16.0.0_rc2.ebuild
deleted file mode 100644
index d0d485fe9e5e..000000000000
--- a/sys-devel/llvm/llvm-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs flag-o-matic
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~loong"
-IUSE="
-	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
-	xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake )
-LLVM_TEST_COMPONENTS=( third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-remark-size-diff
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZSTD=$(usex zstd)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-17.0.0.9999.ebuild b/sys-devel/llvm/llvm-17.0.0.9999.ebuild
index fcb512276fe7..d05904f7192f 100644
--- a/sys-devel/llvm/llvm-17.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-17.0.0.9999.ebuild
@@ -360,6 +360,8 @@ multilib_src_configure() {
 		-DLLVM_ENABLE_LIBXML2=$(usex xml)
 		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
 		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
 		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
 		-DLLVM_ENABLE_ZSTD=$(usex zstd)
 
diff --git a/sys-devel/llvm/llvm-17.0.0_pre20230211.ebuild b/sys-devel/llvm/llvm-17.0.0_pre20230211.ebuild
deleted file mode 100644
index fcb512276fe7..000000000000
--- a/sys-devel/llvm/llvm-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs flag-o-matic
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
-	xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake )
-LLVM_TEST_COMPONENTS=( third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-remark-size-diff
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZSTD=$(usex zstd)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-17.0.0_pre20230218.ebuild b/sys-devel/llvm/llvm-17.0.0_pre20230218.ebuild
deleted file mode 100644
index fcb512276fe7..000000000000
--- a/sys-devel/llvm/llvm-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs flag-o-matic
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
-	xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake )
-LLVM_TEST_COMPONENTS=( third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-remark-size-diff
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZSTD=$(usex zstd)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index bf1e7143119a..ceee9e83b6c7 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,8 +1,4 @@
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
-DIST make-4.4.0.90.tar.gz 2328399 BLAKE2B fc260a3c942b00d57bc64fc037e4e4a510000ec281194122e3315f0ca7c6fe3507877c84bff62e197f5df45e1d5d95aae347085e225377788ebd466a1327cb25 SHA512 e693e6146871dcaf5b65b6c05b620047b6c2a3474b02ecc58cf4698f88107cc7a7b0d35551eb209c772b09ea7db2ffde13fe984d6227339974ca54a68b99839b
-DIST make-4.4.0.90.tar.gz.sig 833 BLAKE2B b0a2d98f5a99ee29523c6b25be4b29bfb193773ab5b70ce26adf75a066e30ca95d79b111eedc656e817246cfaf7f9345014626b12de5a381e44e4b6f8ddd5be1 SHA512 7a20c6058221b1003a26806f65d7b568575f88187562b89b7593c67dfc2b15569cd92c75c23056b2a3ff7577f96794835f1b6d5d9f5f5b92c59acb3af8efc944
-DIST make-4.4.0.91.tar.gz 2345140 BLAKE2B 3e28fa6e74684329f41aab69aa3558e45381b64964cacd4c83611df86d7ade69cec9561248c817b2e3f52db60c2821e34603d68e1957377c05c48e6b09a93295 SHA512 7798340062edf15c0ad459c3f9741125337c5bf59e002cc109b4e5d59e7cf9c510f4fcf33aba0bf61a0e91d6259f84d6cffabfe7a3eb45a07e70a5ba54e91d37
-DIST make-4.4.0.91.tar.gz.sig 833 BLAKE2B 7d86e8cfb5018ab32701379b7b04777c032d40d0fe02469ddb2113f3878079ee3e99a69636c5a2a42d0a20e43f833f88709d456255418ae4007fb18ebda4ab0d SHA512 950e11c5c27d198846d0c871f5e3d9b4bd3afa43aa9819cd293c3c97083b7df4c5b7cc5959b17c488433bba3e64a53ab51805bad5788b106d462fb97f7ea2fb2
-DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f
-DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6
+DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c
+DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09
diff --git a/sys-devel/make/make-4.4.0.90.ebuild b/sys-devel/make/make-4.4.0.90.ebuild
deleted file mode 100644
index f161e636a1f8..000000000000
--- a/sys-devel/make/make-4.4.0.90.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
-	inherit autotools git-r3
-elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
-else
-	SRC_URI="mirror://gnu/make/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="guile nls static"
-
-DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-BDEPEND="nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-make )"
-RDEPEND="${DEPEND}
-	nls? ( virtual/libintl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
-	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-
-		cd "${S}" || die
-		./bootstrap || die
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--program-prefix=g
-		$(use_with guile)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-devel/make/make-4.4.0.91.ebuild b/sys-devel/make/make-4.4.1.ebuild
similarity index 100%
rename from sys-devel/make/make-4.4.0.91.ebuild
rename to sys-devel/make/make-4.4.1.ebuild
diff --git a/sys-devel/make/make-4.4.ebuild b/sys-devel/make/make-4.4.ebuild
deleted file mode 100644
index 995022126a40..000000000000
--- a/sys-devel/make/make-4.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
-	inherit autotools git-r3
-elif [[ $(ver_cut 3) -ge 90 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
-else
-	SRC_URI="mirror://gnu/make/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="guile nls static"
-
-DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-BDEPEND="nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-make )"
-RDEPEND="${DEPEND}
-	nls? ( virtual/libintl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
-	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-
-		cd "${S}" || die
-		./bootstrap || die
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--program-prefix=g
-		$(use_with guile)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 8acebd18dfbf..68213131e001 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r1.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r1.ebuild
index 10d98c962474..014931c13b73 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r1.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]"
 
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
index 10d98c962474..014931c13b73 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 SDCC_DEPEND=">=dev-embedded/sdcc-3.4.0[device-lib(+),mcs51(+),sdcpp(+)]"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 86f712c5df78..a4c363e43b09 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
index f352f3408ebb..50818152e271 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit flag-o-matic python-r1 toolchain-funcs udev
 
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git https://kernel.googlesource.com/pub/scm/linux/kernel/git/colyli/bcache-tools.git"
+else
+	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
 DESCRIPTION="Tools for bcache"
 HOMEPAGE="https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
index 6ae58898db52..adf62774b5b5 100644
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit flag-o-matic python-r1 toolchain-funcs udev
 
@@ -12,6 +12,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git https://kernel.googlesource.com/pub/scm/linux/kernel/git/colyli/bcache-tools.git"
 else
 	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Tools for bcache"
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index ff7b115ec0f8..490192a63102 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,4 +1,2 @@
-DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407
-DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676
 DIST lxcfs-5.0.3.tar.gz 103697 BLAKE2B bdea820f1a5b799309b3d5c8ea439477e6eeda2d9600a348a92b203f2f8a6e0e686d0bf56d8f6b5bbfeb4837dd5737626d7d0610157211f0f189711e9e45a048 SHA512 967e60bd7ea545f1fcdd805adc0083e39684013c18f42a51753b5be8cdabfb86a652d02471a1f71c7b4fa756da09b72d324b724d68091d539edd10ea63add1fd
 DIST lxcfs-5.0.3.tar.gz.asc 833 BLAKE2B 2dc139639431d9430149369b0a28b6debef0de9f5f69854070d8f2e47718bcc130a869683dfa2b0002c6a54978b0550303adbd5a7fa5ef565eb6bc6bbfcde9e0 SHA512 0207c110553b9d62cf88ec70ed4472b9696d74b277af1e53df6d1145228b76d06695fd28bf20c8428bee5b6ff617c617fbf063c1c8ff0bcc44be2e3439c76a64
diff --git a/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild b/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild
deleted file mode 100644
index 551954d58b74..000000000000
--- a/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake meson python-any-r1 systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0 LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="doc test"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')
-	doc? ( sys-apps/help2man )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-python_check_deps() {
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix python shebangs for python-exec[-native-symlinks], #851480
-	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-	python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-
-		$(meson_use doc docs)
-		$(meson_use test tests)
-
-		-Dfuse-version=3
-		-Dinit-script=""
-		-Dwith-init-script=""
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
-	./main.sh || die
-}
-
-src_install() {
-	meson_src_install
-
-	newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
-
-	# Provide our own service file (copy of upstream) due to paths being different from upstream,
-	# #728470
-	systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
-}
diff --git a/sys-fs/mergerfs-tools/Manifest b/sys-fs/mergerfs-tools/Manifest
index b96ee5a6e6f2..55f1350cb41b 100644
--- a/sys-fs/mergerfs-tools/Manifest
+++ b/sys-fs/mergerfs-tools/Manifest
@@ -1 +1 @@
-DIST mergerfs-tools-0_p20210502.tar.xz 12876 BLAKE2B 760ae2ebb9017e3bb5508d008bc5726cca4ba1930a7f8ebf752e34ed94d92502c146fe2ab25d88c41d27e3ef94b75497b21e0c62c9e86b0e3872916116c4d67d SHA512 8a3c3e92ecdd1c57b8331a0bebfee11908f1d2361fb35cd906173d2d3fd0ce4195eabfb63aa1edac3c36be254504c25edf87caa0608900f6970551991f7a4a50
+DIST mergerfs-tools-0_p20210502.gh.tar.gz 15575 BLAKE2B 0b111c8a37c7679cb5a331d942f11ad8315eb58d0e686a53ddf6ce9262fb04cde69654d6d8c597d94fba48914b5b7fc4fc35d0b6413bd817e587e1d8e70ad1b6 SHA512 8f0fefe65b277d01aa893bd8af3dad5618b403126817982740a59c7997af33480ee858158b430775d63f0aa5ade854a71d88ab99ee0d7eac8cc4cb95933204f2
diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
deleted file mode 100644
index 958ac8f0f7e8..000000000000
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit python-single-r1
-
-DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
-HOMEPAGE="https://github.com/trapexit/mergerfs-tools"
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-
-KEYWORDS="~amd64 ~riscv ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# no build system.
-	true
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-}
diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r4.ebuild b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r4.ebuild
new file mode 100644
index 000000000000..023b7d11f5f5
--- /dev/null
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+MY_COMMIT="ff4ef0355f699eb11f0d75471d3df44c303830a3"
+
+inherit python-single-r1
+
+DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
+HOMEPAGE="https://github.com/trapexit/mergerfs-tools"
+SRC_URI="https://github.com/trapexit/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+
+KEYWORDS="~amd64 ~riscv ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+src_compile() {
+	# no build system.
+	true
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+}
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 5dd981d9a165..697696ca16bf 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,2 +1 @@
-DIST squashfs-tools-ng-1.1.4.tar.xz 1311684 BLAKE2B b976ac223d57919958e0ad04c989e0a9cf2837e1c7ef1e1962069b4796b492fe2fc99c59d1e38b11e380226dc2fc4b2e25e29244635a32d03d0667f2b3ef1d7f SHA512 10e0bebd70de686862f1473588cdbf922ad766c86b64ebd4d6338fd863f862fe0c9374950fa54a197c0f02021c63943cf1ba57ebb7f93a4188e68e2b25b4a800
 DIST squashfs-tools-ng-1.2.0.tar.xz 586992 BLAKE2B ca20e4e01033b4dfa3ada2abd0f618305cb3f49f683863d36ea93679c2cfc0c396ee209c3254fa318d30cb2c4c000c3634d4b625212842cabae0a5e53b4a2bdc SHA512 0c52890a92e2aee928db3e2407c087703d331e9dd8cba1b58ef44fe78cdd7ed1523e9b0485f7da83ad77423ffdccaf392a2b752ad948d62a5f1b5e600b523070
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.4.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.4.ebuild
deleted file mode 100644
index e8a838da86a8..000000000000
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A new set of tools for working with SquashFS images"
-HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
-if [[ ${PV} = 9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
-else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-3+ tools? ( GPL-3+ )"
-SLOT="0"
-IUSE="lz4 +lzma lzo selinux +tools zstd"
-
-DEPEND="
-	sys-libs/zlib:=
-	lz4?     ( app-arch/lz4:= )
-	lzma?    ( app-arch/xz-utils:= )
-	lzo?     ( dev-libs/lzo:= )
-	selinux? ( sys-libs/libselinux:= )
-	zstd?    ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_with lz4)
-		$(use_with lzo)
-		$(use_with selinux)
-		$(use_with tools)
-		$(use_with lzma xz)
-		$(use_with zstd)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index c48b41b57f80..4cfaef9c1448 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,2 +1,3 @@
 DIST unionfs-fuse-2.2.tar.gz 47955 BLAKE2B 44ce19b5b857a571da4722af7d19f4c59a5ca222a9d5d544529ef6c4be5125518ffc62cbbd7b5ac7b88fadd22b8777daf18b23124602f35de1a8a041b27d3cbb SHA512 eaecc203f8fad094221cf16b962e7d32a3aa9b0c945a663ce027aba3b7c4152a4dba8d5e96cb63d147f5ecd216cae29b53de946d74a939cde486dcea95d947df
 DIST unionfs-fuse-3.2.tar.gz 53631 BLAKE2B d9f384d191a6f2d743c31d4d241c0cd576a1e4d4fe21c5c61516f14f3cc807ecb88d2d87dfb89f9160d2ffb2571a98843ec322b922e82ca7166dbd6ce19496c2 SHA512 e9d5b5540e8eefb9de3204798c5bf1ec4481ea6efc9e3f91f3454bfe0c67d623a542f4097d88c7292828703317a0460b4e10ca9e74d1346d5fe69f67f57400b7
+DIST unionfs-fuse-3.3.tar.gz 54069 BLAKE2B 2b6346c29318a7b8c31cd611d041bb90eb7c3b4b9cd6ea45006c291cb5346b1947ce4de3ac77d23979962bc72e33b6d5661013856d0fd5109e28d78590dbaea6 SHA512 7c72763af4dbf72bfcbff396fea2a81fb289d7bb2b1e6201d04d583f0245df96863eb50ab91e8dfe9288e61435273eb9fcc6ad5feea4db16baefceb1a382280a
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.3.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.3.ebuild
new file mode 100644
index 000000000000..5bc4fe587d8e
--- /dev/null
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || return 0
+	addwrite /dev/fuse
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 31e1ff23d2f3..7127f4e60091 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 635ddc6b8c33..50906a9a5381 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,9 +1,6 @@
 DIST genpatches-4.14-313.base.tar.xz 5980128 BLAKE2B 58ccfb6e2adaac90eea9d205b010176f9e9ddf802b3bb8133bdc4bc7ef7288357827d2f752e0b646a135407f8787855396e0d9d84a02b042463713e7652e1d31 SHA512 8b66fe30afb0a9118d47d3ba0464da673df4e714e6ee5632fdfdb05e1055ce30fff189abc8fb5c4ac9b8fd017cdf1abcfbaeb819f3697a883b7b9c35f070cecd
 DIST genpatches-4.14-313.experimental.tar.xz 5708 BLAKE2B 0e49dfe6b66553bc8ae919e0d1ba40ea41e9934c1b89223b7e891ad8588c268ae2bb423ed7dac9fc1a770022f4bcfe4452b81cfa4f9a4a46de2998db2a197665 SHA512 79b4a3457c85c1931d9bd7da8e28283090b31b48e4216c52f3274a1b8e73aff06575450bb9a63e808b271bf274911e84fcb4a806788652a594b192e53fcb576a
 DIST genpatches-4.14-313.extras.tar.xz 3656 BLAKE2B fc628f367d77b737e998301f6b2d9ac9974ee637db68f549bc15de7b71973d6b8fa878055b5cbc307e19f3818b93babef8a683b2eea7502adba2de40c84de3f4 SHA512 b070563b582192bc8dc57165238ccc31af380c49c86543d81ab6733449e37665725fbb9c14bde111ceaa06e7f18ee89457e11b142bdc23e28ff8e4d41cf03a13
-DIST genpatches-4.14-315.base.tar.xz 6039324 BLAKE2B fb61c62f58ca9d31761b3d635e48d47d1f8849f71079cafa12f2c09dc7e3bc8a5bf6aadcb5af35d89f829c21f8b15403725d4eeded2296294e4c60871d64ff79 SHA512 833ad046488de58b8602dc235a4e6410282e1cf99bd62f075e73996c07c2e3519da95c98cc15d8b92bad5dc5a90819beb87d805af552dc2dd37ea34f1757d0d0
-DIST genpatches-4.14-315.experimental.tar.xz 5708 BLAKE2B 33786aded5e59e8bda4f20507e29fced88f5b059782d52ab9b943db553e475edf88e9e0013884dca40e30f742064629ddf4c70dae40d3e83a34bd1faaf4f35fe SHA512 664d7c8f01fd03f18cec756e74719fb77f254b8416c21d1545f190bd9eb433f095484ec86190b1afa86521dc7b751ca8302fe3072a544acb74395dca6866511f
-DIST genpatches-4.14-315.extras.tar.xz 3656 BLAKE2B 5eb652b720922c5c1d71eb4da728c3b807c9843e73c064b692eb8f84a5a32ea72309a7b358bf81c2f69858d28cf6127fb837fbe7b29dd23b419dd456170d93e5 SHA512 c073e3d1cf99926293fa98af7274bb393df4c137ce2432827dbbe0660d6404e6863a9c5cca90808eb707e11b550e2fffea80902d1d281d54d533bb5825bde3d7
 DIST genpatches-4.14-316.base.tar.xz 6053600 BLAKE2B 259a1c3d6ff27496f7af7f12825df92e61aa808f0ebd13d6f49545609c484746f808b9165db7632e80e9005317b93fbf7887fa43012d249ea854381e6100a2b4 SHA512 ebab086aecc95a4ab656e5f3d3589ca374972f0e57263cce4a734085946152f3c3c161eb0f0d09ab462a7aa1d80f92d7c446a643cbba00f1d82ef6ff672c9a79
 DIST genpatches-4.14-316.experimental.tar.xz 5708 BLAKE2B b996b5a16364bf74d8f9e8c9d83bbf2d79054415117876135d433d31a57bd09e6df7f3976f702c0f47501582d2a7cd9b77f3453303e0a58367203f732c5d61ac SHA512 69fe8da005d89b8fdbef379446c41082bd3014a0731c03f540133368f1281fd174b0da64de83fb1d9cb8d4808dc42422a6791f9b173a6430d6d6cf4a34e3366b
 DIST genpatches-4.14-316.extras.tar.xz 3656 BLAKE2B c3ff62db791924cb1e1c1fdf3b8a6d3815351ac7107c9e070d04ad4c047dae79a9db127e59684edda950a9d4af102ced072c91adf1a0a2472c5bb4fb2e87c82d SHA512 915217d9304f3388b71618d8258ec95d8558fb8d38286f2d83774ab15481ec0d26f825342e4aa2683e411b55d136e72a22cd24d5e256ab706e94f60ec8c5ba19
@@ -16,9 +13,6 @@ DIST genpatches-4.14-318.extras.tar.xz 3656 BLAKE2B 6e1d2ced55862bd9796afec1abf6
 DIST genpatches-4.19-268.base.tar.xz 5866076 BLAKE2B eab0f67b6ddc72c7d9ccd8073bf51ebc3998bbf6177973def77d0241f32e6a204fc14fcd2d58c31ebbb5492fab2aff12f96c64592dc611475c8dffcaba9faa9c SHA512 0e501a12d97dcd8b9408e7c65eaa262d45a23b7db522054744749d219a0938f8306f88b3a11bc0715e29d8742a7168c4c89ba92a5fea03b32c997d582d54a8c3
 DIST genpatches-4.19-268.experimental.tar.xz 5460 BLAKE2B ff1b65fd218a0ac88f1f48be2a6f21aaa5a01f0609df74518ba34b42ca724ca7bc2fbe3841c1454db454162e7393a40cfaadefcf0faa150b41a1439ce260a9c2 SHA512 1812f45899972d821531843c294b34629396ac08eaac88fd26e229594690ebb64c80b139dde6aef1f3ecd904b7d75c9b56ea00d65f5076dd472dda0cf173f431
 DIST genpatches-4.19-268.extras.tar.xz 3664 BLAKE2B 9a4401bb3e2d7b14a968af60f9e4a6ae6fb9a75cb76e7de340414de20a11040ddfabf6441f7b40a27df34703a9a6f659797aec3a4a17d75e9ccc404f235073ad SHA512 9b58c6b5d7899443b20a42747f0e5b3b18016eaff75b9014960c5d72bfa93cfb988284a1474d051ac8e26331c8ec75b99c1f84df7b07cadc071d969f9981e77e
-DIST genpatches-4.19-270.base.tar.xz 5970512 BLAKE2B 6cb2739282b2a05444caa7c3250d0133e269365b8dc21d3c6efb23b76304a5c2494847b59487a0101f1759a041553bb1237eb7befda1857850832c8b0c5eb9bc SHA512 c139ea5c6ada0271c73eef6e3bee9158391243e16bb3dfeabdda556eb7776b934c6c85dc1729f7e3781f5fc50679d16fba883e0eba4af709282c58d8a66958cf
-DIST genpatches-4.19-270.experimental.tar.xz 5464 BLAKE2B 6341872dad85ac13799b3e7c20323a089d00957c0e2095c74dec5216213ebdf974a78d6bcba96addfd7c54ad52b15feb2639ef4df355173e74076d47b4e32f59 SHA512 7af14c231d8cc70fee5f9f94ec91c26fe3808863bc6cff1564dd4bdf263adc8390815c56027be12048474251b7a8074b0d26bc953b3c3f0cf8e54dc845f5e9fe
-DIST genpatches-4.19-270.extras.tar.xz 3664 BLAKE2B 50843cd307477023e1005bbaa0e49f0855503bb1251655f593c6f0aeb06d32fc11ca6e05fe7a8cd00617ecae5233ddbdb3745440d112319a94743a665d2ee484 SHA512 1d04514c502f7df3d09dd1a28a4fcb7da74703395156dcee6f48df44dd854b1ac8ece2788c2b37742f395775d277c44eca8433f1567ff5967928dddbae1c20a7
 DIST genpatches-4.19-271.base.tar.xz 5989708 BLAKE2B 9eca4753ae1b6b6afde7b16b99777915d5ca7ad135a3217ef15741bdb2e4fe31bc753c034825d7211cbd20781eb00f9780186ef850099af4eeca6d1bfece79bf SHA512 1ce0b8391208e503d007dbd8a6c5fb405029beb8a608061fb668c54d25fa518c32d1e621d09e51b6e2bb94347de013e688ecb94e9d39b0a80b0863b7aa48bd0c
 DIST genpatches-4.19-271.experimental.tar.xz 5460 BLAKE2B d6043d96630852e64fdb198c3aeda233ea4a07460a10f89073c464ad540fd20ec7aba23b61e8e6c3b3ad0006c26354ba4cedeccd11c8d792797170e69aad110d SHA512 966221b204e5c6b6cfcc95fa0a57c5ecb6e5590f83688130df915617eaa9568c0bba5368f3b61fa96dde5fa2ebf7c7587b09e35606e94bba424e9bde0312abd0
 DIST genpatches-4.19-271.extras.tar.xz 3664 BLAKE2B 0b2b62aadeb139aea2506801470f7d785a9024a2b6d2c8e3ddbfa964f5a55c17aa3c6ea5055773ca8645af8425242ff65fe21d0072c61ec45dbd58a1ba4b7dea SHA512 5ab1aac7777755ba5bf45fa6fc962283d057bde7350856933e2579df0236a845cc40749a59b14b08c5b0c08289d7c8059d7a64b3dee24e7ee06ad32a89173076
@@ -31,9 +25,6 @@ DIST genpatches-4.19-273.extras.tar.xz 3664 BLAKE2B 8e75d91772c88aa65120485e1486
 DIST genpatches-5.10-172.base.tar.xz 4831748 BLAKE2B 46acfe58044df90c98057fc25903c1af1ff3baccace354659b79b939ca6b2054488c8823c456620880e4af9221e0d26eadfd355aaccf4679989ce2e6077507e5 SHA512 8951a10959454b515269be97e163e73aa7cc8374abc7d0fa73243f67944bd1592051736ec06e2ce29ee01d4e0b79ec783d30b40664105f12aad24c9c4cff0a33
 DIST genpatches-5.10-172.experimental.tar.xz 16880 BLAKE2B ffcc645c2f82fa05d2bd07da4be09355a082de32f9192144917c1ec7f32038f07cf08c243087a20acf8efc8cf9b412b95bf9e1dd5e677f9f03e0ad1f9a6a1ae2 SHA512 baa241b96a5ff3aeb5db574843065db8714a91d7b3b33fcc83c917e4b092501b3479b05537901a3cebb86b7fedff82dbf5e861ff2d37d8c514131e1959940d44
 DIST genpatches-5.10-172.extras.tar.xz 3868 BLAKE2B 32ee2c036c224c800ce53fa94d8f6676c70023bb733cef143355ed5907a4815cb252bc43d1660bedd841dffc814c15a9016d8c0d43b80ece58c9f4bf77c472eb SHA512 10372d1ab1d8bd73dc1c7412498cfb5ce91dc74d5e40c6497aeac24fb71d9c007d03cdbe58b2b7d6304af11816a4981cfc4bdefcd39da19009cb2f0bef9ba5ea
-DIST genpatches-5.10-175.base.tar.xz 4909096 BLAKE2B cf9a0be14ec5a99f5a8ff6ba615be0a037f931c02f8edcafb91c6aa78b76dada6f0a9a41b9ab75240f8a64af6a944fe0c31012fbfa21162d8e43c016ddf72f97 SHA512 7ccd6619f5df892cbdf5ca7d53133d8964098cc81dbdfdabd45d99128ac3e4dfb5d64bda8b3d17f17b436ed12a0f3ef2d9667ca02b861c7a4ee6226647936280
-DIST genpatches-5.10-175.experimental.tar.xz 16864 BLAKE2B 77be32c261941072e469a49f11eab361f0c6a6a4807d3152a9208aeaea0129292ea163db5b2632eec4005baefe89a49a516a199dd4fd39472040b4af3ce4f53e SHA512 1679650ed0c10db46ef872502f6a6772b3379acec68e296a936a1b413f4bb032390231df668e120f0cc6f46cc52a4829436b98338521c8e28c5dacd472548e7a
-DIST genpatches-5.10-175.extras.tar.xz 3872 BLAKE2B 1371c40d2a9e15fb2297842c5aa7989772c3699d360dba1837df770d3e8c16fe48cfe6ade3a0832237dcf85722ef276ee80960072c47dd83d46018de44af4bbf SHA512 9c2c2349c1a88e916ddad9b67cddd0cc5c281ce1d85d29c56e308a52999b79c1c212c8caa3f829aa16e20b8ca4154ba8c66e6cc5d4ed1d4d07d3fe9c26f46ed5
 DIST genpatches-5.10-176.base.tar.xz 4910744 BLAKE2B 119dfaaa5a2212f088f767e3600d748b2bc20a95c8e21b34bb81dc0a6ad6082769da9cc11a89b226c326c0326cb4c7da6fa0fcb1cb4c5e1f04fc353dab01a117 SHA512 60632369dc2066789ec8a144080127d7149d9deebb3c9764cd1a13fbe961dd5f88eaf345dbfeaa33c8c8b55d558511d2dafd4bfb631fac2db72110574ccf6c8f
 DIST genpatches-5.10-176.experimental.tar.xz 16872 BLAKE2B e31e9f79213a39699d3f3f223b2f7e48442f86be8c4a4a3dbfad15d2301c2a2c22666cd5e914eb0bcbcf4f2544e369868ffaf7878e4f7e10ac8be2b7c718d835 SHA512 c86c15501927cea0c1ea1edf8f0636a0369f442c8517d3c93171c8b79df8fb14f161c88440638c54be630abb4b7a2ff302c1dae120bc50a96df8402e10c82dba
 DIST genpatches-5.10-176.extras.tar.xz 3868 BLAKE2B a0a3808562dba6540d632b25e3a417f9a2514dddb13cda9692002b253a4d033bb58ffa4d606fd57764024f21a0907a94d93c2130deb9bbe92a60f310179e761c SHA512 847fd0c0ce8bf3aaee9c6aacb527d8590439f44f5e1e19ffda883b5ea7d8bbc502cbe5e126fc181eaad9dfbced8ca664e459b70085bdc6d51e7f001bf4901f2a
@@ -52,12 +43,6 @@ DIST genpatches-5.15-100.extras.tar.xz 3932 BLAKE2B 55665c7edd0316db7e6a8391ccfc
 DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
 DIST genpatches-5.15-92.experimental.tar.xz 5420 BLAKE2B 9f091fe8429c6479c27819dfe6cd0ac04cc7f35d2af28cd69c6a8f9498664162343ce63de56c77aa3a14e70f638e741e3ffbe08c26a2cbfceca2b9bd6fd852cf SHA512 513f465509cb644e1420161bc909b7a1adc155ae6d7d7af4f0362d4fea4e7dcf5912cadb6737c1d33ed5b5b8dc5ab1b0de15c81bddd4d380b069307d1dc0d4b0
 DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
-DIST genpatches-5.15-96.base.tar.xz 3961872 BLAKE2B 832c573ea52eb7b49ea59d975d25af9044503bfed0595082873d09496b4bf4b558e97af812c244274488100fc87b3d2e3b9ba8b3fb023d3623173a13ca034925 SHA512 4577060888eeeffe76e67026b2f6cc1743dc7501c6f3606fa06805a97abc54c59324aecb74d4c2ed65433090c50f432c7a3167b61e84cfb168dfd09dac300c5d
-DIST genpatches-5.15-96.experimental.tar.xz 5420 BLAKE2B d80918b0da870bbbe59ae8dcc0f6d9adab44e237b9f60179348e6a26dcb43d268c17fe2bf7c9d00ae18278a60736616f3ae59f66b6136abb7b754d68f6d5fb00 SHA512 098659358f50147532c0838b0de9542a0ca40b9b5a814404184f4f2ea6793b376564653b6bceba3716530de78325a62542c9731690f6042ec9c5e80df26a5159
-DIST genpatches-5.15-96.extras.tar.xz 3932 BLAKE2B 5c34f507f83f8138d3e9f7fea2fe0619e326ba602972a6d37f40847526b9f95e13c1ce2b097b277573dc9f0bdc1739d5eba6020817a1956fc80fdc7076d22a01 SHA512 dc17deb594c99c9ab4b0c4c2272630c1cc9d03a88e4a1b936f2ec11c5750cedc00a9320018cbc543d5844727760e6f56807cad9d7a8a7fc9b2cb605e8ca874c5
-DIST genpatches-5.15-97.base.tar.xz 3988428 BLAKE2B d894f115bdaab2011edabb77ca6391ad1cfd5029d9d86716bc71ee8df1f263c96df1e265cf4591e25fb7a870be40ac9b01ef4ee07a8715c5be900265044fb4a4 SHA512 7e8add203a762e34fcfa672a4af7862eb31044517c93d6ae68ee02e386251c31b514efc316c89a92413c9f0b2930767bb3b680cba90f48f125935445ec88f379
-DIST genpatches-5.15-97.experimental.tar.xz 5424 BLAKE2B 58cca80947355ec1ee05d0e87d54fed042f828681b9990ae5e678d085410b1cef8c576c81747c5cb3da86926965111f55f5232ea6a0a80ba46bad8beb458d86c SHA512 5a550804256a53f129b5abfbb25a62502849431247b7c03f7250b79bef680d19c42d99ed90172a657263290d41289d7a3fe0f989eb0c11f2a216c56135681e9a
-DIST genpatches-5.15-97.extras.tar.xz 3928 BLAKE2B c542e8eee62f61a513a80ad48d92812bd3967ca18963fdddf95dfcc95dd337384ab79052671026da5dc00ad87a979fbb6944e1c3880c4ff6335b1f7a132b8180 SHA512 8557ab40bff3e625b2ecde506052f0d31cb13ee2e2a2d05d1ee30ab8877f774b01bb94e450421c92c9a9e5a46df893493ece1dd5dee798ce6e9eb880b49522cb
 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734
 DIST genpatches-5.15-98.experimental.tar.xz 5424 BLAKE2B 9f5f84ced9f97276f62087cf75eaf40fc1cac8ab74f79d30b405f394acc676b5e53d8b5cdb6f80651488577c8faed67ac1282becff5f2d499c6049864f4b15ad SHA512 b4bc747b4ac9eaf89ca073050ecf6c4d64b67cd59aa178198b187aaeeb475eb4db726399415645e01d6d0f1a7e922933cdf5b1d1b7c5d22e0a8a9a4b59015fbb
 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622
@@ -67,9 +52,6 @@ DIST genpatches-5.15-99.extras.tar.xz 3932 BLAKE2B a78ae77735742abfdb7a622563ea1
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
 DIST genpatches-5.4-233.experimental.tar.xz 16900 BLAKE2B 8f1644021d72c6238a65c57f4bad157aa2599ae864f2de8f9cfa6f712554f7ddf6112b22c61c94e3e25f10e25823d63d62ff76d2c741b782ff40c089986f02a2 SHA512 ad9adf48a34c09fb91b0d9d9101dafd2db8680056e03552fcacbda36cdffb6c2e00faa52d16e8ae3867fd34391cb004ea6539c122876f32769aaaea4e6b6f4a7
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
-DIST genpatches-5.4-235.base.tar.xz 5437324 BLAKE2B 16a5f67224b3bc10792945ef379825c96a2e97faa48444b047da90e36a341b1b04930e64b8e4bd457d3ab9ef842aec1e2334dee273c4279f72eb6745b2dc4b83 SHA512 461ecc356eaeca967112e69d8cbadbe8d84ede7b2a3d199ba11620f9b405d5fa0506c133d15599713b74b3b5bcb000f7cca27351b8ad628c81ceae64d339d385
-DIST genpatches-5.4-235.experimental.tar.xz 16888 BLAKE2B cb5c421278e46d7323a4c4538bbec36a58745dbf83f32564ac322c2595310497bbd771e18ca777db336b280bbbba4acd6a093bdf7ade79d2f5d2e78610bb6692 SHA512 8225dea4e7136a529bc7b2156ea9b987117f72c4456893c688791279f51efd95da6991ad5f36ea97801dcfdbc011d8c1cb288ced55bd0a89c4f843da8e433bc7
-DIST genpatches-5.4-235.extras.tar.xz 1812 BLAKE2B bc1b83082a60463da80236c4eb42590981905e35f653ab2976c9f31f4879446f65d0f123f11e45bd583fc0ef788898f38a6534e66d1a028716954020427736f4 SHA512 515331c1ce6d7ce76f946ab6b8443afdf47f829bdf8e486ca733854d5c984c0c99a36611cc82418b0155f9ce1276b702affec04b65c4699cd4bf796d3ef6a7d9
 DIST genpatches-5.4-236.base.tar.xz 5467512 BLAKE2B 5c2ec5abee963eda0373e04d4f0da94d7e49b7a1fdc05f7a2f7cafba61771124503f1294289f79629afb62075855c176887f525a95a73bef4247b57915dd4877 SHA512 0a3ba2742ab21407ccc9060f37d528cdbe64dade85927aa1908613221973f14765a78ef6a71e157a71defcf1ee9158ffa1c2e7c082f508fc1140792e2311a073
 DIST genpatches-5.4-236.experimental.tar.xz 16892 BLAKE2B 82ce10b428b088a15c558f24d0fbef6fb5f6921cad4f6791ec0ec79b863e4abdc0115c15e40b3d36a07917f8ecd90503ebb208c05b1fbc7f025cf34528f96e2d SHA512 44d625e488768bf25d75b7542ba2e56a6f7ca0f4bd3b836847b009235dbea9a1e7f89f6b8b5f747489559eb7539b489ac50b8adb5707da5435dfe4e9a790fd3e
 DIST genpatches-5.4-236.extras.tar.xz 1812 BLAKE2B acc781fb099315e4716cdddc4a7f7ec88bcfae2228fd63c6f8bc99b3f562baf75339129f6d8e5970f5a812f6523fbe316992e1bb1606d6e06e5ca769ea1b5535 SHA512 5d772754922bf7eb2e21eac8fd597ba8c6211565a4d96a7bda6df68e089654b908bc09cd884c6e570836814ee75c84252d26228a20d138577e7717c498edad86
@@ -79,12 +61,6 @@ DIST genpatches-5.4-237.extras.tar.xz 1812 BLAKE2B 5a4e6b9593a9e9f87afd5f06f03fc
 DIST genpatches-5.4-238.base.tar.xz 5519048 BLAKE2B 9413ae97bb032e51ad570ff2c59ad9527d165563d32a8c9aeb4eea2ff9176115180c0c664f6729ea6aa9b3bfc4968c465636078c2ddf439271f18750ad048ca8 SHA512 d91f42ad1370bcd8bd8f56410abc74b964b123b42a0100c1b4d934d50903d7a4ff4eaa79f02ed85362f0eb3ae6e3e984d1ef85add8f969ca9ddf5c51917cc372
 DIST genpatches-5.4-238.experimental.tar.xz 16896 BLAKE2B d70ce4849245da80a48e2b0528e45a0130e44af76b59c5fb00a1d4818defc84aed98539cdc8bb02426c13ce229dfdd9768fd41cb7b2ef9864e10cc22fbdbee19 SHA512 e1611d987e65ef8788a5a403cd357862fab6c1410aad9fc6625769e70999b1dbb9fa9c79ae83acf1b745a361dad9a7b566ee6946058502fa897d89a1a8b19668
 DIST genpatches-5.4-238.extras.tar.xz 1812 BLAKE2B b797329d02faf1f7bcc9bebc5f4b028e581a0c45660f15ff6010b6b8d5b920725c4697e26e8ec22fc94070723fba6e5c6fbe273fbd4a5c5245fc0a8247037e5e SHA512 b4adc55c826f9154f977e329dbacb1c5e92a2dee1d694e9b0d2b63d0ce4e3bc55ad05918678865d7964aa6e437f939e7e07652a5498e9a316f09069daae8487f
-DIST genpatches-6.1-12.base.tar.xz 678732 BLAKE2B acc67136abb35e0d9985bb55002467e9d29797bcd560306511a58093ef56f86251531e54ff615dc3fee71f99633dfc372ad7bbe5a1ec2ff03d9fc23be5de04a8 SHA512 83fb419934c6314dc700f5bc9eaadf1909fbbd45dbb0e86269d942ba7f18162cbacf0acaff705144c271eb29b57c3a8027af03a73485dc887f551c002033326c
-DIST genpatches-6.1-12.experimental.tar.xz 71548 BLAKE2B 5c5ba557fe51643c7709aca4062ba893245d8a37e3a8da9ffe69a21c81ce0737de2b42ba1a5e7b7b87f9e6bb9739a01ad618bd372abebe4ae97ce1e96100e7a5 SHA512 288bfd4945847545e102263b585e512e3f4dd4b5703d43572e82cf86b738023d4ef00488d2d18f6ebfccd96fb19c66515b9e51ff4ad122b9afb714c8118fe94e
-DIST genpatches-6.1-12.extras.tar.xz 3804 BLAKE2B 59da490e3869e0b9c715453837cdae6d40b67156c966166e4d6f809e115eb9f621668a46f2632bd5eed894cdacaa5e85d26a5ef0467f95fcdeb3da3f9319a1da SHA512 d62321a73145f6275753245cad5d55b06e5fac89c7c7ed613a376c21181644e88bda7d3f7ee6f54c686bb0e534f6fdba3fdef8c9bcb06f15117276253b3a7e36
-DIST genpatches-6.1-13.base.tar.xz 739612 BLAKE2B 733d2ae5d8da2f92ea2acb01ef40b5bb49e621d80c5f2602790a0bcda197a52ac998374979d20347e545a70b8b8737365b3d9c2850ff8b24543dcefb6ce17641 SHA512 0b5495622526072e8dc7d3e5d81071340a133857c9e13afd128495809cdc7787318c2215fd996131ef050472847f207b074f3a0eec26b0b4aa45df4ef51f6a4c
-DIST genpatches-6.1-13.experimental.tar.xz 5708 BLAKE2B 2df62a6366f706e7b1d96551144f336c02fce07fc611b5b80dc180c27f8708dcbf8da2457249a02a9477018c69a1d0c3a188fcf1caf986cd97be5a54708fa85e SHA512 597670e3dc27f8f26384625c5be3d996beddc6bd63cef20d2345d2316c5acb04b0738331c520231b5ca3e20440c4161b5b76cc25dba2e3dd0923a04df41aabec
-DIST genpatches-6.1-13.extras.tar.xz 3808 BLAKE2B 7781c242753f2bebd8f9bab0db85f38372b4b3d7111418f2ca6a027ac056eabfb2cc0f9da84d4befd6f3b5936d9424710e7e802e5c5e51ffddac3fb32505655a SHA512 175422ae5831f7aa07bad768809443da83af46bf2f256f7ea06bae0695899e47cb653f8bff2a3a9346e1b39680b318537e6c17f7851cdcdb8b7ca4f2ae380ca0
 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
 DIST genpatches-6.1-14.experimental.tar.xz 71688 BLAKE2B d1a99bf47e60ce6101a0882e28878c358cf2d285faa27ba0ca6f83779d76c3a5189db0218bd88104bfbf0b4853f65c20329ba22b84e034e4f3d9ba38253ae84f SHA512 701183e4831ea295a003340bdc5be1ce934928a37f5b8690aba2fca63a595682881c0b2beb42bce988b557d0a76a4feddd97da34c77a1c93066fd7d5b85c6ccb
 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.302.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.302.ebuild
index cd2a5851571d..9aec8ad76da3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.302.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.302.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="hppa sparc"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.304.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.304.ebuild
deleted file mode 100644
index 5c43fc7686ef..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.304.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="315"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.269.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.269.ebuild
index 1b797875431b..339bb7dab04b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.269.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.269.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="hppa sparc"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.271.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.271.ebuild
deleted file mode 100644
index eca897932f45..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.271.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="270"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.163.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.163.ebuild
index b23548e652b5..df950b7f2d75 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.163.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.163.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="hppa sparc"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.166.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.166.ebuild
deleted file mode 100644
index 6bab883ffdad..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.166.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="175"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.88.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.88.ebuild
index 50a9ccfe0e70..7c5b798893db 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.88.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.88.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="hppa sparc"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.92.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.92.ebuild
deleted file mode 100644
index c1ed1867f3ce..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.92.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="96"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.93.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.93.ebuild
deleted file mode 100644
index 84071dcb9f67..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.93.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="97"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.228.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.228.ebuild
index 10ccdb17641c..c670872ef0cf 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.228.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.228.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="hppa sparc"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.230.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.230.ebuild
deleted file mode 100644
index 64d0bb84fb4d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.230.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="235"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.10.ebuild
deleted file mode 100644
index c96d25233a29..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="12"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.11.ebuild
deleted file mode 100644
index 293fedb7b75a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="13"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild
index d063eb9129f7..a3df1cbbfc15 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.2.1.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/linux-headers/linux-headers-6.1.ebuild b/sys-kernel/linux-headers/linux-headers-6.1.ebuild
index 15ce93e1f977..0d757189102a 100644
--- a/sys-kernel/linux-headers/linux-headers-6.1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
 	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
 S="${WORKDIR}/linux-${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index f312a47a4890..b274d8968a64 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -26,5 +26,6 @@ DIST linux-6.1-pf4.tar.gz 220785813 BLAKE2B fe4b173aeba8a0101346e795331194bbc6c5
 DIST linux-6.1-pf5.tar.gz 220804202 BLAKE2B 5fadef6d3fa1ef6bf295fe75680ae1be0129834d758b4e2b8b2283f537aefaffdf5217eafd3042fee543acf86a443441ca91fb2f8124cc3f5bb751439274e1b5 SHA512 40fc016d0f49ca510a9605eec31d06e676fde83f69db6f3286f6693d5e59adb9dc7ad4fb1a41eb1c9bf375a8e5ebd44eca8aa41254961ca1715801667fb2a9a2
 DIST linux-6.1-pf6.tar.gz 220761768 BLAKE2B 8b0f3d16be65f245978a823bc4c3130f76017dcb4e51c0e5c77815ffe61d3122eabec28001571badc8eceed490cb14f27540bbf574fbb0feffba59804e1169ed SHA512 66b2a4d221bc9caf4c22353d39a9a13e990b8e50ef47d1882d9f950b4cf42f6d240d787979a5272eeb8ffba142fb07fcadf438827d3410e220b20e41ac079ea0
 DIST linux-6.2-pf1.tar.gz 222840475 BLAKE2B ee66cdfba8b08cbc5ac70f97b87826dc9d04ee8de2fb57f52e1688c1cdc5b0fecfe3bc673fa30849a7417120c1393ebae7c24ca9a2b00b55eb6719de0246160a SHA512 461d2775491675f351ca56787257a4c7fcda9d2a50538a26639448d86ab79fccff895f0385af78bf2e1113aa650383e77f3d114f6cb84c98c4b407690b0d3e63
+DIST linux-6.2-pf2.tar.gz 222861169 BLAKE2B b3e6bddc8639475313cb3203b99e068c109c1f2b71a6475ac8c8c0be21ab57c8d6ab2291db38c0b05e2d875a613df531acdfb7bc0d98acaf7efdd6032b6ea7be SHA512 ad038f5ea05da6006f4436c2345cbe259a3cf89be4424be12a96495875d40abf95eeb18afb550be8ef2b00b5013d1001dc5de688e0ebe85f30b655be9acd6840
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
diff --git a/sys-kernel/pf-sources/pf-sources-6.2_p2.ebuild b/sys-kernel/pf-sources/pf-sources-6.2_p2.ebuild
new file mode 100644
index 000000000000..3c9b67ed85ac
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.2_p2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run.
+ETYPE="sources"
+
+# Use genpatches but don't include the 'experimental' use flag.
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Genpatches version to use. -pf patch set already includes vanilla linux updates. Regularly "1"
+# is the wanted value here, but the genpatches patch set can be bumped if it includes some
+# important fixes. src_prepare() will handle deleting the updated vanilla linux patches.
+K_GENPATCHES_VER="1"
+
+# -pf patch set already sets EXTRAVERSION to kernel Makefile.
+K_NOSETEXTRAVERSION="1"
+
+# pf-sources is not officially supported/covered by the Gentoo security team.
+K_SECURITY_UNSUPPORTED="1"
+
+# Define which parts to use from genpatches - experimental is already included in the -pf patch
+# set.
+K_WANT_GENPATCHES="base extras"
+
+# Major kernel version, e.g. 5.14.
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf", since using "-pf" is not allowed for an ebuild name by PMS.
+PFPV="${PV/_p/-pf}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://pfkernel.natalenko.name/
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# When genpatches basic version is bumped, it also includes vanilla linux updates. Those are
+	# already in the -pf patch set, so need to remove the vanilla linux patches to avoid conflicts.
+	if [[ ${K_GENPATCHES_VER} -ne 1 ]]; then
+		find "${WORKDIR}"/ -type f -name '10*linux*patch' -delete ||
+			die "Failed to delete vanilla linux patches in src_prepare."
+	fi
+
+	# kernel-2_src_prepare doesn't apply PATCHES(). Chosen genpatches are also applied here.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	# Fixes "wrongly" detected directory name, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
+
+pkg_postrm() {
+	# Same here, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index bcb9e415d58b..223969afb029 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -22,8 +22,8 @@ DIST patch-4.9.327-rt197.patch.xz 169900 BLAKE2B 432b68f260db4970c3bd844a4d1a870
 DIST patch-4.9.327.xz 4449004 BLAKE2B b48aa23af600cafe5117854b76105c9c65adf9f2f026927367781cd360c61c551b174d2ea73eb02543e626408b27bf3bb8cfed62d9c36e9bac6d22c7e1099a48 SHA512 d6a5421cfbd70ff20664cbf05f9c955f03b55c3e22306f7adfd87ed760794817fd7d2211e5d92b169df64d8578717a9250c7ea6ca312bf10287a7283bf66d0e6
 DIST patch-5.10.168-rt83.patch.xz 170464 BLAKE2B 75edc2e070f60ae7e7d77edb67a531495b63df29e94c29fd1c7c8c3fa32a79c272ec85a84d0ad586d26dbe66ccee2314ef44d300cf0d0ac098b1f332f7bad8dd SHA512 46f1d5c6bfb2b13a622c9980e7dd84771502e97d9ce564ef0144650fed9c55f7562ce9a73d29edc7767add40a24a04257894b00499e84dfb6102c01de14d35df
 DIST patch-5.10.168.xz 4330740 BLAKE2B 33c5340b3f3655505f92b22569f6800a2ced7de9415656a237bbba5c15be678b6933d4894e9a85e8e9f5c7c146d8c76e201f3dd9343a4ab09dae3a89df4ea020 SHA512 607842d9949415e119ffe521a6385d1ed2359a50523dca38ce6eb4337b084885353c8345a520cb9e98cb57454417d981d6314e6f471293e53387ece30d7b7fb8
-DIST patch-5.15.95-rt60.patch.xz 77116 BLAKE2B 86541a698c2d971470649e0cf5844a1601ccfb9e7b554c694fcee1a84730b375d71b3bf9b084f7009614f203dca1776d6d2d5f08d4518c0ae2686887abef9270 SHA512 a64623dfe846637281c0a12dfcc80baa4aea52da33de6822905025106099a4eb6a1046f321b03fe07113d9e207653d5df21c0d465f055f2bcdffb79e59aa04d8
-DIST patch-5.15.95.xz 3584788 BLAKE2B 4c0190a72667c3844f34a04ee2677372c1217d219bba6d2ac8e68a2824ce3b20f2a1a0020b1c7b05fbce3ecf07faf1844cb10184f426e39fe422c8f92bb44d5b SHA512 a01c3c322f2ba351f8f0614ebdf30a5f3a6a73ac04f64eafd53817a4b0f7092e93105b5249b5a51e8b4770dc3d9beced1de9356ce5599ab628753bf7b156b65b
+DIST patch-5.15.96-rt61.patch.xz 77116 BLAKE2B e7ea7f89056ab1721f014c62750736915d3f06ba2952c387b656d35a050c60d28d74d26d5f115c6254fca6622cee25d9b3f2f88276867fb442c376c9a9aa8941 SHA512 e7de227787e35a0647c0865b2cc1c2969f3d01dbf96f7041e285ab1ca3332f1abd8bd58fba643b237b8c6576ea8e87a88971758d6b7a0d60aa68ac5968d03f45
+DIST patch-5.15.96.xz 3594200 BLAKE2B 390a5610f82f4f72986bc40efa4416c355cef1b63a1601bf7eb1797d3685052b0e23c5d6989338e0e7df759c29f1677e0655be58bf14dd641ecd45e8bb40fa24 SHA512 6330877a88d6d8e446cfcf8deb212a2221f3dec46c36dc5541c88fecea4714fef0822c64942a4669efce52530f2824d4d2dbd4bbd089f37654a864b3565202ca
 DIST patch-5.4.230-rt80.patch.xz 183116 BLAKE2B 4a28dfb2ac1cfa81a1d97a0b86e4ae7e47ed6e37b17926a8fccf87e9f3b43ad716b270cfbddd8db48e82ae5fa76b77f46f3506b63c004035b45c5b8935977d24 SHA512 124e0c99afb439d6c97596ea47a6ded73bf7bbc688bdeee9e7177cfc4f6c41985f2cbf9d0100e97b3db20a21735e76a3c09d29251fbdf54f8862498c63ae5e9d
 DIST patch-5.4.230.xz 4519916 BLAKE2B a88f386ba71ce0d9972154644c7ec46b10f20fbf1760f1a7ca73afdd2e424985156f127974758bf4870647f53b9c341d56b625f56c51f584ab4156f0dc5e6522 SHA512 8686631fc84aa7f6650051cd3cfebec4059ef54f53a5f86c09d61129c67615a433daf5b443462b10bb93965cf945c6c3e431ec080c96388aff2626abef6f36f3
 DIST patch-6.0.5-rt14.patch.xz 59916 BLAKE2B be06477b7733cb280bbb8ab1cc2b4c611d5b133d97e2459877a8aac0c82a6fa74cba7a7640b49ba6dd9d0abd61a9f9682affb032a8b9f0097874fff35fea9b71 SHA512 3e36e45f16499ddbd7029723363ff4cf6e7cd9503ba49f9ce0dbb960b34855c8411abccd32838f9f162412b4a1749f676432e463fce8066496f256313c99d79e
diff --git a/sys-kernel/rt-sources/rt-sources-5.15.95_p60.ebuild b/sys-kernel/rt-sources/rt-sources-5.15.96_p61.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-5.15.95_p60.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.15.96_p61.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a68a68354256..95cf61e9c9b0 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index bf44420812a7..73cabc1ed7a4 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -4,10 +4,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_rc2.ebuild
deleted file mode 100644
index 682d15574b6a..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~loong"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230211.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230211.ebuild
deleted file mode 100644
index cc599404c49c..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230218.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230218.ebuild
deleted file mode 100644
index cc599404c49c..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 6c11bb3baa85..03a17b99b940 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -4,10 +4,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0_rc2.ebuild
deleted file mode 100644
index 44675fe040f5..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~loong"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! test_compiler; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230211.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 2ed5fc860074..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! test_compiler; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230218.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 2ed5fc860074..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! test_compiler; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/glibc/glibc-2.36-r7.ebuild b/sys-libs/glibc/glibc-2.36-r7.ebuild
index 6f93ac1992b1..4d0fecf5932c 100644
--- a/sys-libs/glibc/glibc-2.36-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r7.ebuild
@@ -440,6 +440,9 @@ setup_flags() {
 	# #492892
 	filter-flags -frecord-gcc-switches
 
+	# #898098
+	filter-flags -fno-builtin
+
 	# #829583
 	filter-lfs-flags
 
diff --git a/sys-libs/glibc/glibc-2.37.ebuild b/sys-libs/glibc/glibc-2.37.ebuild
index 105fdc0c3aaa..c7656cf6144e 100644
--- a/sys-libs/glibc/glibc-2.37.ebuild
+++ b/sys-libs/glibc/glibc-2.37.ebuild
@@ -442,6 +442,9 @@ setup_flags() {
 	# #492892
 	filter-flags -frecord-gcc-switches
 
+	# #898098
+	filter-flags -fno-builtin
+
 	# #829583
 	filter-lfs-flags
 
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 23a25b3e5e13..df348d783cb1 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -442,6 +442,9 @@ setup_flags() {
 	# #492892
 	filter-flags -frecord-gcc-switches
 
+	# #898098
+	filter-flags -fno-builtin
+
 	# #829583
 	filter-lfs-flags
 
diff --git a/sys-libs/ldb/ldb-2.5.2.ebuild b/sys-libs/ldb/ldb-2.5.2.ebuild
index a8951be72895..c182aa64d480 100644
--- a/sys-libs/ldb/ldb-2.5.2.ebuild
+++ b/sys-libs/ldb/ldb-2.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch b/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch
new file mode 100644
index 000000000000..2fbeaf49f233
--- /dev/null
+++ b/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch
@@ -0,0 +1,23 @@
+bash is fine with "test . == ." but e.g. dash fails on not having
+the two dots quoted as strings.
+
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ html-doc.stamp: ${srcdir}/libblockdev-docs.xml ${srcdir}/libblockdev-sections.txt $(wildcard ${srcdir}/../src/plugins/*.[ch]) $(wildcard ${srcdir}/../src/lib/*.[ch]) $(wildcard ${srcdir}/../src/utils/*.[ch])
+ 	touch ${builddir}/html-doc.stamp
+-	test ${builddir} == ${srcdir} || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
++	test "${builddir}" == "${srcdir}" || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir}
+ 	gtkdoc-scan --rebuild-types --module=libblockdev --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/
+ 	gtkdoc-mkdb --module=libblockdev --output-format=xml --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --source-suffixes=c,h
+ 	test -d ${builddir}/html || mkdir ${builddir}/html
+@@ -13,7 +13,7 @@
+ 	-rm -rf ${builddir}/html
+ 	-rm -rf ${builddir}/xml
+ 	test ! -f ${builddir}/html-doc.stamp || rm ${builddir}/html-doc.stamp
+-	test ${builddir} == ${srcdir} || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml
++	test "${builddir}" == "${srcdir}" || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml
+ 
+ install-data-local:
+ 	test -d ${DESTDIR}${datadir}/gtk-doc/html/libblockdev || mkdir -p ${DESTDIR}${datadir}/gtk-doc/html/libblockdev
diff --git a/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
new file mode 100644
index 000000000000..0fa5e1d604f8
--- /dev/null
+++ b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools python-single-r1 xdg-utils
+
+DESCRIPTION="A library for manipulating block devices"
+HOMEPAGE="https://github.com/storaged-project/libblockdev"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
+	BDEPEND="
+		sys-devel/autoconf-archive
+	"
+else
+	MY_PV="${PV}-1"
+	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
+# Tests require root. In a future release, we may be able to run a smaller
+# subset with new run_tests.py arguments.
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.2
+	dev-libs/libbytesize
+	>=sys-apps/kmod-19
+	>=sys-apps/util-linux-2.27
+	>=sys-block/parted-3.1
+	cryptsetup? (
+		escrow? (
+			>=dev-libs/nss-3.18.0
+			dev-libs/volume_key
+		)
+		>=sys-fs/cryptsetup-1.6.7:=
+	)
+	device-mapper? ( sys-fs/lvm2 )
+	dmraid? (
+		sys-fs/dmraid
+		sys-fs/lvm2
+	)
+	lvm? (
+		sys-fs/lvm2
+		virtual/udev
+	)
+	vdo? ( dev-libs/libyaml )
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+# TODO: relax libbytesize condition once it has gained py3.11 support
+BDEPEND+="
+	dev-util/gtk-doc-am
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
+	test? (
+		$(python_gen_cond_dep '
+			dev-libs/libbytesize[python,${PYTHON_USEDEP}]
+		' python3_{9..10} )
+		sys-block/targetcli-fb
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		escrow? ( cryptsetup )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.28-sh_tests.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset #623992
+	default
+
+	# https://bugs.gentoo.org/744289
+	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
+		| xargs --null sed "s@ -Werror@@" -i || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-btrfs
+		--with-fs
+		--with-part
+		--with-python3
+		--without-mpath
+		--without-nvdimm
+		--without-python2
+		$(use_enable introspection)
+		$(use_enable test tests)
+		$(use_with bcache)
+		$(use_with cryptsetup crypto)
+		$(use_with device-mapper dm)
+		$(use_with dmraid)
+		$(use_with escrow)
+		$(use_with gtk-doc)
+		$(use_with kbd)
+		$(use_with lvm lvm)
+		$(use_with lvm lvm-dbus)
+		$(use_with tools)
+		$(use_with vdo)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See http://storaged.org/libblockdev/ch03.html
+	# The 'check' target just does Pylint.
+	# ... but it needs root.
+	emake test
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
+	# doesn't work at all.
+	if ! use lvm ; then
+		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
+	fi
+	python_optimize #718576
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index f70193227a73..c9896fc7486d 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -4,10 +4,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libcxx/libcxx-16.0.0_rc2.ebuild b/sys-libs/libcxx/libcxx-16.0.0_rc2.ebuild
deleted file mode 100644
index bd6f3db60c4b..000000000000
--- a/sys-libs/libcxx/libcxx-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~loong"
-IUSE="+clang +libcxxabi static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		>=dev-util/cmake-3.16
-		sys-devel/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxx/libcxx-17.0.0_pre20230211.ebuild b/sys-libs/libcxx/libcxx-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 4eeb65e55e83..000000000000
--- a/sys-libs/libcxx/libcxx-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang +libcxxabi static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		>=dev-util/cmake-3.16
-		sys-devel/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxx/libcxx-17.0.0_pre20230218.ebuild b/sys-libs/libcxx/libcxx-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 4eeb65e55e83..000000000000
--- a/sys-libs/libcxx/libcxx-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang +libcxxabi static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		>=dev-util/cmake-3.16
-		sys-devel/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_rc2.ebuild
deleted file mode 100644
index fb725b1c09a1..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~loong"
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230211.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230211.ebuild
deleted file mode 100644
index e5f19fc61a28..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230218.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230218.ebuild
deleted file mode 100644
index e5f19fc61a28..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libnbd/libnbd-1.14.1.ebuild b/sys-libs/libnbd/libnbd-1.14.1.ebuild
index c04df177ecc6..b2cb9e3aba76 100644
--- a/sys-libs/libnbd/libnbd-1.14.1.ebuild
+++ b/sys-libs/libnbd/libnbd-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://download.libguestfs.org/libnbd/$(ver_cut 1-2)-stable/${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="fuse gnutls uri-support test"
 
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch b/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch
new file mode 100644
index 000000000000..b7954a996272
--- /dev/null
+++ b/sys-libs/libnvme/files/libnvme-1.3-configure-clang-16.patch
@@ -0,0 +1,32 @@
+https://github.com/linux-nvme/libnvme/commit/ddfb3ba036f9df2737c165b27f9b458dd83a7df8
+
+From ddfb3ba036f9df2737c165b27f9b458dd83a7df8 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Tue, 31 Jan 2023 23:27:53 +0100
+Subject: [PATCH] build: Fix nss code snippet includes
+
+With hardened distribution CFLAGS the meson code snippet wouldn't compile:
+
+Compiler stderr:
+  .build/meson-private/tmpy2z1t5q4/testfile.c: In function 'main':
+  .build/meson-private/tmpy2z1t5q4/testfile.c:2:30: error: storage size of 'hints' isn't known
+      2 |              struct addrinfo hints, *result;
+        |                              ^~~~~
+  .build/meson-private/tmpy2z1t5q4/testfile.c:3:21: warning: implicit declaration of function 'getaddrinfo' [-Wimplicit-function-declaration]
+      3 |              return getaddrinfo(argv[1], argv[2], &hints, &result);
+        |                     ^~~~~~~~~~~
+--- a/meson.build
++++ b/meson.build
+@@ -199,7 +199,10 @@ conf.set10(
+ conf.set(
+     'HAVE_LIBNSS',
+     cc.links(
+-      '''int main(int argc, char **argv) {
++      '''#include <sys/types.h>
++         #include <sys/socket.h>
++         #include <netdb.h>
++         int main(int argc, char **argv) {
+              struct addrinfo hints, *result;
+              return getaddrinfo(argv[1], argv[2], &hints, &result);
+       }
+
diff --git a/sys-libs/libnvme/libnvme-1.3-r1.ebuild b/sys-libs/libnvme/libnvme-1.3-r1.ebuild
new file mode 100644
index 000000000000..fe8743ba86d6
--- /dev/null
+++ b/sys-libs/libnvme/libnvme-1.3-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-r1 meson
+
+DESCRIPTION="C Library for NVM Express on Linux"
+HOMEPAGE="https://github.com/linux-nvme/libnvme"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="dbus python ssl +uuid"
+
+SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	dev-libs/json-c:=
+	dbus? ( sys-apps/dbus:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? ( >=dev-libs/openssl-1.1:= )
+	uuid? ( sys-apps/util-linux:= )
+"
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-lang/swig
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure-clang-16.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dpython=false
+		$(meson_feature ssl openssl)
+		$(meson_feature dbus libdbus)
+		$(meson_use python)
+	)
+	meson_src_configure
+}
+
+python_compile() {
+	local emesonargs=(
+		-Dpython=true
+	)
+	meson_src_configure --reconfigure
+	meson_src_compile
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl python_compile
+	fi
+}
+
+python_install() {
+	meson_src_install
+	use python && python_optimize
+}
+
+src_install() {
+	use python && python_foreach_impl python_install
+
+	meson_src_install
+}
diff --git a/sys-libs/libnvme/libnvme-1.3.ebuild b/sys-libs/libnvme/libnvme-1.3.ebuild
deleted file mode 100644
index aaed25b8d4b8..000000000000
--- a/sys-libs/libnvme/libnvme-1.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="dbus python ssl +uuid"
-
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	dev-libs/json-c:=
-	dbus? ( sys-apps/dbus:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/swig
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-		$(meson_feature ssl openssl)
-		$(meson_feature dbus libdbus)
-		$(meson_use python)
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=true
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index a4c929d7413f..62d0092cea6e 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -4,10 +4,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libomp/libomp-16.0.0_rc2.ebuild b/sys-libs/libomp/libomp-16.0.0_rc2.ebuild
deleted file mode 100644
index ebf0c81b440e..000000000000
--- a/sys-libs/libomp/libomp-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~loong"
-IUSE="
-	debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild b/sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 6bb50cb9edf9..000000000000
--- a/sys-libs/libomp/libomp-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-17.0.0_pre20230218.ebuild b/sys-libs/libomp/libomp-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 6bb50cb9edf9..000000000000
--- a/sys-libs/libomp/libomp-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
index b35f736ed3e3..0773d8c80817 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index b3ac1c92b538..f60583ac2e4c 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
-DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
-DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
-DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
-DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_rc2.ebuild
deleted file mode 100644
index 15f7c2ee9dcb..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_rc2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~loong"
-IUSE="+clang debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230211.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230211.ebuild
deleted file mode 100644
index 6ffa6c4f81b8..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230211.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230218.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230218.ebuild
deleted file mode 100644
index 6ffa6c4f81b8..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230218.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild
index 42274c85d130..35459128380a 100644
--- a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="compat openssl test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
index cefa4d95a2bd..c828a8ee10d8 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/talloc/talloc-2.4.0.ebuild b/sys-libs/talloc/talloc-2.4.0.ebuild
index 054c6262c441..b53be2e2a064 100644
--- a/sys-libs/talloc/talloc-2.4.0.ebuild
+++ b/sys-libs/talloc/talloc-2.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/tdb-1.4.8.ebuild b/sys-libs/tdb/tdb-1.4.8.ebuild
index 9c6b692dd0c5..8ea33731254c 100644
--- a/sys-libs/tdb/tdb-1.4.8.ebuild
+++ b/sys-libs/tdb/tdb-1.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/sys-libs/tevent/tevent-0.14.1.ebuild b/sys-libs/tevent/tevent-0.14.1.ebuild
index c423e1cd6a10..16c656e2daa4 100644
--- a/sys-libs/tevent/tevent-0.14.1.ebuild
+++ b/sys-libs/tevent/tevent-0.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="python test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test !test? ( test )"
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild
index bd1fe448d57f..95fce6bda993 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 3a26044fac17..641a623a64aa 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 CPU_USE=( cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
 IUSE="compat ${CPU_USE[@]} test"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 95009efe03f9..a4ce7529faf8 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index fe088bdc7752..9f04e847a444 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,2 +1 @@
-DIST powertop-2.14.tar.gz 302578 BLAKE2B 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc SHA512 f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd106666cb52d9ebd5f831bbb99e30f20f
 DIST powertop-2.15.tar.gz 302891 BLAKE2B f554ee9499c78f1888ecd58a1a357bc6f29f53ae2d3bf6b2819d760afe901f5d5394665a2e6a3ecae9b48cbf9703532feb5c16da9bd3edd4f1d31fe12610a2da SHA512 de4ca3ea25697d2cd5f05c41c82c326ad3e2d21cbf38ddb9b3af40c0d862a70781ca45d9ef7b735ad6def0cb580e4fa153eb4a6e6598e204fc931b30d85ecf41
diff --git a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
deleted file mode 100644
index 7f2b7820ff2f..000000000000
--- a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2eb781ba822f2d57420400f648f6f531689c8c5d Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Thu, 15 Apr 2021 11:37:24 +0100
-Subject: [PATCH 1/2] Revert "configure: Remove AX macros from configure.ac
- file"
-
-This reverts commit 1e478d84f051ba56962a1214cb750b810379ac1d.
----
- README.md    | 4 ++--
- configure.ac | 9 +++++++++
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/README.md b/README.md
-index 1b17365..43bd5b2 100644
---- a/README.md
-+++ b/README.md
-@@ -26,7 +26,7 @@ Example packages to install in Ubuntu*:
- 
-     sudo apt install libpci-dev libnl-3-dev libnl-genl-3-dev gettext \
-     libgettextpo-dev autopoint gettext libncurses5-dev libncursesw5-dev libtool-bin \
--    dh-autoreconf pkg-config
-+    dh-autoreconf autoconf-archive pkg-config
- 
- 
- ## Building PowerTOP
-@@ -39,7 +39,7 @@ source files are modified.
- To build PowerTOP from the cloned source, use the following commands:
- 
-     ./autogen.sh
--    ./configure LDFLAGS='-pthread'
-+    ./configure
-     make
- 
- 
-diff --git a/configure.ac b/configure.ac
-index 2571c5d..7eeeb9c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,9 +36,18 @@ AC_PROG_LIBTOOL
- AC_PROG_CC
- AC_PROG_INSTALL
- AM_PROG_CC_C_O
-+AX_ADD_FORTIFY_SOURCE
-+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
- PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
-+AX_PTHREAD([
-+    LIBS="$PTHREAD_LIBS $LIBS"
-+    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+    CC="$PTHREAD_CC"
-+  ], [
-+    AC_MSG_ERROR([Could not configure pthreads support])
-+])
- 
- # Checks for header files.
- AC_CHECK_HEADERS([ \
--- 
-2.32.0
-
diff --git a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
deleted file mode 100644
index f036bf73d619..000000000000
--- a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e87357a35f376518c3663a2f5cac53e9c4917427 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Thu, 15 Apr 2021 11:45:13 +0100
-Subject: [PATCH 2/2] configure: Use AX_REQUIRE_DEFINED
-
-Require additional macros to be defined early, to avoid an aclocal
-"too many loops" error when copying macros.
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 7eeeb9c..37c1304 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,6 +29,9 @@ AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.18.2])
- 
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-+AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE])
-+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-+AX_REQUIRE_DEFINED([AX_PTHREAD])
- # Checks for programs.
- AC_PROG_CPP
- AC_PROG_CXX
--- 
-2.32.0
-
diff --git a/sys-power/powertop/powertop-2.14.ebuild b/sys-power/powertop/powertop-2.14.ebuild
deleted file mode 100644
index 824c7e799309..000000000000
--- a/sys-power/powertop/powertop-2.14.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
-
-if [[ ${PV} == "9999" ]] ; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools ${GIT_ECLASS} linux-info
-
-DESCRIPTION="tool to diagnose issues with power consumption and power management"
-HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-libs/ncurses:=[unicode(+)?]
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.20.2
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
-	"${FILESDIR}"/${PV}-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
-	"${FILESDIR}"/${PV}-configure-Use-AX_REQUIRE_DEFINED.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~X86_MSR
-		~DEBUG_FS
-		~PERF_EVENTS
-		~TRACEPOINTS
-		~NO_HZ_IDLE
-		~HIGH_RES_TIMERS
-		~HPET_TIMER
-		~CPU_FREQ_STAT
-		~CPU_FREQ_GOV_ONDEMAND
-		~FTRACE
-		~BLK_DEV_IO_TRACE
-		~TRACING
-	"
-	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
-	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
-	linux-info_pkg_setup
-	if linux_config_exists; then
-		if kernel_is -lt 3 7 0; then
-			if linux_chkconfig_present SND_HDA_INTEL; then
-				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
-				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
-				check_extra_config
-			fi
-		fi
-		if kernel_is -lt 3 9 0; then
-			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
-			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 3 19; then
-			CONFIG_CHECK="~PM_RUNTIME"
-			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
-			check_extra_config
-		else
-			CONFIG_CHECK="~PM"
-			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 4 11; then
-			CONFIG_CHECK="~TIMER_STATS"
-			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	econf $(use_enable nls)
-}
diff --git a/sys-power/powertop/powertop-2.15.ebuild b/sys-power/powertop/powertop-2.15.ebuild
index 8d98dea2f7b2..25248074f70b 100644
--- a/sys-power/powertop/powertop-2.15.ebuild
+++ b/sys-power/powertop/powertop-2.15.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools ${GIT_ECLASS} flag-o-matic linux-info
diff --git a/sys-power/switcheroo-control/switcheroo-control-2.6-r1.ebuild b/sys-power/switcheroo-control/switcheroo-control-2.6-r1.ebuild
deleted file mode 100644
index b89e15d6d645..000000000000
--- a/sys-power/switcheroo-control/switcheroo-control-2.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-any-r1 systemd
-
-DESCRIPTION="D-Bus service to check the availability of dual-GPU"
-HOMEPAGE="https://gitlab.freedesktop.org/hadess/switcheroo-control/"
-SRC_URI="https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gtk-doc test"
-
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=dev-libs/libgudev-232:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	gtk-doc? ( dev-util/gtk-doc )
-	test? (
-	        $(python_gen_any_dep 'dev-python/python-dbusmock[${PYTHON_USEDEP}]')
-		dev-util/umockdev
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/switcherooctl
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You to enable the service:"
-		if systemd_is_booted; then
-			elog "# systemctl enable switcheroo-control"
-		else
-			elog "# rc-update add ${PN} default"
-		fi
-	fi
-}
diff --git a/sys-power/switcheroo-control/switcheroo-control-2.6.ebuild b/sys-power/switcheroo-control/switcheroo-control-2.6.ebuild
deleted file mode 100644
index b4d8bf68db8f..000000000000
--- a/sys-power/switcheroo-control/switcheroo-control-2.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="D-Bus service to check the availability of dual-GPU"
-HOMEPAGE="https://gitlab.freedesktop.org/hadess/switcheroo-control/"
-SRC_URI="https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gtk-doc test"
-
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=dev-libs/libgudev-232:=
-	sys-apps/systemd
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( dev-util/gtk-doc )
-	test? (
-	        $(python_gen_any_dep 'dev-python/python-dbusmock[${PYTHON_USEDEP}]')
-		dev-util/umockdev
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You need to run systemd and enable the service:"
-		elog "# systemctl enable switcheroo-control"
-	fi
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index fcd71d4e1cfc..9ae952d1c0c7 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/bottom/Manifest b/sys-process/bottom/Manifest
index 7106ec6a7e6f..5ce9592a36b0 100644
--- a/sys-process/bottom/Manifest
+++ b/sys-process/bottom/Manifest
@@ -1,45 +1,33 @@
-DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
 DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76519b7313d0ed684352b339de2ea668c44fe8ca58fc1a5b9f84cc5e9d04d889440abb5985bdc04b267dbdad9d9c SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
+DIST addr2line-0.19.0.crate 33210 BLAKE2B a6b393dcddfa0f858297efb6b261d3a23f118be45a3211ee15f6c58808f241dbcf5282f4a86be579360513f23ac4035819e923f2587b7499110af42e9ac3ab88 SHA512 18da72e412bb89028e2ccb838192330535e45300f6fd8edc7d1d64397792a3db12418aa24a3312730c5414e2a1b1d65e6b9d5691ba234c9142b5d885523a5e94
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
 DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
-DIST assert_cmd-1.0.8.crate 27830 BLAKE2B 68fc42953decc5a39a2a850750348da087a2df29e9e15dcb3f0319088ba8ca399f8db05cda3de693925dcbf147b2a031b0e0ddb6993f25b8b96f464f792cc499 SHA512 78c5aa45289f1f69891001b73f7da32ef61a371a2fa9abe15822406abe4a8df48004b475a00aacd36c2e808539041fc0d3034c367a27de6b539c72e929e42e4d
 DIST assert_cmd-2.0.4.crate 22581 BLAKE2B 7fc9fe4577e486f26d07b2b4419c331022ca61923d0664f4e8a25abbe6d6305600b47c739f9f065ef778bdeb59b6309ab73df2be11e5f8387cac2e7e8c70a4a2 SHA512 c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720
 DIST async-channel-1.6.1.crate 12574 BLAKE2B 5c5c8f1cf1458d952637a439a1534e68bcb4a1cf478cec6b6d224387f56c59dc6cffd2e3621dc24e03e20df3fdbda5b8855fccfbbc26a2aa03656aff3a17d02f SHA512 797b1f5b4c07853f78670e62b67fb787c329ffa2c89475a3767a963d524a69dce082cc7f3a2878d9c990f00ae2d9cd7e0d21743fc4186769c238467bdb20c65e
 DIST async-executor-1.4.1.crate 15490 BLAKE2B 2d85825f9deec4a89eae4be6c2899d22bd96f095413598abe2a58ca07e6b8745ee02a6e1db6a3be034159c7844e55009d6da9845116647c0b021dca115acf6be SHA512 24f8403f7cf7639a9477c0a4ee6fba8ebf73fc64b5c896ff07b5b9ea787ca65fa2e642e46a0ba3796e76774d46373e6ea6a20309feaf1f801281aea20cf82578
 DIST async-fs-1.5.0.crate 16921 BLAKE2B 3758ac4c3fd52d8e40777a30dbf136f2bc869cc167414a01bf09466d6e8f95daefcaba3d89017aee2aead8a0074b2e8f701031aba133efbb5b364dd7c1e15606 SHA512 f23835f24b87fe9e5a86b0600784660c5ac7fe4670cc9f37cb75946ff00f2a8e032fa4a225d6315f6416e40b02fef39c72f0f5513a8314d6b2254160d8db4ac7
 DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
-DIST async-lock-2.4.0.crate 16144 BLAKE2B 0f1f798409576d079d8c41aadc74f7671d9a94454cfdef15e341004f13e529c08c15aafae003a80972115b6420d87a2efbcb1a82fca0756d51f072e4130d152b SHA512 c3eade585da23e3aca17be6110290461bc2cb39b9fcca9c35d8ce71669883d8d1ca42fdca64686126dbf063f289b0142c508b7eb852babd702f2cebc4c4290da
 DIST async-lock-2.5.0.crate 15656 BLAKE2B ba9bdebf220cb53638d8d000b5eb49ff9871c2cc35fa9117280b6ce4aee8c0c296975f315487b5f1fbdf42057e12cc90a72e9f5acd7aa90d3bc3bac580e0be17 SHA512 4b0a834b9f1b841421cf9af0d0f6826a7fcf91b5be208e3f3b923839475d866d9113b37011a9abe0daa5762f5b684b37db062360baf094810a219103fffbe62c
 DIST async-net-1.6.1.crate 17913 BLAKE2B f87069d9109558fcc071ab7d317b1a5613cacee627f41b870fefa4db4eca6aaefc11239085199a1becfd9a75d290f15f6ee4a6cda18e4312f2cf27c023becdb3 SHA512 5ac322945dc81eaf4b222590de1d660d27a1654deba3d9500446551921e80cfef0a370e6bdafc118344fe5bacf4f814132f2020ca6e5e24de8f653accdfdcf9c
-DIST async-process-1.2.0.crate 17014 BLAKE2B d37e587b6cc0bc1617c772e11807ce1e93859a4e0f8b8d0ed319c8107e00f9048fb87fa8f3d19bc70f119df5cf2bb9035de3fd4b1b194dacb4db65c561a44449 SHA512 8e074851f13f451912baaef9217a745a431ed0e5654847c51466ea95dc4457735dc663bc9cf863da2dc05c2661bb741be5d5cab82bcdb4f9400eb9572aa2608f
 DIST async-process-1.3.0.crate 17199 BLAKE2B 26d365c73e55129b3496fe6a1bb55f5c15c46ff20b608b900363d0e5795968bddcfbf0b2487463431aad6bde5f0a861b83c1504a72a51aa96743f86dc7e5e08d SHA512 da151b84b0986b3e6d42e2be71c6931daae98c27b4a8f712e5174eafae4d0ca739bbdaa09065815799a65b5553e8cfdd71be021ec32d630d664c0e1b4e47f6e2
-DIST async-task-4.0.3.crate 28770 BLAKE2B 66186991db90632ffb43c1e6a46a3a6c44fbee1e021b9af7999fe6400477e482d00e79bc8e299e4ed0b05d8d70ebe9a2b824c081e90a79544c53cdcc423527ec SHA512 cbd625c6bb72cb9af3b4a7ba168130125ec180952a55828fff2998b40d341ee1b1b5a0eae07944e9dbaa6a4acb19a1f96200721b6abd61594ffd88c6e4e1a904
 DIST async-task-4.2.0.crate 28496 BLAKE2B 327895275248fb0d405a85e603d26cc4a9dd0dea73c9d1d7f7a56de716010c08636a87a224431b8c4bb7c2efc2254631cea176dfa7cd20867c4e67da6c893200 SHA512 fc52d82da34e84611012cc4cff9624481402ab0ce56d7dae99ddcb5a59eb31a264e5e2597db6ec7595b681c0bea1f159e1f7bcb3e033ba5740b9b11c080c4259
 DIST atomic-waker-1.0.0.crate 11771 BLAKE2B 4e94bf07e1df3b605bd0f8e8f8750323a5fa7a4d9c703b2183323aea8293021ac3028c6b03482941330c598db78aca0af4df06d346dbf581f617c2c333a997cd SHA512 cbc3e12c10f20e1b6d9a03097159a098c5e3a50a941b742891bd39bf0f7310986bda3e1e4c2ea0dfc82a70d9d57342889c46c11fe0d328372a6b3abecf7fa9a6
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backtrace-0.3.61.crate 74284 BLAKE2B 3e66726d5ed8130963a988dbb751828447073467bb6ab4bfa1c385d74f991b52a0f3ccf00823b74a48de3d043e6dfcb474644f7a81ea9cca7242b272cf715aca SHA512 209105f135720b54d584c7ccecdb16b49381cc7531c94b81ff7279a44752ee11075cd85960f86f809a22ecb3dac6728afa05903c1d355df3ad8abf4503eec861
 DIST backtrace-0.3.65.crate 74129 BLAKE2B b10a78685e7e90ab7e02b769d5445ee24753fd30212bb7204ab720fedb1df64259bae44500d9162c1c001d2e9d70ff5d698e02e5ac51e5734dbb7c601e602b3f SHA512 9cf3cda1d86deb6b7f3cada0ed7a9e6e54e2d323533e385222a260b2f667bd1989a552cc35806a1579c1493ee1177e474b1d42b29480c09a2735251586740321
-DIST battery-0.7.8.crate 40344 BLAKE2B 588d36a7f3050e07ccbeada47a328a474dcd647cea7d2d2f254585d0ed115d1655f04118aa7e8b1e9b4758e171f1a3374b7c163aca9652e3125f5494529e7aad SHA512 7cc556753c4367f325e3aee2ae5dc35f7340badccd8b45d0be066e861c60603854e13e7ecb896dd979d9cc1886fc4c4f15ae43b0745739817baf24533084acd7
+DIST backtrace-0.3.67.crate 78564 BLAKE2B 8c77d3d182c7e1ec3840fd6c7f4214322e473ba79a71b2d11d98696f8ae4440350f3c84a891b2ec79fffde107fb2ebb99fffca202d6ed235d3abd68215a1089b SHA512 8603a3b63f4f08be315176908134243680bf1a4b0e6cb26ed81f5fc1060279126ca0ef28f209a10289e1a85214b35db6b496affd71ad21524094f3ee3acd31b6
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST blocking-1.0.2.crate 18571 BLAKE2B 30e69dce433ba3c0d153275b5a56407237de93a50d7a3f9b97505b17899400f8cc8c3dede3f63fca26d5d49e88c3c9ee7ba91401061dedc41358efe24a9bf2b9 SHA512 f9048544161cb3098ec7362487c8df4ece972445dfc94196cc2cbe7faa2b6f3f3e5abe56310675c798636148b0b709d864fb94959d36976043886feb149adb66
 DIST blocking-1.2.0.crate 18494 BLAKE2B 252a17536290d3898015b6eb844225c7fb78cd84424fda2459331d5eda56d19efff48c670b692288d32d870f62a539449a9b3ad7aef947de50f8862d44fbd9a7 SHA512 aa5cc62a340fb94859e90bd54b9e61d897026ee66570f15f94a0be287b470f5222233dbf30cdf1b0860c4a24abdb0c40f925d9ccbabfbf38fa27b5b17917aa33
-DIST bottom-0.6.8.crate 7810579 BLAKE2B d868b1a59d08e22f09e66f4fd78e7f741d3272630c6ab7906dc3fb0038378ec67b96a9f6ad4ed22e5d20d0b0b881912956d0b96f31a871b5a2175fad1cf57227 SHA512 2d86f5ddcc47e688910aaf31798090ea15470b5df9f75de3f9ce3d251b9fa9feb46305f2eb450f1bcda63a5e96d06a18a095a3ca991ef7a316342681b56b5f63
 DIST bottom-0.7.1.crate 178930 BLAKE2B 3684870ac6b0a8792a90f6400bb55743c34fe37e87c30d8f473d09071ded3c3f671cb5ad86df02115d9b2dc1d905fa9b98d9448ef95d9e3ee414995dddfc3b67 SHA512 da2094fb46a6e3e55e16d2404f89de11147defd03c52b1e26fd55637b710cff6b2312818513c68fc01c9df79df2bedf17c85f4a4373084001eebed1393e4ded3
+DIST bottom-0.8.0.crate 179574 BLAKE2B 5d860baea5c2390a99e5189180b76e1e961c89a380d1af8551d407c88939cdf0e44779da39bcb0f04c2de735b3ef6b3bc2cca6d4a79568dcd249490bc758cb2d SHA512 df2b1c4c4d88a107cb050513e8c8507c0de8e10f844622e85c1d08c531fd09298b952708076a724ec011d470483fd9697d609bc8d2a61087ecd93e62246f0fb2
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
-DIST cache-padded-1.1.1.crate 8798 BLAKE2B 3f2b16f0fefcc5acf692684329e38ff59492d4c299413d25e1634ab27a59512b7453cad28b26f34f2b66db3d3c0b4b26f41df042305b7db2b8ca79d36704e8a4 SHA512 72c36ef2f66a097cf2fcbc06b82fa3d5451ecf2de1ee1513fbeb34c6752436109f9e453bec3aab7e1f89723c24f7c230cf4bff6caa09855402c8f92c1ccf49b5
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
 DIST cargo-husky-1.5.0.crate 4526 BLAKE2B e772a2b62036adbb8a15333cbc63a2a27739909a507c8a9bd466f93f86370b364d992395c172a750704ae8e5b2ff8590367bfb2e170ff68071c6b3e4d920fe18 SHA512 5aee16b1bc677504dd087a2b0e71e542b4a33b8ba23238409d26d7748497eb3e91a498d4c7331f312137323bdcf52b406a18f53e157e7d525aa762953c2ac2b1
 DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8
-DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clap-3.1.12.crate 206752 BLAKE2B 84cda0e8b864526fd7a3ab43f0f2b7cc3017054bb4010143b2cc719eb297da4f79029d5e50652a44acf0d71281367bd630fe0e5c54fd5a8b8668c594389fd75f SHA512 94a594886d4fcc3ef745cea1f98202765aaeaac816d9271f132d4f8c90e6679fd56077e11c621222bac9200552839297f98c7788462d015334090e8772715cb5
 DIST clap_complete-3.1.2.crate 23138 BLAKE2B db3741e86ed29b52c7dec82c4d957265bf2d7f10b641f579336d2893f5355233507bf4b2385cbbff1a6ed25fb7a3855e2c0b889257679aaa997be351d3bf3fd4 SHA512 94b176115fa0edf12f1af62388c8f175074fca980f4006f9bb755e9be773785bca80b3b11821bdc8498b06f5d3aaae169f7daceda5a352eb39312f48b255ebc5
 DIST clap_lex-0.1.1.crate 9603 BLAKE2B fa128dbc85152ef312373283fdd84db5b9f9c519d6382a737de2ac9ba8df16e74afafc0c1602a2ae31cc62e8d83232899b1c4eff41be6e7e5f286513f83785f8 SHA512 4d7667fb4cc86fd820262c4642c37a073e558ac5c05e1a8efc2813f54c364e2c4e980a8ddd81e72b11b02f494b20ad89c77e9649d1a6c0ed418194db808f1383
@@ -49,75 +37,60 @@ DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0a
 DIST const_format-0.2.30.crate 77876 BLAKE2B ed3a6020d62461abf2a918d971d462731a399bb0432a70f94e3332f513286af9ba951300104cf538011d99d9e810eeaa91dc3678217f43026e137de40bf22b18 SHA512 3fd0e555765c3cbf282a93a8f97338b332047f543ab9b9e35295e919c474444052dfb611f3db4e457c368bf90552dc9b0e571969ce199d918d893f8f673e920d
 DIST const_format_proc_macros-0.2.29.crate 24380 BLAKE2B 8c648b02740b1935ded19a3c30caf3f11e44315ebfd964189920349b658801ef5f2358a98dc0641092aa85ad25abb30a0e76a253dc71a464fd4b15ebaa224c3a SHA512 0554fc4b008ffa2e38119dfd3563ae871626340f7aadb7d3033fb8938bd3e60ab0ead5eff04cd5b9316e0e7a4325163236c28b060b68994bfd4711fa55657f10
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
-DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
-DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
-DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
-DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST crossterm-0.18.2.crate 108404 BLAKE2B ba276975b3440f4d976c4f66aca2f46f2b8cc4715610e4fc6d3e1de2c98570639b68e4464393fbcb575091e3e8bc3af2ce567775b31a1bb9532cd8a42ef8c15a SHA512 21673eb1efa4b353b48c4d2e4780505fb1deb5ab5767787acf5f7133ef45e83176ad8d020804052e6b283135e72e1fa623b8e37417f805102a39d98cd72a4f18
 DIST crossterm-0.25.0.crate 116533 BLAKE2B d39cdd1f4df716974cd0929ca40073ac6e17b2dd73f27b48c7b2bcd7cb4545bce544b2e8459812b866936c03a27162b309848e6a92290960619c4efe2a1e0502 SHA512 fdf2b5b4bdcbc8c7dc4e8c5e0cdf68cacdb97886b52087dde1f1be9b869c00965c0cf9db64b700801b0d1274b913703ade66a92d47aa8da604121693b8701201
-DIST crossterm_winapi-0.6.2.crate 14962 BLAKE2B eddfed3ac40885c230c75d56c16ab447de950a8cdd2f003e65e2331712401f7ba2e228134fc1012d7a09d7fe080ca279fca6f4fe9c4d611c6a3a485eedd6565d SHA512 39e1c184b921f8cf69d6d7419fa93be2a6f4d3b5ca2461b9f9025133789d813ab37d2c4f4782ff48d466b2644a4d7b341fe1004520b6b4e6f4c7c7d5d4837124
 DIST crossterm_winapi-0.9.0.crate 15561 BLAKE2B f84604f1da9cfdd0fc69742eef8088e7d0959073c6f7f37507b065b8537faa20bea8e349bcb1d6836be97f06b4a2c55c4dc63f50eb2f2aba1f34df9b8c9abf1a SHA512 b8c32a82cc83244e8991931e3fe0d85527ee2cc5e6b4a0839d633448dfa8a137c87684e8e079f44edf5a994355e0106bb573b36b57c7420ac5cb6fb0ce20ce8d
-DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
 DIST ctrlc-3.2.2.crate 12699 BLAKE2B 39d2e05a943280f3a62f3464bd77cad5f606ebf912c6430f4b49ec07a3cf2b1fb19ef5be5d589e931b9d79c5af882d51782b580d1a89a48bee221585c1212b1c SHA512 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9
+DIST ctrlc-3.2.4.crate 13207 BLAKE2B 74158a7322b8f0131c7c1259b844e07eab208e0273b45ca4e839174424280cb6d84c5f363a99da8f6a315034afedce99ce176c74782ab7f813393456cad20a73 SHA512 cc945d6092f8eed3e2a50fac82e54b132dd661d58819b9326dd23592c3848c919caa6c2490cda269154b8ddd0cdd47144df025461c72885b4fd6f5d33cdab242
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
-DIST dirs-3.0.2.crate 12184 BLAKE2B 414fa4734fd9e108dbc887210e71c8be9834c1764ca35af66781a8108af9fc704f4e7d420ffbb2adeb2a14ca5658e53cb5da4b486e093b3de010c542f7ce7c7a SHA512 97dc343d580ecda68aebe87bcbe8c13a00078943771e3f1dc3101d8d450d2ccdd0d74283870eac1d88255a99e887166d42533ba8e70d15b9cdaddb57e3a27c55
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
-DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST event-listener-2.5.1.crate 16237 BLAKE2B e1b2c4415cc155aec0ee2187250820d98640d4b4966b8703366bf98d3652d03faf627f0d20adf2feed946d68ef273cc12a87a7ea0fdb9bd8075123c52896b343 SHA512 c7762f9b7814d6172940310cc2a52567741affa34b894877ac0577c902057f26f228c185a66a31bd6fc0b2f0d50b2c8cddaa2748c8983ebfb59aaf23324811a2
 DIST event-listener-2.5.2.crate 15225 BLAKE2B 3a8b8fbc6b938fd6c2882dabc1bc23eefbaff2c1a931972bdae6866d9d03cbf3e03f49b4d57a98104b311e1bff38f83715c1e3494197d9283f494678168692ea SHA512 65a9c5669799dfad5a1dab9a500244f444693e9728b14a70aa72967f90cec6e9de06311966d85f8408950bc94e24697d9d4eaf253754a19232bb52347ba989ef
-DIST fastrand-1.5.0.crate 11100 BLAKE2B 3dc6bcea36656fe801d2c577d34bc3564be13eb7a3b50efd6c3fdcefa8a308fb9e9289ec8def656abe83d40299a2853f9365a32201130388714927db69005b18 SHA512 22b8cd9f143f208d1fbe24ba8be342c465da6ce7d96429ef64f18f57c5443ad242858f859c5444103315e2ac3710fc5ab72da78fe1c6c67dd75a829c6356caf1
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
-DIST fern-0.6.0.crate 299856 BLAKE2B e7adf3beaa2f5fc029acc8d87411c5ef8d3288100b5521d0c1379db6868bcaae73e197f456509bf29f52429ec72bc6e5ef297e971ce9cf6d7cc6232b5d9813fd SHA512 d0524c272cba970b5193d845d4e84698d64bc28c75b38dd2f265f1a132e1c9ea177ebdc38741614f6a6f3d106c7c50565b8562378a50d59ed093e00aee8ca382
 DIST fern-0.6.1.crate 300402 BLAKE2B 70ddb9f8cf605471594d961fd8dafa20100a7eb9b58bfd17caba63b60fef35d5c96e642c03c5b302c314361b695d4f3b4cc10f6f5cc78e6ee13e97eb94f6b73a SHA512 f33d3e03c8f4248b046bc84c83d0de9be77b895e79ebc1ab943c50d7ebae021477749376daa14763709aaafa69d414a8ea774bb009a10737d1de57c7cb6d7fbc
 DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
-DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
-DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST futures-0.3.17.crate 47388 BLAKE2B aef48709c0fd15e33308ccea3adfd2966335de4c4ea24d04306e6e8d724bc6bd3355c8fc3d0392d4a26dbe85e99769267569c1ddc96ffbcdb972c2fbdcaa9149 SHA512 c2099288119c37130692cb747c7db16cb3139ac5db8fbec9754dd373eded0593f9444b8d0b003ad3fd138086959c1b74e105f2105311eeed5a65367d9ce795ac
 DIST futures-0.3.21.crate 49935 BLAKE2B 290dee4f7662a473d82350092c0b12a8270f6d6f5eae9e4f7e06a6abf59e2d9f2d33e5e62e2682fcf6e109d62f651cb37cc467cff2b20f909c72b5fee2cb7683 SHA512 723fc190e4480fd812a852656fa6509a188f0d06adaa1c22ef24ec4afa7688a1c5d3961e5747f0812d073fc672b0e084af6ad5e5c3fac3ea5829466f993ad865
-DIST futures-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
+DIST futures-0.3.25.crate 51664 BLAKE2B 8324abc819143df0f11e76ec19a50a9d6df87dd243610ca756d54f519058ddc25ce72a7652698dd3dbd00631eb50f05c7b4567cd87a65858fcb4ed89e2d51fe6 SHA512 1b41edee2927cc68da7101fd9ce8616a61b4102bc378429b8b53adbabda584a5e1df98bcdb2b0ec73466c5a51e996dead7b2d286c7025fcafaffe5e64d715997
 DIST futures-channel-0.3.21.crate 31961 BLAKE2B e99f37cdeac080c8bad2203fd24b48eb62918166104ad6cc531c8f69d3e0c3a5898ca27f19693e2c143c9049a7d244f9af49c16fecba12233f9ff3f1d01e35b0 SHA512 1c10398657949b53b6df196cc44d8e4b3acf53b4d216be6f5f631d8d4b500f5c344e2cc7d5a5642ced6c5480511884611be6d429f56a0ede4a716b9c5770cb76
-DIST futures-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
+DIST futures-channel-0.3.25.crate 31974 BLAKE2B b0c8f2b3ac8b0b010aab83c6e8d2d7329d49b1c9727393f81f9af8c80b232508ff475fea86448540d2e9016d645ad8afb5bbf746e618078db78631a9b3616481 SHA512 1275e91c90a060a01922747d160435c04bba4686990912e5ba0a4fbbd91ebdbf4f5abbf3530e5f842445f7482e60afdcdbd836586b42f0277e5fdb1a2fcb7239
 DIST futures-core-0.3.21.crate 14601 BLAKE2B 73cf4c422202a34cc9916509939fab35c79093a6c1aeb99e35763727ebf7d3a06ae203684d75cc74183126f0cd95dec1530f136ffa2a0e69354c554883e3af1f SHA512 b60e7892436ae28fd2240f17816f934f6caeac663d67b8efc7d519ebb4b0bd921f0b732b6176bd4b472d2fbe346d39a37ba394401e15afa93af8294ceea90976
-DIST futures-executor-0.3.17.crate 17102 BLAKE2B 9e9864d7fd3a38a800e3b07c22f834575f92704ea88bf0f295a95d1b52b41ed698d4e7fd89c5dbf503a99676c6ad036d9f96dd3e85bfd49c26d1127d55a6a4df SHA512 e3ac739e58dbda88dd536382c603014c56b7ebbda529c81afd0d91c16770719902fb4883a7a0dd0375e7910fc03605887058ebd30824d01ca20e2daf93f3d94a
+DIST futures-core-0.3.25.crate 14623 BLAKE2B efc97e52dd0aeee34402018897a276a68cf94bf13fe37b4c0e4d971cc2dbc8cdf54d0744f0846049ff75192c0fcba906b3556f000fa8657f89a54d9356f8f578 SHA512 3b3c758c493255024df26a763023a5d403fcf1a9fd105b08c518bdd5891ada4fddfcbfc8cde6101157a209ab6d1555831bfeb49372b17e902b4fdd8a83cded4b
 DIST futures-executor-0.3.21.crate 17306 BLAKE2B fd20c7f0b4996cc10e3b3d30c33630a42eb363ac7893af4ae5c476775f8e4f3724ac110648252b6cfb3d652d352fbb5833f2647d262a4c9ae999de1fa69340a3 SHA512 597732f96b45ce21f7a0b149f62cbdc54a80010bfa5421ab0ef7345c501c197e1c8fe109fa2d1c813d5c2e872b4670e0fbd96e2572cc3e9d2646b68f41c78147
-DIST futures-io-0.3.17.crate 9050 BLAKE2B 729fd0c2bbf5a665640fe9e8dbb9d803474cbbf4385188d1cd906f526a2b75cecfe55f75aeb0a491057af319a19fb0117420af75425375af41622c8c68567cc4 SHA512 a2b65e07bfea15b78e988c5a9d330ef51a396cd22475f171b342cc8a6520749335af851ae11d44c91f54ab06f425b0dbfb716a959c625d3c52db5765d0407e0d
+DIST futures-executor-0.3.25.crate 17744 BLAKE2B 3ae27b7f4cca071c7f411e783781f2ba774da2d6ecfc9b8b9ae7cd9a4d81a58be3e9c967c1dfd24ab339b09d8d0f8cb10e5c3a7e34b5d1e9a96e28d2bc575869 SHA512 66b9bdce86c41d5574734a6878562fee45182a3a6ad3b5cf57895aabafa5ae610f440dd226887e547c3aabee792628a5f7b4406c4ddd909501afb66dcb26b64b
 DIST futures-io-0.3.21.crate 8902 BLAKE2B e673342d3fae38e5a6a20c426cb1127353b4f15459b4c27965566f7f2f13f0773ac6ec850b0d679bea37d68219edf6cdf9d1d0eed37665f4ff51c6060b81466c SHA512 dde0b79c4ba208b4c92c699457efbd515d331ab612e7b7df735b3b8f2ab79c012b1ba329ddaf488d68c69dbd119aa231b833b81cbcc0cc2f55c656f68dc22bd8
+DIST futures-io-0.3.25.crate 8911 BLAKE2B 4100c46b7ac6908e849d3c50bce6d563419a2eea7d05d27844408287cd41bc29310754012031e3068c0d6b90307c9de36261400d438046af74d6a86b0e60f31f SHA512 ad19dc9de5e3559ac453478aa5d154c28a174a9d6492c028cf4d7c6d9e2ec1ce3ba80aa79c0035f82a1bbf86e55e4a65c9eae488bc5dabd399419cfa8cf652e0
 DIST futures-lite-1.12.0.crate 36032 BLAKE2B 16cd92362ddb217fd3c316f1104635b086abbf3b482b3381d62e3b5ddbd20122d1dadb48c83d3022db080d05352ee5a40f33978529bac3eb182b875f45cd132d SHA512 3d26148ed1c87926de51412a8d08e0619c64b85b610a74d6f61fcc1972dc0cbedb04c5824fcb4ef0a920c557ac81a0b2b4403ddb1c01e11648694ae56c28d72a
-DIST futures-macro-0.3.17.crate 11830 BLAKE2B bca68c3c1ddca764ff86d36667c3da3805b8aa730b300f97d5e77dfc695d33484b4b8ee7d3b415479852e02a126c14f092ee9724d3d91a8793bc91a165dd5381 SHA512 518969498808bcb63cc797934ed7d699f776588dd7fc9f9c41c63874a05d03781b5c0241ce20cfffc8db569f01fc82da433b7ea7772f24dfc2df5eca35b5146a
 DIST futures-macro-0.3.21.crate 11250 BLAKE2B c981e6d56971871102591b6f14b13f0ed75499627036a90cb71a3e11336db408d11ea0feced484d9ea454f47db74951cdfc61377af267359f46cb6462cc3fc0c SHA512 a79d4d3e487d05554e05e04f3a631fc9f0b5c525126eed550ee30eed16d4c457dc39274efac53558a3e33a119b8ff9d3552ce367359eec9d05105b278f7677c0
-DIST futures-sink-0.3.17.crate 7663 BLAKE2B 598e864fb6f2f34cd72c67e5ced93d0e54d2e508319ba191a2779377d9565799226783b2009190cd6eea63c75562e209a526c724ea8616d22a1c7b4ae543ddd7 SHA512 39996fd6bf1fb5ebb0dbd5c0d18f9a34f21e65dfe998237c2e047d836a380ebfb9a2fea05a2c11e447e9a27dff0bffe4a9762e83df2f17aa90a717fc98ba5803
+DIST futures-macro-0.3.25.crate 11256 BLAKE2B 310fe02b66c014c00dac0c4795ced9ca9bf46dc48f964f50d6300009df2db8505987849823faaa3a0dc312cac7cedfea0cb892d2b0f2c4445bbdd5471953115f SHA512 603863a3249df6dea4ed249b71236526ad506faa5cdc430b3a0c96845e21ffcf800407eb31ca7f0cd45c989bdc1ea68884233ab0fd0abd1d61700830293e968e
 DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f96d4f0df0cb035ce964b91e97f88c7a1a4942ec4010cb4da5f4a3552487eac048a6bfcef637bf1f83398d7f38758e SHA512 9bc0198495b5a1b3ed25fcf7b053a235bba0a43a4226bf085d9027537a57add1686ef61179bf2a2d4189945cb5a05a8d64ba6e6e647c56245666d51e138d113f
-DIST futures-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
+DIST futures-sink-0.3.25.crate 7854 BLAKE2B af109917de26c608b21d2fd1be304428a6d78095168a0b14eb709136789acda0a6bee4332802c3fa3f1e65ad9057e765b43728b8aa6ebd6bebeb2f25d5f96adc SHA512 fc318461bcec3344c0658135944ce7ebf6756c9d1950c2c5e3ab3ddc7d4ef5b0f0858d09f14d7bbc9a9fec7da19236a10dec0e125e5550c965bae95255eb0089
 DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099c22c0024669906036504d0e70998cb9cb5fd4074928d21847334611ccfcbe6d3e2f686c4d4d7d4436f1e7f501b8fb SHA512 8f3b27865d8c7a290471903297e3c0b52caebfaa55550a4738d7915008b893fce67c7d9ae5c5bd03f2a42ee72a96aa0245c4bee70fc06977b3493eb81bca2033
+DIST futures-task-0.3.25.crate 11844 BLAKE2B 60635ba309e978f1b4ba72b29b9d5cce1d870d8398986eb1845d8194080ffd9845d8d2cde19ad0333843bc642cd08a8e5aa44b8c85763ef459c39de4a5cd5042 SHA512 d2278d52397390d7cc1028bcccf1aec009b16ffc33873b8a96cc4f456d7cf501b86660507489d8b284e0798e7fe68c04796471050b6fd2d0529c761d89f9efed
 DIST futures-timer-3.0.2.crate 19879 BLAKE2B 4e25777e567f390799b4b01186d59977f1591f9f8425b6951679226375cf90764bc157dd2271614f16b7b13d3aea67509da0355f3c4de3d323b1bdc668bc7525 SHA512 47cc68f9f134e557d66a003d942d8a4201b1db56f1ed2ae276a2fe6f56b24c06ccd108d9852f9fd9db7d254bf8aefafa56cc0410bea41c3805d7e4bc3dc4d73c
-DIST futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
+DIST futures-util-0.3.25.crate 155866 BLAKE2B 574e7cddaae172827179c1d012c8088ea84141d453b154b4358350f53f94d13b776339b0fe16b6e18429e2f83cf5fa35bd5079537a044f240c1471014e3b6a2a SHA512 3e233a3093f3889af6bb5adf661c1cc32f821b00975bea05eee14c2b38e25974b65c10234eb060c52dea4c665ebd09895df666f8583559b7f7d7636070ea51a8
 DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
-DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
-DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
+DIST gimli-0.27.0.crate 720457 BLAKE2B 0a4fdb66844f3370203dc696a2f826135630b29d3aa78f378a162f5c74763565792c900174d859f4e15b32c951333fc35e46ae7c2fa293a70e3bcfde4cbb6183 SHA512 71563f0b086ec7e22475db77b4f18f05c706dd39dee37fd5df47e636e010c6ab1dae0f6759c6b90a0b2d7937a85878d9b8d62bbf7b5b7e2390335895c6ef2905
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST heim-0.1.0-rc.1.crate 8778 BLAKE2B 266210250ee4933ed5c3ed66b9f26f3046fd3a2a5859e6f56102e50d83f8f75cabc7aa314576c0880fde965c93b778a198e4847a98f67801b9f9f82eb85117c7 SHA512 2c456cb9ef544c848e88a72952287ed66af7c10b465385c06cfe13f3b2e4fd0aa5d0647de58ad7895755345fbb29c17230b1cb58139fec3b9c2bc3e1cd3015eb
 DIST heim-common-0.1.0-rc.1.crate 16305 BLAKE2B c622705a4497972e5ad2032aceefc1d9821cb2b3e3b1a1ed3cf61904725b34c84f24721567c7c13de548ed6f5c778217047db1d075dd5dfd21145f07a64ebe18 SHA512 ba8ecd8ba367536b6f52d2b9677715d4b61fa1b5ca93ee20195a7687e99c8c4e01c62951085af45880a12ab86b311743466d5898665053fdefcb44067ac01bb6
 DIST heim-cpu-0.1.0-rc.1.crate 21134 BLAKE2B 3f752d3ab580f818c5c9d1ed0aa9f58a68ddeb183e3b82843c9f1fdab257d65bc560cdf24a4158b28683fdba9d055edb9a7e4da2c3e55770f2f086633e7025b6 SHA512 6975c77588bbfbc26536bd3ab5b4e0a0aa4db3fda51b75c94dca64aa928c19bb371ab7d27ca8498feabb6f92d4d598669041b38d443808577d957e2b8ffbb2b9
@@ -131,155 +104,122 @@ DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
-DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
-DIST instant-0.1.11.crate 5408 BLAKE2B ea26c11694002f667b5c42a93feb9acacaf7824a7f618809c56d0916dd8f9b045a544fdb793aa5a64b1cef00a648bbf71e6addaff69829563bf09a7525c62bf2 SHA512 659eefd86f9aae74c96bb3f1359b92052c43a4d589b3a591d76c0d4298adb53a013a0a811b0fb5caf588aa093a51589aa63bcfb7450b8cd6edc0d73a4ed169b3
+DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-0.7.5.crate 36261 BLAKE2B 4d6692d2bd5f65fbb2893bdf248b27324deb143c19414f8997cc502ce13216a0852772d44241cdb71020e4de00c5d500c1d513a3cd85e6e434c235fcb7b036ee SHA512 d4580859378a20e9a5c496f8bcaa2d26d3f4fcfde3d6608c9081193b55d53d1c393f32a0a40c089a64f6f4705e184c44e7724cb8bb5f80eb64e53762396f77e7
-DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
+DIST io-lifetimes-1.0.4.crate 35815 BLAKE2B 82485bfd13189e0762f7ee501626df0dc741e152ceed875b91a3eed6608686b6d454939d557a0bc29d6bf210dfbe56d35131beb141fc95250544ab8ea992482b SHA512 1b2b151561dc79d1467b699590b2cb5d4acb39f75f38c05a94edb6d1543acca541b5a083fe7b606bc37cb2812692b7acb46996d0b096b96b0b085d31b1336775
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
-DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST kstring-2.0.0.crate 22063 BLAKE2B 71e58489a167d57326ce974c8e05dd4d2e18f7fa142249aea86594b56b83d566e14fdd79b7202a20ca9dc9e0911f7f873454925fed642d51241e6fc920775831 SHA512 17cf8f86f0a1df9de75ded552c4bfb9f7f0567802c83c0a8fa71625aa33cc537b498c3a247716a7b91b01c609a3722233d6316322210aa44850fd564ca16f624
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
-DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
+DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST macaddr-1.0.1.crate 11162 BLAKE2B 7c3af87c657999f1f34974b9393391779f85e2ad778117ec33c11d116d83103fee965a72ef655b70d4c9ce8e21f3d76a2b44a961adbe7c0061d879b1105ead54 SHA512 268dce94149b78d3ca7988fea8906589c4f5c5cd7209b9c3b5e7850028296b70a959df0ebfc082476552f82b21c81e187e984aec545599e347dc7bc86c911e75
 DIST mach-0.3.2.crate 19611 BLAKE2B 683aba7d140a3697933835efe4e2e5a6a107f0a6122ce4533bd9079c0de4346dd1a817abeca4372a44a85406a424af9deff87496e79359df4c8d9ff89daab7e9 SHA512 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
 DIST mach2-0.4.1.crate 19723 BLAKE2B 8212c6e85c0ab8a6dde8f1a3776e8250bcce79cd525eb4ae00db926afdedeff6d84ff687156bf481460d56aec62c818feb7e3940c7ccf428bdcc7d216f6914d9 SHA512 eacdaa1f04602c9c0b6107a8c0493b597a81802c52a14ac66a0a46db172b3da40733af8637e8221608f62e160ced0e877906d9a79e56c586d5e0dc47f60a8c51
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
-DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
-DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
+DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST mio-0.8.5.crate 93993 BLAKE2B 6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc SHA512 e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede
-DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST nix-0.19.1.crate 213462 BLAKE2B 6abc355e7635272adf3933ec5835704a1b1b13b2d2a0e1a4d93280d91093184c7a0a115b75aecd44420b5f4f8e766fa0a86ae3cb96f71ab91bcbd0455a2bcc09 SHA512 0ac549babd0ea438825ad875dbaa4563d8eb90d83160dde429c0a97bb77d4ed3f19f1ad17437c61da69aed3f23382d464e99bbed0199678f7de41cd38953b51c
-DIST nix-0.23.0.crate 185348 BLAKE2B 3b5acd0972755d7e3f724d2429b801d5952f2410d91240f9410a8fcc724421beb8c85c9df35b7b877036bf7bb83977e579293ca473efbf9a34cfaa07ad174fe6 SHA512 0aa28f348b67eb79f6f36410e0be4a888294312350b67717ef462905fddb7cba4d81fc0748515629cfd617535c2244e651b05cb0600a054fdc40ec60346a8c8c
 DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
 DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
+DIST nix-0.26.1.crate 277805 BLAKE2B 7ba6efa24a5ab399184623fd019643a132a803cf72a9b8b4d0070caf839e123fb4394773e0b816c0d024494d657eae9b05b56b0b4cc6ace6d07db03a3d1c461b SHA512 4d75ccc1a8c4627dc14b4a2080aeda721d22dd6d7c78e448131f7589d0ddb58fd5649eedd80816153a978571fc843f078256a6c09ceaf34b95fd3caa3e6b73e4
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
 DIST ntapi-0.4.0.crate 126602 BLAKE2B fb6ce09970a93eb45ce0e72d6c79474094aa5cd49feba3d780a00e756a2abc2e57bbf35f9683d09b8be979a6241daa1a84ed8b766c192670e0135438fb05eda5 SHA512 481833f9abebe412912c1228a81f733c64758860a71d300424ed3fbb6863d74af4e3538c14f67b411d4398ab9ef5d549dfcc0ca22b1c49b0a696d1eb4d233703
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST num_threads-0.1.5.crate 7109 BLAKE2B b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61 SHA512 3ad2234945ea20f47efdd8381de2f0f05790163bb1e4b28d9e630a2da4d86c99e596558ed231e2e9d62d84ae85f8f5422dc11c323ba899e37ad1e654e3c4fdd1
 DIST nvml-wrapper-0.8.0.crate 70859 BLAKE2B e0dd26261ab1f66de7ef0a963fcb6e682016eede3e77f0ddd1df8363932911aeb0346f4b4a908a6ff8b81d599a0075915f71dd990df9869bb32663da6c2d000f SHA512 e4c20fa52dc490332ba3fe1ddcab8c0fb9eeaa52c9e24e1a5ecb9f06ca6efd736b3856c5ffd48a7c9b04bb21fa08c4d4e1563b797042e116555497678b4e4aa2
 DIST nvml-wrapper-sys-0.6.0.crate 28405 BLAKE2B b1859f26c5d7758addbf18475f3c87cfdd506dd66b9d530ac1e18f97b9d820308834b80165d3e8fc523e896fa7c3d2324422106abdf5aed500ca5eed6df7edb4 SHA512 c987c86ff6e1c4eaeb0ab28e2d997e4a8a9c0a3d0a211119d70b7cfd8ec837f3a532484f4d37a64a4d55f1bb3326b93f293f7779dedf9680924e7009d0c31801
-DIST object-0.26.2.crate 238067 BLAKE2B d7731f530dbbbfebc506dcd12bcf33e1421785d9711864d6d824360aa249b85985f4db69ad4036bd7f8fa22d5909f973a0f58a03021289a611ed5290d2fa68b6 SHA512 42882e3b1063ad8326bedd3f402831d6206603f8736c5aecc3c16d296007d25360ce9143bb3f859a6d52f1a530809df1f1117d321f0d22f0b43c1831366eec6d
 DIST object-0.28.3.crate 233545 BLAKE2B 241e399112a4962c034f1aed3c651eb810c1cead10c7c6b1d6ad4bd8bd61412794f18827979c477005ed8ec4e2fb2b2e7ffdab118083143e20862f1d3425cc03 SHA512 40dfafba5105a270be3c8378df9000efde2f6bb149b1012da50ded7415c43143f2718431b516cef1b14c739b73e1915e9a1bd4a38141db2c24008fd1d8e1f8ba
+DIST object-0.30.2.crate 258743 BLAKE2B 1826b2bc4f2196337c71859df0ec0f7b08f877955c40a507a5f6d7712b3a1d251e2552e1768a99d057f49766c01bdb1b983d4d86487a7577d606b15b659a4f5e SHA512 a9ffd2667bd6239d130619d4984fa28a719b857f6dc72a987536b5097e574e7847b6f376e568bc30606c1376a484a060418ab69a06ba7acf9ac8deb4409ef637
 DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
-DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST parking_lot_core-0.9.4.crate 32359 BLAKE2B 98629cee7346434103d0e9776d89d1c875c023c3fe91d47beae2f3029fe8bdcbe7dedadd262012ad9d1a1e624ffbebe6d3a9165623e40077ab9d0fa4b768cea7 SHA512 6dae00356b759ad1dd08c1edbcc3ffcc86ad412af98a5e4cdf4fc622d0feb79bdb3900c4f72e76cce803c667a6d8581b44264980816ebdc85d59ddaa881a2990
-DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
-DIST polling-2.1.0.crate 17682 BLAKE2B fbde845d616fd812f22c68fb2a5723cbce54bd5a7ef74dce038962becd7f1353d2e11181c26cf7e3a169b563b7c71da3d20150e504ae57dab50a3e6631cfa6de SHA512 0c468735d4369b99b702ac10acdf54fe0052165f7a805efc4258b46a752247545a9df7b295db81430444f8b34bb73eea4aefb2ab6f8c8af38f7adb513eb55b3c
 DIST polling-2.2.0.crate 21616 BLAKE2B b431e4d31a677ee3d0d36710b27fe98b5df11bd37ac1dfdc464b8a0864dee56985125be388afe9f4c5f8e8c556f668578b2566a6de85f0797d6ecce285d42953 SHA512 6592682d6abf61341e18e5b7e6aedccc31de36016c323ee4e01ca4247d5a40be14f9f60e0602f828ce6ed55e29daa3e601e62a1d472a7ab3a75d760fb1fbd99b
-DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
-DIST predicates-2.0.3.crate 29239 BLAKE2B f99835f75d16eaecc0a472015d07510623e87e694833c81b78eb6b4da9eca2b205ca596a873e49b15ce5972fb45cc9def664fbe2d9a9697adf0e0f2b3aa74713 SHA512 d77fd2a112b2ba558e78538e766ef551485938a15e32ff03fd8bb1a5448d03b41d8790ad88d6650386970028915cd8bc99a26cc1ece21d1bea05f4fc85d16991
 DIST predicates-2.1.1.crate 23150 BLAKE2B fa8b250752f8a5d6ec30ab3aec3aca2b48e903fd8d182817180633f9f2a55e4632b1e1912c9edac453ebcded9f6624c42b38dda70ef36fd710e1dce1f1ce6346 SHA512 c850fa2541265aeb23d5c19dac6c7654dc434f1239ecc8b1cfaea89bd120112e2c45f127b491fbfba1c053db8413e8b561896729a56b6588142dd9ba9a33988b
-DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-core-1.0.3.crate 7757 BLAKE2B 91b3d1596ddfce6e58c33970ecbca94acabca660109f888f32aa73352e157d78afcf879afcb7eec61694f89445c42d355eac46a3ce3cd6163f8e53265e0554b6 SHA512 76d056f0acdb2d9c5cd44828b8da8722899438fe7e11ce6c96d3ce2bc8c267508e1010e2ac2c7bedd3281fb29856a3cf29f93de51b0ee349a5ef51466ace799a
-DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
 DIST predicates-tree-1.0.5.crate 8126 BLAKE2B d63d2fe2bf9c61e703f11b8d3f8a8434179b8de1f45a52dc6266e79972e0abbefbefb0d57359005bb0daf06ff17276c858481be8382a7383058ff25e72dbb3dd SHA512 950f9191f44da894feb209110488de3da0e36cc86ef366ad2749a66bba0053e23c39fadb67fc5a4f5db3adccecd414619f9f805c2913733df96254913c360bfa
-DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
-DIST proc-macro2-1.0.30.crate 39155 BLAKE2B dd0ec47a3a54fed6cb3b03e5edb5c3e065e5644f631560595eaca028926f283ae20b3e9fe699b0b968e00d3bec6ec95437be2693ccdf22f1524dd5e4ba3f7886 SHA512 d07ddc18dcfcc163bd243c22ffa4735bc300f304c7e70bfa7caba91047b1313bfe1f18aa4707a65a40fa18115c4b32c57b23699f9a4d9b4a09fec3c8aafb1d34
 DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
-DIST procfs-0.11.0.crate 100054 BLAKE2B ca57a32ed43aadfb3a20fac202bbf98ef2204bf27829e7677cee03e789dbc7bc7d9bdd78d3049ff0f2246b34836abe5e639efcdf4028882976525526de024631 SHA512 840c32d96411184f81698269add90071fb4f2bcd8b1821923aa2f82a8c9c29e6efa512e7d4575ca8d0b67c07820539abea11b693343fb3b4bbf5dfb938a40dad
+DIST proc-macro2-1.0.49.crate 41977 BLAKE2B e31c81d3b836404bd2c28363eb0cf2637cb7fb1ff5fb39333158be2b40b15f6f8f582edaec51cabd32d7b215df39c08a9632208fe4da36fc435dc32a48483a6b SHA512 b490d5cbaa790163aaa49c1595e694dfaded61c59fc23f9b6d359f4b774ee6eb20ae8efc5f5ebd59c8ca75da85baad61c065451c1cde03b3b6148e2aaa2c9e1b
 DIST procfs-0.14.1.crate 113661 BLAKE2B 1327f4f8b618d04bc964a2e9b4609cf60f1a61f0735ff62f48f5f72131434a06742247e9a94f15883c27570f0eac05458234c6e795f9079eb8d3dac1a370daa9 SHA512 736fb1da5d90205e97077180ac589a7557527d5ccdcf699d8e6efeaded31946ab6578f69de1284102cb41e60919aa03c65cec25671d943d57eb47c4cd2b99e04
-DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST procfs-0.14.2.crate 116068 BLAKE2B 86099545f027e8bfd78200e1048c711b05f4009250861a31e5b02f5b14348b3acfcf048bdf17516a7d785d027a9347c9af0bb2e1a4c5ae8d50d386e7167cba99 SHA512 70473fd8c6309507cf3451ed13d014b03e3bbc77bf50425849788e93cbe1082ed74780315a11f84def39f4dabf165df09a6faeaf9ebc14e2ecd57876c61de4c3
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
-DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-1.5.2.crate 165456 BLAKE2B 0a08064df966422d32f582f44570504bb405c59f35f20fcd792f4aa980b62fbd8797e8e01f01a9c3ec4f87eb3a1557f485a16ca2191749759beb31f4d704f082 SHA512 3c11bd89692af7e245be2c0b26d96e864a6353eb901706fe6394e3ff8bba13a829609d2a086aa69fbf716ca4286a1977123a950080d673814edf6bd55d29d459
-DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284ff9f834af628baa2484d3b468d6c8c31ed0309e226def441ee7a94e2ad0b9a2adf107493bef1ae27882d93a7ed SHA512 83c17e71e3da636d97ad77b64d988bfaa78addfd0c512f0fc09b1755614dab2a35532a4dcb126fa15da4e62461e59f5683b922a1fb4a5381a629992617d0383f
-DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
-DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244 SHA512 ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85
 DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustix-0.35.13.crate 270275 BLAKE2B 842344c8ecbaa8205bed0d3bdba91752e12dc0e10b36008defef340caf76182254e756d8c8c20f96b8b393c4dbcc72ebed84f253e20967e6ed5656385aa39bcf SHA512 382b79ed52779e5fdeb25ae27bfe7cf2bfff0ee1a75231a620dc459b1c259ae43e9d9d473e21c682498927908a2660b231eaef473f9656cf1f6f7008e8d9a2a1
+DIST rustix-0.36.6.crate 288718 BLAKE2B 5b1a09f8af9bc4b7ae045d038734f3568896c75ac0e77d9d1d74aef63e461f14a2934129cce36bb2d450fa94046770f6d394b0469b072b16f82977de92fa1e50 SHA512 d18e44d7546024d96a0ab6256c0913d9647a3290a60a5c8ed66611ab5983e7e22e05bddd61b12cd5b3d864ab9f1a2ed604e48a1336aea9e95907c2fc0cbfc4c4
 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
-DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
+DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
+DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_json-1.0.82.crate 144514 BLAKE2B dd4b5ee1b93f04be09b1c204f8484091d608acc3966ed4c8252a1d46003dd154666e2731e761828dda4123da5c45bda653f453454c5c7c11977aef05bd0e9e9a SHA512 39e4cb0d8b22c9beae6decb87b9692581698c6309b2e9fd78e5e199a200da563e7459d34435b7890e274e13357195392cab69d73d3ee2ff537c1667de32f92c3
-DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
-DIST signal-hook-0.3.10.crate 48491 BLAKE2B bd962fd39589084ffdd05701340674b7d4519c6ba1a90d61f07e50d5eac6bdd1ca5b5e278c7f76f1e62139e8d13af29aaf9f377e84e53684091c23c2356388ea SHA512 3b6949f4cad0a77e6cfba2fb16d7edaf52737419ebd525d5d1905152cc1c73e81d4adb676077b9b6c144b0812ac5059a0f1032fe2c5ed450be2c451b7cf32e9b
 DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
-DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
-DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smol-1.2.5.crate 43577 BLAKE2B 6392f08d9c4559c4f2a7fbac79b342cc58e7835a274b045490e43f325ae53e81ad20ec651a53e479f0ff920d8a4af79be431abf6f6b45789a79193b5b999c2a0 SHA512 68ebf8e943a2b12452f487d15520fdc49a102467ec9d7c25aee7c275f1207db48e78ef994c86da57562abcecce3c337ffa9fe8104f5c2a9c3a5c8cb8f9d319f5
-DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST starship-battery-0.7.9.crate 37685 BLAKE2B 8292250cd4bfb94cd88f3233a87c91aa37822b0fd4996eee0c27ebde9ed09c1e0e0e41c2600ac4349057d326d4bb861c1120f13f40341c49d4c51955fae0c504 SHA512 da68cb1e638d0e9fd3b68de031f16c5389ca5d303481cbacbb378d82ce4404a380726c758f41109916eb798a690bf2bf6d485ad758d2cac638567e3f3d4a9d7f
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-DIST syn-1.0.80.crate 234102 BLAKE2B 97e13bdf99f9d50b352eaf87ceb1cf27f74e59df7e40ef28508cc387f78c8472111aaeb5902e1e577e157cd16c7f431c2faf461cdf2554876a3d0ad7662d34f9 SHA512 3eb437757f25c1a10db8f9b10f21cc4de77be1aabd910f1618edd43ad309ef9142ef08def4cf6b2d7470165a7dd0783b28da54847678e22f2b2dcb2b4dad3c2d
+DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
 DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST sysctl-0.5.2.crate 18036 BLAKE2B d52521fa9d7e224abff7f437f362db8af1fa11c5c3e85aa2e370dd3514588249c5c204c58b0ad94a12781d3a41581ae887427c927e034476314ff28b76e5d9cc SHA512 0c42a7a4e29109b120b0f24da2d54779e640d2b38b1e1d203a6d3c92d0b4453c13c4e2db5c7c4d31e0fa2b81f05e1849f4899dd2993ab1ddf3be7c13c337a966
-DIST sysinfo-0.23.0.crate 118866 BLAKE2B efb09381becc0e13ec993d79635ba58252915e8044dcc28179b692f99bd96326a87368f98d34d670a4dbda2717567b165ef86f5cdeb9cfe8fd65eee6f382bc14 SHA512 e5dc81ab1d0cf37797a3c50da99ccd21b2e1f28ca8cd76fb1f4983ec16bd231fead8ba99a00b6ccf25e5b2f871a07116b6ba37c3c98ad8e3bcd3ab88ead7a002
 DIST sysinfo-0.26.7.crate 136535 BLAKE2B 8c6170d02511ebc58b2443e7121b54a06ec17e117e9b690df3da6f2258c7f3cf27ad6b0a65696473a64f50c458cc7173805ed133fe8fc952677e12f754e55d77 SHA512 91ffbca4243fab711664e0adcfac311abb9a9609dd1f36d4d11cf2e6027a4e59ed2c865c9ea27be0fc783cff007a9fba77ea5859f7958b5c984190c419b4a5fd
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
-DIST termtree-0.2.1.crate 6375 BLAKE2B dc668ef88ec67f42bd0bbe3ff0bb0c48ed436b1e727c0f5c04fc839c3849efe4ad80148488bc926b9017bd9548c60c56f74ed3e692735fcf773744b22f25d494 SHA512 a958c250849a1c8a181a70d644ad93f323991ab4778bbe537ac18c3b41687107a15a1f30a5d32f6cc665db67e6db21346033039f662a2af5f599dd4a0da62519
 DIST termtree-0.2.4.crate 4416 BLAKE2B 994134f7af962123b19984aa32b30c19c6f77202067a90ddb3aa4414ec8dc541f5d8be9282244cdbb1eb16686c11750393325fc7f7005de0bec38d6a9219e015 SHA512 afe4e94bd57c9917ba48be4b3a22ff2b9b8a6c764c86871a3be9087ae0c65326fadb466e285a129082e4243ba6bca933d89ea01aa9188222c055f0c2b308cdf3
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
-DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e
-DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
 DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952
-DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
+DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba
 DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
-DIST time-macros-0.2.3.crate 16838 BLAKE2B 34340d9700dc3303bbef72ec25f8cff9734ba881cf8aca263c6a63a0bb2d4d4e4f3800d0ffcf79c800d9e42a1a7cfc5167ba7d26142fb52986f10809c4a2de8a SHA512 07f19f3660de094fd49404c730ba08023d0801098178760a0f24663d4e4128a93838933b8d110d77aa5fd4a3585ce2ec1b0dabcf1e1d569dc9f4d0a3c6e101d8
 DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
-DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
+DIST toml-0.5.10.crate 55193 BLAKE2B e718f93b865c4e8d17e625a753776bc62a50f98d6f83e4323268d65547b6bedaa90bdfef8b0ab9ce42df62c5552939ff020402bee9aeeb7d883caf583438995a SHA512 0d438b1752b815445db647d7bceb620ba7e393a29dd5154f4f20e0357e7744c69e72ea3a797f8190bdbb72f413053621de7c8de88d30926a489526de440af2df
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
-DIST tui-0.14.0.crate 140336 BLAKE2B bffb807b11d6b7863676d4d46d115ce64666931520d4e2544d4e655b2d51f8b9335e66993d35609e4f9b1fdd7c5a0eb04f6e523b45a49aeab7dca4358baed1f7 SHA512 d333c5368ad51a9a3d6bfdf23bbbc636bfc4518238b7e2bf4983ff7ad765c5d3c6f016a00ebc6ecaf7aea79bef54e4e7acf88d5e18cde50fd3f7d0fe8df2c1ee
 DIST tui-0.19.0.crate 141279 BLAKE2B 55eb71dc524f45c3154f8af4024ccce33816d0c30aa28b3708a4991602892e5980df7f59b47d6c2cfe39fc90d07d7a0409693c37564b5d0d2f2f3a48e9e17c91 SHA512 b90497d06181ca74ad0a976ed57bfd6e6495e6fc96651ee96fe9e326ebf773b6627d87cae07aec26d17800a4274624ad3e835a86c37258c51077c86e667078a8
 DIST typed-builder-0.10.0.crate 24713 BLAKE2B 9afecd9b5ece2068f49b28966d30e5c6105a8c6b6fced1062c9942e17b2ce32eb523de292b83c3128739bdbde1fa0d40463696ce6c732a01eab79c5bba14e89f SHA512 620d5b86b944b00988127748b981fb8083041be072c029659e0916b491a3bd493b185ffef8c724a4a235e1c8d0909c899557a9a4a4fc0c83a8e5be7b58f61005
-DIST typed-builder-0.9.1.crate 24279 BLAKE2B ffaf624382955ed85221ac7749f68d30550c13f08cc19e3848d3d61fb9237306791d14a8c504503bb5feb44302b02309f81733f79083c7795365cfe08551caa3 SHA512 60ed20cd4810246f75b9fc7c9ab8e1879af5aa89022efb31a4c66b4dfe966b33a4fa58d9b2f6ea8dc369c7713626640335e5369ef3b7b17060ac16502290fada
-DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
-DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
+DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
+DIST unicode-segmentation-1.10.0.crate 93893 BLAKE2B f0604ca03586726b878f7884a639554037816ae01965fbb97b4998fbbd12e614f2af50065a59c834448413418a56b198b016e685ef9509513e8994a5c063da40 SHA512 e6a1baacb557a5a7ed7ff780c542c5947eb473763eb2a6018cb1e0a1abb9f4bf3f8073610e4897393f15df076f6657a0f162a5c5bb7ed5f3b3fd832e533a522c
 DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
+DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST uom-0.30.0.crate 113626 BLAKE2B f06527a2edb61773a3247d419c8e6b8a299b427310466480878e800ee2681d0deeec1c9d3dbb35127c92adb5bda9c95ba94a6829a4f9a5be6c6af0d66a2da668 SHA512 ca8a4428ca0f8af0e911f8169897849dd8daf99d87cc68847f35a5af6190dc96d532c0159d6f34033e61a5a8ece1584edaa0bced647ac19984f843ccb20553cd
-DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1657c380f95122c68ccc15fcbe0684315d0aea28f094f2c65f7b7b08ae62f6ec95e0d67fc47e6af0ba4589e9 SHA512 80f612597534d9f8bdcd5e6bdff740805efe28242822bc6db360e114a23cb47ff88c74b8ab855bc764f0a73545e85a69d76bce1441e5899a36e41ca270695dc5
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
@@ -291,12 +231,21 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-0.44.0.crate 11502336 BLAKE2B 4b0ea7db7cf38938edbbd7597b5f355a94ce1a39f58c9d51f280628b787b4f6da98fc6d14379b6cf6ce735e88704b0ee4b78b5e5f7ee90d3ba47fe58980f8e72 SHA512 846d870eafb43997bcc546eeb2859d1a53eb3a2e3b0a5bd21f33e9880a786fc6790912cc0eb0d121e18a8f80fc90b8670f022d18aca47b3407377a4bcccfbd2b
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
+DIST windows-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a
 DIST windows_aarch64_gnullvm-0.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338
+DIST windows_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4 SHA512 51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73
 DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0
+DIST windows_aarch64_msvc-0.42.1.crate 664655 BLAKE2B f4a060b802016a6d77a8ea6ac44c35dfec384acef9c45f932e2b6aca9d3ac48ae031f99e5b58f270d6020b8796e9dd06f7e8ffa7cc5610ea3f69181c2be7adc8 SHA512 f6412bae4b041201ef94e5a159ce90fd6b09816350204d4f573c1afdfb0a6d62d7887fbc2e416b40ec1d4478db521be492edf4703d87482d6d0006a51b827538
 DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474
+DIST windows_i686_gnu-0.42.1.crate 733428 BLAKE2B c1ca24973aca06b255d9317735cca7a13f7f69293da52dad41df43a5cdf48aac3d40d8b6765cf564905fb71cb548308d757f01167efe7a61da7bd2e2a7080f0a SHA512 61c3271b07df1d4585c875d27cf1686c8f595dcbb79626e8d15ff47228f7b7a4556d3d994566ccceee0d6795a4c76767f85f4579282fc9eed731e04c7e193a57
 DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1
+DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360dab647a1fe525f0ae4b44e6842d93c5674d9f202e8bbca99a0d30ecf7d138af0c48eec8e69e08bf285db51e32bcf83a2c54 SHA512 8afa4f92cb7bd96d4fdbefbd8e7bcaa37dee52224d5d8b950c5a537d3bb805bf9781097b8bd44d96e8b62b1290e3a3020557502fa3b357a53df6fea36b318932
 DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
+DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
+DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
+DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
 DIST wrapcenum-derive-0.4.0.crate 7281 BLAKE2B fd5c935f64c6bb7d1e7e4fbe38b6550ac1cbea7d0817204e5c0d73c6711028e472f323563ff52e329f9cbadf5d45d547e3468a8b97f3d5577514cdc705714edd SHA512 85b8a9ec70ef30c2de04ad766694a5b29ea97d0cefab0708421976f1b5168761f8af652851155e06b5eb39fce32e3c9ceb4ff440f8ef687aa2b03c7017f1de0d
diff --git a/sys-process/bottom/bottom-0.6.8.ebuild b/sys-process/bottom/bottom-0.6.8.ebuild
deleted file mode 100644
index 1652bacbd252..000000000000
--- a/sys-process/bottom/bottom-0.6.8.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.16.0
-	adler-1.0.2
-	aho-corasick-0.7.18
-	ansi_term-0.11.0
-	anyhow-1.0.44
-	assert_cmd-1.0.8
-	async-channel-1.6.1
-	async-executor-1.4.1
-	async-fs-1.5.0
-	async-io-1.6.0
-	async-lock-2.4.0
-	async-net-1.6.1
-	async-process-1.2.0
-	async-task-4.0.3
-	atomic-waker-1.0.0
-	atty-0.2.14
-	autocfg-1.0.1
-	backtrace-0.3.61
-	battery-0.7.8
-	bitflags-1.3.2
-	blocking-1.0.2
-	bottom-0.6.8
-	bstr-0.2.17
-	byteorder-1.4.3
-	cache-padded-1.1.1
-	cargo-husky-1.5.0
-	cassowary-0.3.0
-	cc-1.0.71
-	cfg-if-1.0.0
-	clap-2.33.3
-	concurrent-queue-1.2.2
-	core-foundation-0.7.0
-	core-foundation-0.9.2
-	core-foundation-sys-0.7.0
-	core-foundation-sys-0.8.3
-	crc32fast-1.2.1
-	crossbeam-channel-0.5.1
-	crossbeam-deque-0.8.1
-	crossbeam-epoch-0.9.5
-	crossbeam-utils-0.8.5
-	crossterm-0.18.2
-	crossterm_winapi-0.6.2
-	ctrlc-3.2.1
-	difference-2.0.0
-	difflib-0.4.0
-	dirs-3.0.2
-	dirs-sys-0.3.6
-	doc-comment-0.3.3
-	either-1.6.1
-	event-listener-2.5.1
-	fastrand-1.5.0
-	fern-0.6.0
-	flate2-1.0.22
-	float-cmp-0.8.0
-	futures-0.3.17
-	futures-channel-0.3.17
-	futures-core-0.3.17
-	futures-executor-0.3.17
-	futures-io-0.3.17
-	futures-lite-1.12.0
-	futures-macro-0.3.17
-	futures-sink-0.3.17
-	futures-task-0.3.17
-	futures-timer-3.0.2
-	futures-util-0.3.17
-	fxhash-0.2.1
-	getrandom-0.2.3
-	gimli-0.25.0
-	glob-0.3.0
-	hashbrown-0.11.2
-	heim-0.1.0-rc.1
-	heim-common-0.1.0-rc.1
-	heim-cpu-0.1.0-rc.1
-	heim-disk-0.1.0-rc.1
-	heim-memory-0.1.0-rc.1
-	heim-net-0.1.0-rc.1
-	heim-runtime-0.1.0-rc.1
-	heim-sensors-0.1.0-rc.1
-	hermit-abi-0.1.19
-	hex-0.4.3
-	indexmap-1.7.0
-	instant-0.1.11
-	itertools-0.10.1
-	itoa-0.4.8
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.112
-	lock_api-0.4.5
-	log-0.4.14
-	macaddr-1.0.1
-	mach-0.3.2
-	memchr-2.4.1
-	memoffset-0.6.4
-	miniz_oxide-0.4.4
-	mio-0.7.14
-	miow-0.3.7
-	nix-0.19.1
-	nix-0.23.0
-	normalize-line-endings-0.3.0
-	ntapi-0.3.6
-	num-integer-0.1.44
-	num-rational-0.3.2
-	num-traits-0.2.14
-	num_cpus-1.13.0
-	object-0.26.2
-	once_cell-1.5.2
-	parking-2.0.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	pin-project-lite-0.2.7
-	pin-utils-0.1.0
-	polling-2.1.0
-	predicates-1.0.8
-	predicates-2.0.3
-	predicates-core-1.0.2
-	predicates-tree-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro-nested-0.1.7
-	proc-macro2-1.0.30
-	procfs-0.11.0
-	quote-1.0.10
-	rayon-1.5.1
-	rayon-core-1.9.1
-	redox_syscall-0.2.10
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	rustc-demangle-0.1.21
-	scopeguard-1.1.0
-	serde-1.0.130
-	serde_derive-1.0.130
-	signal-hook-0.1.17
-	signal-hook-0.3.10
-	signal-hook-registry-1.4.0
-	slab-0.4.5
-	smallvec-1.7.0
-	smol-1.2.5
-	socket2-0.4.2
-	strsim-0.8.0
-	syn-1.0.80
-	sysinfo-0.23.0
-	termtree-0.2.1
-	textwrap-0.11.0
-	thiserror-1.0.30
-	thiserror-impl-1.0.30
-	time-0.3.5
-	time-macros-0.2.3
-	toml-0.5.8
-	tui-0.14.0
-	typed-builder-0.9.1
-	typenum-1.14.0
-	unicode-segmentation-1.8.0
-	unicode-width-0.1.9
-	unicode-xid-0.2.2
-	uom-0.30.0
-	vec_map-0.8.2
-	wait-timeout-0.2.0
-	waker-fn-1.1.0
-	wasi-0.10.2+wasi-snapshot-preview1
-	wepoll-ffi-0.1.2
-	widestring-0.4.3
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A graphical process/system monitor with a customizable interface"
-HOMEPAGE="https://github.com/ClementTsang/bottom"
-SRC_URI="$(cargo_crate_uris)"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-IUSE="+battery"
-
-# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
-QA_FLAGS_IGNORED="usr/bin/btm"
-
-src_configure() {
-	myfeatures=(
-		$(usev battery)
-	)
-
-	# https://github.com/ClementTsang/bottom/blob/bacaca5548c2b23d261ef961ee6584b609529567/Cargo.toml#L63
-	# fern and log features are for debugging only, so disable default features
-	cargo_src_configure $(usev !debug --no-default-features)
-}
-
-src_install() {
-	cargo_src_install
-
-	# Find generated shell completion files. btm.bash can be present in multiple dirs if we build
-	# additional features, so grab the first match only.
-	local BUILD_DIR="$(dirname $(find target -name btm.bash -print -quit))"
-
-	newbashcomp "${BUILD_DIR}"/btm.bash btm
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${BUILD_DIR}"/btm.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins "${BUILD_DIR}"/_btm
-
-	local DOCS=( CHANGELOG.md README.md )
-	einstalldocs
-}
diff --git a/sys-process/bottom/bottom-0.8.0.ebuild b/sys-process/bottom/bottom-0.8.0.ebuild
new file mode 100644
index 000000000000..ca32d135cf54
--- /dev/null
+++ b/sys-process/bottom/bottom-0.8.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.19.0
+	adler-1.0.2
+	aho-corasick-0.7.18
+	anyhow-1.0.57
+	assert_cmd-2.0.4
+	async-channel-1.6.1
+	async-executor-1.4.1
+	async-fs-1.5.0
+	async-io-1.6.0
+	async-lock-2.5.0
+	async-net-1.6.1
+	async-process-1.3.0
+	async-task-4.2.0
+	atomic-waker-1.0.0
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.67
+	bitflags-1.3.2
+	blocking-1.2.0
+	bottom-0.8.0
+	bstr-0.2.17
+	byteorder-1.4.3
+	cache-padded-1.2.0
+	cargo-husky-1.5.0
+	cassowary-0.3.0
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-3.1.12
+	clap_complete-3.1.2
+	clap_lex-0.1.1
+	clap_mangen-0.1.6
+	concat-string-1.0.1
+	concurrent-queue-1.2.2
+	const_format-0.2.30
+	const_format_proc_macros-0.2.29
+	core-foundation-0.7.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.7.0
+	core-foundation-sys-0.8.3
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crossterm-0.25.0
+	crossterm_winapi-0.9.0
+	ctrlc-3.2.4
+	darling-0.10.2
+	darling_core-0.10.2
+	darling_macro-0.10.2
+	difflib-0.4.0
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	doc-comment-0.3.3
+	either-1.6.1
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	event-listener-2.5.2
+	fastrand-1.7.0
+	fern-0.6.1
+	filedescriptor-0.8.2
+	float-cmp-0.9.0
+	fnv-1.0.7
+	futures-0.3.25
+	futures-channel-0.3.25
+	futures-core-0.3.25
+	futures-executor-0.3.25
+	futures-io-0.3.25
+	futures-lite-1.12.0
+	futures-macro-0.3.25
+	futures-sink-0.3.25
+	futures-task-0.3.25
+	futures-timer-3.0.2
+	futures-util-0.3.25
+	fxhash-0.2.1
+	getrandom-0.2.6
+	gimli-0.27.0
+	glob-0.3.0
+	hashbrown-0.12.3
+	heim-0.1.0-rc.1
+	heim-common-0.1.0-rc.1
+	heim-cpu-0.1.0-rc.1
+	heim-disk-0.1.0-rc.1
+	heim-memory-0.1.0-rc.1
+	heim-net-0.1.0-rc.1
+	heim-runtime-0.1.0-rc.1
+	heim-sensors-0.1.0-rc.1
+	hermit-abi-0.1.19
+	hex-0.4.3
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	ident_case-1.0.1
+	indexmap-1.9.2
+	instant-0.1.12
+	io-lifetimes-1.0.4
+	itertools-0.10.5
+	itoa-1.0.1
+	kstring-2.0.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.137
+	libloading-0.7.3
+	linux-raw-sys-0.1.4
+	lock_api-0.4.7
+	log-0.4.17
+	macaddr-1.0.1
+	mach-0.3.2
+	mach2-0.4.1
+	memchr-2.4.1
+	memoffset-0.6.5
+	miniz_oxide-0.6.2
+	mio-0.8.5
+	nix-0.19.1
+	nix-0.23.1
+	nix-0.26.1
+	normalize-line-endings-0.3.0
+	ntapi-0.3.7
+	ntapi-0.4.0
+	num-integer-0.1.44
+	num-rational-0.3.2
+	num-traits-0.2.14
+	num_cpus-1.13.1
+	num_threads-0.1.5
+	nvml-wrapper-0.8.0
+	nvml-wrapper-sys-0.6.0
+	object-0.30.2
+	once_cell-1.5.2
+	os_str_bytes-6.0.0
+	parking-2.0.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.4
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	polling-2.2.0
+	predicates-2.1.1
+	predicates-core-1.0.3
+	predicates-tree-1.0.5
+	proc-macro2-1.0.49
+	procfs-0.14.2
+	quote-1.0.18
+	rayon-1.5.2
+	rayon-core-1.9.2
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.28
+	roff-0.2.1
+	rustc-demangle-0.1.21
+	rustix-0.36.6
+	ryu-1.0.10
+	same-file-1.0.6
+	scopeguard-1.1.0
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.82
+	signal-hook-0.3.13
+	signal-hook-mio-0.2.3
+	signal-hook-registry-1.4.0
+	slab-0.4.6
+	smallvec-1.8.0
+	smol-1.2.5
+	socket2-0.4.4
+	starship-battery-0.7.9
+	static_assertions-1.1.0
+	strsim-0.9.3
+	strsim-0.10.0
+	syn-1.0.107
+	sysctl-0.5.2
+	sysinfo-0.26.7
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	termtree-0.2.4
+	textwrap-0.15.0
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	time-0.3.9
+	time-macros-0.2.4
+	toml-0.5.10
+	tui-0.19.0
+	typed-builder-0.10.0
+	typenum-1.15.0
+	unicode-ident-1.0.6
+	unicode-segmentation-1.10.0
+	unicode-width-0.1.10
+	unicode-xid-0.2.2
+	uom-0.30.0
+	wait-timeout-0.2.0
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wepoll-ffi-0.1.2
+	widestring-0.4.3
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-0.44.0
+	windows-sys-0.42.0
+	windows-targets-0.42.1
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	wrapcenum-derive-0.4.0
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A graphical process/system monitor with a customizable interface"
+HOMEPAGE="https://github.com/ClementTsang/bottom"
+SRC_URI="$(cargo_crate_uris)"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="+battery"
+
+# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
+QA_FLAGS_IGNORED="usr/bin/btm"
+
+src_prepare() {
+	# Stripping symbols should be the choice of the user.
+	sed -i '/strip = "symbols"/d' Cargo.toml || die "Unable to patch out symbol stripping"
+
+	eapply_user
+}
+
+src_configure() {
+	myfeatures=(
+		$(usev battery)
+	)
+
+	# This will turn on generation of shell completion scripts
+	export BTM_GENERATE=true
+
+	# https://github.com/ClementTsang/bottom/blob/bacaca5548c2b23d261ef961ee6584b609529567/Cargo.toml#L63
+	# fern and log features are for debugging only, so disable default features
+	cargo_src_configure $(usev !debug --no-default-features)
+}
+
+src_install() {
+	cargo_src_install
+
+	# Find generated shell completion files. btm.bash can be present in multiple dirs if we build
+	# additional features, so grab the first match only.
+	local BUILD_DIR="$(dirname $(find target -name btm.bash -print -quit || die) || die)"
+
+	newbashcomp "${BUILD_DIR}"/btm.bash btm
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${BUILD_DIR}"/btm.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins "${BUILD_DIR}"/_btm
+
+	local DOCS=( README.md )
+	einstalldocs
+}
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 2740f599c094..3bb7eaf2f17e 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -1,2 +1 @@
-DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd0c73bb8db86408bd246592ff4fbcbc04f8ca0064868a8555d7c6be2f183172d62daeed75275cd836517da504d0f SHA512 ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd
 DIST fcron-3.3.1.tar.gz 593688 BLAKE2B 5c2f91667c94fc9eae7ae014a7826ab1f26647a192425630dbdb84bbe3c9041be23a2a480eb13844dc18a5ba406fe77a157938af1e0343e5f9b0ce1a1405d66b SHA512 b9c5066bdf8588a6b8d811ccc0d49f1d41a17dabf898a280997a8136dc449c2a505c46868abf732f86184ff0720d51f17442691909acae8fb26edcd180cff281
diff --git a/sys-process/fcron/fcron-3.2.1-r8.ebuild b/sys-process/fcron/fcron-3.2.1-r8.ebuild
deleted file mode 100644
index cdf73c577fde..000000000000
--- a/sys-process/fcron/fcron-3.2.1-r8.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="none"
-
-inherit autotools cron flag-o-matic pam systemd user-info
-
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
-
-DEPEND="
-	acct-group/fcron
-	acct-user/fcron
-	virtual/libcrypt:=
-	audit? ( sys-process/audit )
-	pam? ( sys-libs/pam )
-	readline? ( sys-libs/readline:= )
-	selinux? ( sys-libs/libselinux )
-"
-
-RDEPEND="
-	${DEPEND}
-	app-misc/editor-wrapper
-	mta? ( virtual/mta )
-	pam? ( sys-auth/pambase )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
-	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
-	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
-)
-
-pkg_setup() {
-	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
-	[[ ${rootuser} ]] || rootuser=root
-	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
-	[[ ${rootgroup} ]] || rootgroup=root
-}
-
-src_prepare() {
-	default
-
-	# respect LDFLAGS
-	sed "s:\(@LIBS@\):\$(LDFLAGS) \1:" -i Makefile.in || die "sed failed"
-
-	# Adjust fcrontab path
-	sed -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' -i script/check_system_crontabs.sh || die
-
-	mv configure.in configure.ac || die
-
-	cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die
-
-	eautoconf
-}
-
-src_configure() {
-	# Don't try to pass --with-debug as it'll play with cflags as
-	# well, and run foreground which is a _very_ nasty idea for
-	# Gentoo.
-	use debug && append-cppflags -DDEBUG
-
-	# bindir is used just for calling fcronsighup
-	local myeconfargs=(
-		--with-cflags="${CFLAGS}"
-		--bindir=/usr/libexec
-		--sbindir=/usr/libexec
-		$(use_with audit)
-		$(use_with mta sendmail)
-		$(use_with pam)
-		$(use_with readline)
-		$(use_with selinux)
-		--sysconfdir=/etc/fcron
-		--with-username=fcron
-		--with-groupname=fcron
-		--with-piddir=/run
-		--with-spooldir=/var/spool/fcron
-		--with-fifodir=/run
-		--with-fcrondyn=yes
-		--disable-checks
-		--with-editor=/usr/libexec/editor
-		--with-shell=/bin/sh
-		--without-db2man
-		--without-dsssl-dir
-		--with-rootname=${rootuser}
-		--with-rootgroup=${rootgroup}
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	# bug #216460
-	sed \
-		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
-		-e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local/:/usr/:g' \
-		-i doc/*/*/*.{txt,1,5,8,html} \
-		|| die "unable to fix documentation references"
-}
-
-src_install() {
-	keepdir /var/spool/fcron
-
-	exeinto /usr/libexec
-	doexe fcron fcronsighup
-
-	dobin fcrondyn fcrontab
-
-	insinto /etc/fcron
-	doins files/fcron.{allow,deny,conf}
-
-	if use system-crontab; then
-		dosym fcrontab /usr/bin/crontab
-
-		exeinto /usr/libexec
-		newexe script/check_system_crontabs.sh check_system_crontabs
-
-		insinto /etc/fcron
-		newins "${FILESDIR}"/fcrontab.2 fcrontab
-
-		fowners ${rootuser}:fcron /etc/fcron/fcrontab
-		fperms 0640 /etc/fcron/fcrontab
-
-		insinto /etc
-		newins "${FILESDIR}"/crontab.2 crontab
-	fi
-
-	fowners fcron:fcron \
-		/var/spool/fcron \
-		/usr/bin/fcron{dyn,tab}
-
-	# fcronsighup needs to be suid root, because it sends a HUP to the
-	# running fcron daemon, but only has to be called by the fcron group
-	# anyway
-	fowners ${rootuser}:fcron \
-		/usr/libexec/fcronsighup \
-		/etc/fcron/fcron.{allow,deny,conf} \
-		/etc/fcron
-
-	fperms 6770 /var/spool/fcron
-	fperms 6775 /usr/bin/fcron{dyn,tab}
-
-	fperms 4710 /usr/libexec/fcronsighup
-
-	fperms 0750 /etc/fcron
-	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
-
-	use pam && pamd_mimic system-services fcron auth account session
-	cat > "${T}"/fcrontab.pam <<- EOF
-	# Don't ask for the user's password; fcrontab will only allow to
-	# change user if running as root.
-	auth		sufficient		pam_permit.so
-
-	# Still use the system-auth stack for account and session as the
-	# sysadmin might have set up stuff properly, and also avoids
-	# sidestepping limits (since fcrontab will run \$EDITOR).
-	account		include			system-auth
-	session		include			system-auth
-	EOF
-	use pam && newpamd "${T}"/fcrontab.pam fcrontab
-
-	newinitd "${FILESDIR}"/fcron.init-r5 fcron
-	systemd_newunit "${S}/script/fcron.init.systemd" fcron.service
-
-	newconfd "${FILESDIR}"/fcron.confd fcron
-
-	local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab")
-	DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt )
-
-	local HTML_DOCS=( doc/en/HTML/. )
-
-	einstalldocs
-
-	newdoc files/fcron.conf fcron.conf.sample
-	doman doc/en/man/*.{1,5,8}
-
-	for lang in fr; do
-		use l10n_${lang} || continue
-
-		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8}
-
-		docinto html/${lang}
-		dodoc -r doc/${lang}/HTML/.
-	done
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Make sure you execute"
-		elog ""
-		elog "  # emerge --config ${CATEGORY}/${PN}"
-		elog ""
-		elog "to install the default systab on this system."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "3.2.1" -gt ${v}; then
-				# This is an upgrade
-
-				elog "fcron's default systab was updated since your last installation."
-				elog "You can use"
-				elog ""
-				elog "  # emerge --config ${CATEGORY}/${PN}"
-				elog ""
-				elog "to re-install systab (do not call this command before you"
-				elog "have merged your configuration files)."
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if ! use system-crontab; then
-		echo ""
-		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
-		ewarn "due to USE=-system-crontab!"
-		echo ""
-	fi
-}
-
-pkg_config() {
-	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
-		eerror "We're not going to make any change to your systab as long as"
-		eerror "it contains data; please clear it before proceeding."
-		eerror "You can do that with"
-		eerror ""
-		eerror "  # fcrontab -u systab -r"
-		eerror ""
-		eerror "However you are advised to do this by hand to review existing"
-		eerror "systab just in case."
-		return 1
-	fi
-
-	if use system-crontab; then
-		elog "This is going to set up fcron to execute check_system_crontabs."
-		elog "In this configuration, /etc/crontab and /etc/cron.d are respected."
-		elog "Per default fcron will check for modifications every 10 minutes."
-		/usr/libexec/check_system_crontabs -v -i -f
-	else
-		elog "This is going to set up fcron to set up a default systab that"
-		elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore"
-		elog "/etc/crontab and /etc/cron.d."
-		fcrontab -u systab - <<- EOF
-		!serial(true)
-		00   *    *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.hourly
-		00   00   *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.daily
-		00   00   *    *    6     /bin/rm -f /var/spool/cron/lastrun/cron.weekly
-		00   00   1    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.monthly
-		*/10 *    *    *    *     /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons
-		!serial(false)
-		EOF
-	fi
-}
diff --git a/sys-process/fcron/fcron-3.3.1.ebuild b/sys-process/fcron/fcron-3.3.1.ebuild
index a408babd9242..7142b8367a37 100644
--- a/sys-process/fcron/fcron-3.3.1.ebuild
+++ b/sys-process/fcron/fcron-3.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
 
 DEPEND="
diff --git a/sys-process/fcron/files/fcron-3.2.1-configure-fix-audit-parameter-check.patch b/sys-process/fcron/files/fcron-3.2.1-configure-fix-audit-parameter-check.patch
deleted file mode 100644
index b4166ff9d7e3..000000000000
--- a/sys-process/fcron/files/fcron-3.2.1-configure-fix-audit-parameter-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cc7a684862fee31c442c49d6a537d86979c23220 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 17 Nov 2016 17:19:35 +0100
-Subject: [PATCH] configure: Fix --with-audit parameter check
-
-Due to a missing "$" the variable "$useaudit" was never checked for
-0 value with the result that you cannot disable building against
-libaudit.
-
-Gentoo-Bug: https://bugs.gentoo.org/540446
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 7e7634f..708d1dd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -822,7 +822,7 @@ AC_ARG_WITH(audit,
-     ;;
-   esac ]
- )
--if test useaudit = "0"; then
-+if test "$useaudit" = 0; then
-   AC_MSG_RESULT(no)
- elif test "$useaudit" = "1" && test "$auditavail" != 1; then
-   useaudit=0
--- 
-2.10.2
-
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 8c7ba8bb2066..6f0db253c7c3 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -6,3 +6,5 @@ DIST parallel-20221222.tar.bz2 2417694 BLAKE2B cfbbe104be248ff1d96495e821161eb76
 DIST parallel-20221222.tar.bz2.sig 2080 BLAKE2B b8344b3d080c515f30e2b23a44a62364af0a3b29d3187ed31d71cfcb165280904c642c7059d9fc34a51e39c42b6a06d70b196de6540411f5453c363e3f79c507 SHA512 59e088340430ac688b54fa021a3d3db166b65682aeea57bbcf1879d9149ab132c6599917e115959ad36355582387ce76da2da9b1f42966b1864dffed08b47a5f
 DIST parallel-20230122.tar.bz2 2471639 BLAKE2B 7f9544d14f5424dfc2976720d2e35883dd25e9a8dd1dcecbcca67ddf27ae05fb2c7e7f3b9428f7c21b375289d6ffd7b7e27e9b12d217b54e8ba11807f40908ff SHA512 e224954af1bcb481c02c344b713e7f02da549d62efb0b8fbfcbb0e30697e18c9860af4bca83bff61d685b37943c4f69146bb1d06cce9a3684de16e764d22c7f9
 DIST parallel-20230122.tar.bz2.sig 2080 BLAKE2B 997e37b8e7b4d6feb067f9090a6cfa4db9e65b14cd9c37d1cac142077fefed9a69910102438bc4b136e78ef6a76a42cee5e2869be5373c8e6c3aa984435bb947 SHA512 ce70a6979a7d31db55a086c2b6f979aae99df62b9527928082f7e38a8c4890f64a84cb65b2e03486a2076e931d1de95041c2ae75c9e093500a49fc9b13161a1d
+DIST parallel-20230222.tar.bz2 2479116 BLAKE2B 3954f6e9dedb14c56881a4dcc329e06d2ce28c25aedf62ea4158ee4d1cc6387508addbe2c64cf7356a260999609da0d0181e4b4348af7e2f7acddd8bd21a585d SHA512 52c88188ce7ded901bac3c34cbdc54fe0b4a9a1f5c893436957aa65b6b314a9ee6efeb38222ebb125704ece7db21e9bc5a31fda972397cf8b2cb506ac9fbfc95
+DIST parallel-20230222.tar.bz2.sig 2080 BLAKE2B 1e7c4897dcdb739c8ca64328ae805c85209279d5378d639fadb1c6c04cba4de3deff0491b72d4c756e4ba14024473342f3a7aaa10fa37b3014ab5511fec6ccc6 SHA512 4451b95dad47248481bcbadf19a246d0de5a79af73b467b3ce9ccb9fd7b585a49f1044694d189005c9771f37db8e4df1c60f2c63f880ef717df3026291ce8985
diff --git a/sys-process/parallel/parallel-20230222.ebuild b/sys-process/parallel/parallel-20230222.ebuild
new file mode 100644
index 000000000000..569549bc6eb7
--- /dev/null
+++ b/sys-process/parallel/parallel-20230222.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/oletange.asc
+inherit verify-sig
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Devel-Size
+	dev-perl/Text-CSV
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 )"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d938a7cfac58..a8337130e082 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dotnet-sdk/metadata.xml b/virtual/dotnet-sdk/metadata.xml
index 90230cd30053..aac5a1bfdcd0 100644
--- a/virtual/dotnet-sdk/metadata.xml
+++ b/virtual/dotnet-sdk/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xgqt@gentoo.org</email>
-    <name>Maciej Barć</name>
+  <maintainer type="project">
+    <email>dotnet@gentoo.org</email>
+    <name>Gentoo Dotnet Project</name>
   </maintainer>
   <stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/libiconv/libiconv-0-r2.ebuild b/virtual/libiconv/libiconv-0-r2.ebuild
index ef4260eb94b0..53768ec84927 100644
--- a/virtual/libiconv/libiconv-0-r2.ebuild
+++ b/virtual/libiconv/libiconv-0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for the GNU conversion library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
 # that and gcc
diff --git a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild
index 29253a66f2e5..b22d99612594 100644
--- a/virtual/libintl/libintl-0-r2.ebuild
+++ b/virtual/libintl/libintl-0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc.
 RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) )"
diff --git a/virtual/pkgconfig/pkgconfig-2-r1.ebuild b/virtual/pkgconfig/pkgconfig-2-r1.ebuild
index 398283de28b5..089e01b769f1 100644
--- a/virtual/pkgconfig/pkgconfig-2-r1.ebuild
+++ b/virtual/pkgconfig/pkgconfig-2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for the pkg-config implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-util/pkgconf-1.3.7[pkg-config(+)]"
diff --git a/virtual/rust/rust-1.66.1.ebuild b/virtual/rust/rust-1.66.1.ebuild
index c2aa2b5614c2..a48e76c5fea3 100644
--- a/virtual/rust/rust-1.66.1.ebuild
+++ b/virtual/rust/rust-1.66.1.ebuild
@@ -13,7 +13,7 @@ LICENSE=""
 # we do not allow multiple llvm versions in dev-lang/rust for
 # neither system nor bundled, so we just hardcode it here.
 SLOT="0/llvm-15"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="rustfmt"
 
 BDEPEND=""
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index bf574b905a25..267891b29776 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
index 98d89648bfc1..947ab19c3d4b 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index df19ad4ea553..2c44330d0a3d 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,6 +1,2 @@
-DIST nextcloud-24.0.7.tar.bz2 124233139 BLAKE2B 991668bf897984da0f0034f954d0077779159acc6b27447603decc79bb79d6457f98cf8324e18f2ab3dda76cbbde63bc43d3ee2f1ff918d227c8256d8f3e8789 SHA512 77c1999b52ab87779908619ec8845887c9da32f90d9eb1e639d07c3899519235a18d973a35a8bfbfe9f896c7b7705cc91d571558700550857f741f98a85a52ef
-DIST nextcloud-24.0.8.tar.bz2 124547281 BLAKE2B 0c0be4180fcf49b91534ef50b984df7eddcd275209cf3ec831aec2d4a5d8dd1ae84ed4b12db5564625066e09c109b9b4f25cb87bf6d4e32b1c54c2614fc5d556 SHA512 a885a93ac9f0fff1249ef9cbd3c88fb11786a178fcd0c4a5886c781d8270302b259267be760c6df91aa3cf27d360e38e5602fd3a186a918e50ccd55561e8f801
 DIST nextcloud-24.0.9.tar.bz2 124279049 BLAKE2B 8ba86bc4fd0255b62670714dad75559d8444b3033be840f04f956a8c8abda7d6a599d7829e36032b3862e69bdb6f38fd5a5c65dd846b38c2122284c226c54de9 SHA512 dcbc664f25b5a197c7ea11ec542ab1d439a665874ead6467ca857d84751805ab62afe2363c33248fb5effabf6979f9baac00f553278722229b85f0c702c433ea
-DIST nextcloud-25.0.1.tar.bz2 146695370 BLAKE2B 01d9482301fa50e2b938cbe164310d0e3db3a791944e78ef2d7016ecd3e214907d53b589abc51c550263e636c114ee37dd027ebf3d164493c53775a10f102a61 SHA512 7fd401ffe01e5b1d568e4f66cdc5972d5e3c0b82f147a04330da9fe5ab1f2ddf152943e28f152fb635e8bca8d83a95a5a269a1f34fa189cef4a3c9dbe4e8c89b
-DIST nextcloud-25.0.2.tar.bz2 149894878 BLAKE2B 8980fa45dcfa1f9cc70434f0bdd15154a2ef42b80bb4e57b5cb2792afa9ad77867640bc6a6d266b88e52a12aae829d34bd55d5c46fd2ba74acde0bea7b4c028e SHA512 e65147825cce7c645f552c683426b96c802c513eabbf90122e713fb5a5d341f816b0928b2af72876fdcd245b49b72bfd60f0fafb793deace3a686e13eca918bb
 DIST nextcloud-25.0.3.tar.bz2 149979880 BLAKE2B 9422c3ddaf2222a33b109f5443c70b3fd2929b51b8bf72ca41074985d23123cc84f8f47331d65fd030d4a96c43fbee8b202633fcab1c07d2ccdd8df1e4aec3bc SHA512 5c9fa141616002c87585c50bba740e3968b30fd901e6b5b4d345197a96021e10e5aeea1507f07ecd3e38bc55336a67510c6045a4f632c8991dee9760e175c6b3
diff --git a/www-apps/nextcloud/nextcloud-24.0.7.ebuild b/www-apps/nextcloud/nextcloud-24.0.7.ebuild
deleted file mode 100644
index 4eb1821d041c..000000000000
--- a/www-apps/nextcloud/nextcloud-24.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	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_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-24.0.8.ebuild b/www-apps/nextcloud/nextcloud-24.0.8.ebuild
deleted file mode 100644
index e9db891d0021..000000000000
--- a/www-apps/nextcloud/nextcloud-24.0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	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_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-25.0.1.ebuild b/www-apps/nextcloud/nextcloud-25.0.1.ebuild
deleted file mode 100644
index e35dd132e50a..000000000000
--- a/www-apps/nextcloud/nextcloud-25.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	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_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-25.0.2.ebuild b/www-apps/nextcloud/nextcloud-25.0.2.ebuild
deleted file mode 100644
index e9db891d0021..000000000000
--- a/www-apps/nextcloud/nextcloud-25.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	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_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-25.0.3.ebuild b/www-apps/nextcloud/nextcloud-25.0.3.ebuild
index e9db891d0021..7371c62df6fa 100644
--- a/www-apps/nextcloud/nextcloud-25.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-25.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://nextcloud.com/"
 SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
 LICENSE="AGPL-3"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/www-apps/nikola/nikola-8.2.3-r1.ebuild b/www-apps/nikola/nikola-8.2.3-r1.ebuild
index 60c2d9ab9773..abf13edcba86 100644
--- a/www-apps/nikola/nikola-8.2.3-r1.ebuild
+++ b/www-apps/nikola/nikola-8.2.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature pypi
diff --git a/www-apps/prowlarr/Manifest b/www-apps/prowlarr/Manifest
index 7c0a8b062f83..ffe26656b7b8 100644
--- a/www-apps/prowlarr/Manifest
+++ b/www-apps/prowlarr/Manifest
@@ -1,6 +1,9 @@
 DIST Prowlarr.develop.1.3.0.2757.linux-core-arm.tar.gz 86580781 BLAKE2B 2c580c5ff1b3f0658970dc0b05b30f21b828693fc8045a54ca9a776984618ba623227b5432111e07c0543ddcabaa051fa5dbb6bbfce9d214110b770db0a9aab2 SHA512 b0f0fa0862b2023397c705188fd5b80feee959dc590ff9b9575010741c5558ef94b4122094e1bfeaef6927a957daabb35b1a91f8f83fb5457ab01b885a4d767b
 DIST Prowlarr.develop.1.3.0.2757.linux-core-arm64.tar.gz 85875796 BLAKE2B ae62e27f49882fbfc77842c18ac6196ae31154b9bb746eae91f93bc41dce45fad3a12dd2ac65490336b921adbf0fad38115d14f3771ed8178f54fb99d451e5ea SHA512 c7b559facda589627a29d558f9872e164aa610878fcaa0f360a4aeb0c3c29b9e7c639946cfbee1d68ff8de0f69e88e99975c61793d1dbfd824698b646c09d518
 DIST Prowlarr.develop.1.3.0.2757.linux-core-x64.tar.gz 90884939 BLAKE2B 50dbc5689734988023c17c8f21c7a1c3d657bd5eaee7525de637dc9ab1b09b032a8ac09eef8366c53716f2b2f32c9b4101887736b749ab30e4fa0c4f5d2f8a2f SHA512 2442a4d741b6e3a6f283548f73b86b6c1dc25b8ac91552d82b8dff51621b8a348ec552eb7206e6006b4f62b8d884b88c004790ba86df310f8a28c1fe8ffa3757
+DIST Prowlarr.develop.1.3.1.2796.linux-core-arm.tar.gz 86581602 BLAKE2B caa94b37ca5c0269f83fd3f401d2d59207981127981eecd444cd6648ac3ed3e708929d7448ae417b701c5ff148a0abb0a068e1a83df0360dc8a75e207f448afa SHA512 8b26e7d1a459edfd43cbe9259e9a9e76cbf27d5ec384f459d25f13743cc564e8a30908b4acb0d53f9c214ba5c42077d60c31e13489c45423a6b86ad9ea90b673
+DIST Prowlarr.develop.1.3.1.2796.linux-core-arm64.tar.gz 85881542 BLAKE2B 0eb660b0cc00b49396b1e70dee43344c8b5ccf5c3a8260981fa7bce3c2021271793dccbfa1f733e5012dbd93a2a18c3891753d23bc83cf32e53430f9d14952a7 SHA512 fa9c2532c47771b08f6b53ebb7424ffa70416f69e296a24a46d6214ab18e61ed704c54f8254ada04d72864947ad30471caa9fbb4469b2ff301c6116d6fb96d01
+DIST Prowlarr.develop.1.3.1.2796.linux-core-x64.tar.gz 90883763 BLAKE2B 8889fbb2c9b86b74b3f0603c20b7280873cdba76c20df71e863620179efa5bbcc9aafd4f2925b5f29562906be2ec0a0cf0862ca999f81781c485d4335a3a3b1c SHA512 fbfa5bb30723caad2f5e0b9a96b89ebdf5ce6d79f8506ba2b93f0c097ea790ffc750a98ca6cad317339e247c974ee14735a1132f8ab4ed06f5a2159101a5d3ad
 DIST Prowlarr.master.1.2.2.2699.linux-core-arm.tar.gz 86577035 BLAKE2B 93ce74ae183eeb55f4d39c11ae9cb8efecaec0bc00292e82e625b888adadc988c3e30ae22782f9e3321a4c0e6864b84ffa7f82d4f7f21f57f2aacd145ab74b65 SHA512 54d4de92390c8c1e32250745559e76dd8eae1e958b56fd6d84671dd355b36ce915790ab27eebf8014d5d2b78d8301170d23cd0018b4c1ed5912bc5456a12bf62
 DIST Prowlarr.master.1.2.2.2699.linux-core-arm64.tar.gz 85868103 BLAKE2B 53160eaae5082ab746267347e79d098540b45e8c91d5b37006aa0f0f2273dc4e33d1a369ec788c583abae6fa752f0bbe0822a38eda2fe5b3e8980da1440f23e1 SHA512 0edf605a5521f7f38c2ccdbd44faeb57847fcd583a545fe7eccbeaac7d0ed5794dc24808abbba20a0cfa2a7f6b549cfeab71aea89e7f99aa01c11935767a662f
 DIST Prowlarr.master.1.2.2.2699.linux-core-x64.tar.gz 90869983 BLAKE2B 68caf3d7c1539a273ab5968292d5ddc0448d060319e42086e86c2e8848fec79a0f6c6dc228fc70533170da6d4e811c9988d75fbd5c59a9620938675528266cf5 SHA512 81d069b8c17ebd6a496fa148277647892a88e87c03c4cd9a98a34658c37a85e34263d1b19ec6e51b076e5bf7c2a2f378477a4e5a8a696cfbc92924fb5571ee01
diff --git a/www-apps/prowlarr/prowlarr-1.3.1.2796.ebuild b/www-apps/prowlarr/prowlarr-1.3.1.2796.ebuild
new file mode 100644
index 000000000000..eb3efd28ba1a
--- /dev/null
+++ b/www-apps/prowlarr/prowlarr-1.3.1.2796.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="
+	amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-x64.tar.gz )
+	arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm.tar.gz )
+	arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm64.tar.gz )
+"
+
+DESCRIPTION="An indexer manager/proxy to integrate with your various PVR apps"
+HOMEPAGE="https://wiki.servarr.com/prowlarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/prowlarr
+	acct-user/prowlarr
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite
+	sys-libs/glibc
+"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Prowlarr"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Prowlarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/prowlarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/prowlarr.service"
+	systemd_newunit "${FILESDIR}/prowlarr.service" "${PN}@.service"
+}
diff --git a/www-apps/readarr/Manifest b/www-apps/readarr/Manifest
index 24de08e5d917..390ef12d5305 100644
--- a/www-apps/readarr/Manifest
+++ b/www-apps/readarr/Manifest
@@ -1,3 +1,6 @@
 DIST Readarr.develop.0.1.3.1584.linux-core-arm.tar.gz 87968873 BLAKE2B 1a98e334d6ecbcc14932b0b52290f86213906dab30f516d43b69f650c0c2f02f7f68b608c325e97f7235779dde45af59cb946be170afac0d80a791ae368160ba SHA512 428c55cf1cab057f3a6a883a06187bcd36650952b0e1d91384312f194fad71fc46720ca63812521153d4e4296d8b26302a52dc715f9728641bc25eca6b8f20e6
 DIST Readarr.develop.0.1.3.1584.linux-core-arm64.tar.gz 87236375 BLAKE2B 9580edcfa0fa16dde0fc3c380a971c7b73e9a44fe4d0963e47815bdb25bbdec24ae2a501dd9294a3c54a5324ab028c516452cb17af72f54aba532c9b4431e822 SHA512 4bf15e9847b0cbf6e795d41f38a2c05c1c26c32a174cd905a37f4b39d5b38e703c389a08f91b7bd0c29e16d5b4f42f9f423b3ab205c8d87f47deba28dea4a98b
 DIST Readarr.develop.0.1.3.1584.linux-core-x64.tar.gz 92222707 BLAKE2B 74dad5984e5792f987e61b05cf38ba60f30382d0ef2993e7f533b3132641effe38a694cac7b8a2f13e2715cb560a0f94a080d42441aabc9f27929232397ea3ed SHA512 2b395f06bcbd09737892756d4541c843d63cbc3f236a3cbeb81ebc21ee75921b8f8b25c245cb4ab31da276cf30d518bdbfa4999ce3a02afa5707ca67b9578a22
+DIST Readarr.develop.0.1.4.1596.linux-core-arm.tar.gz 87896590 BLAKE2B a50cd7b29730bde0320f892b3d75937050d209bc09fa3809cc91dc9887d1cae18773bae1cdf4b3867503c1271bae054aab5f0c3f3638277c1d59c5aa9cdfe8bd SHA512 168defa045498091397c20c68dbebd03348f36d8ecb9ed00605d53ffa51f992d42e481bf18d9ac9ae9fb8734912233d2940da7c55822d84d25d62696c32b0afb
+DIST Readarr.develop.0.1.4.1596.linux-core-arm64.tar.gz 87151235 BLAKE2B 3b83a9e25dc633f4b248ab9b17822e97dde62cd7970bfc9be906cf2fb8f34737e8520454007032c89d633a371bcce53033c7f639bffdf511f6457d08b01edfbb SHA512 99262116a92b29e4cfc84f283da77fefea3a638bfcc6d5312a197e34395ee85406b6ce79edfe664aed72afe1d2aa1f98e23124f9de070a2ee79e6c59e13f6334
+DIST Readarr.develop.0.1.4.1596.linux-core-x64.tar.gz 92164892 BLAKE2B 179041eddc72d4519be062e5674fc74b6f266359acdab09e51a18668b10ee3a525814460cdcfeb69ae124dcae9b11c180a0151ee0bb3bbfaf7e32a09cb49bd9d SHA512 84f62427748558f33779d418c476a7a5e0cba5f76ab23c3f550bc2c8808a8da6c82037222b1091f855672635ce4f0497c38642adf1bef2b632dcda6b6924468f
diff --git a/www-apps/readarr/readarr-0.1.4.1596.ebuild b/www-apps/readarr/readarr-0.1.4.1596.ebuild
new file mode 100644
index 000000000000..ab2bbfec1d25
--- /dev/null
+++ b/www-apps/readarr/readarr-0.1.4.1596.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="
+	amd64? ( https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-x64.tar.gz )
+	arm? ( https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-arm.tar.gz )
+	arm64? ( https://github.com/Readarr/Readarr/releases/download/v${PV}/Readarr.develop.${PV}.linux-core-arm64.tar.gz )
+"
+
+DESCRIPTION="An ebook and audiobook collection manager for Usenet and BitTorrent users"
+HOMEPAGE="https://readarr.com/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/readarr
+	acct-user/readarr
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite
+	sys-libs/glibc
+"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Readarr"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Readarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/readarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/readarr.service"
+	systemd_newunit "${FILESDIR}/readarr.service" "${PN}@.service"
+}
diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
index 1b3fff019b61..d9b4d4d904a5 100644
--- a/www-apps/rutorrent/Manifest
+++ b/www-apps/rutorrent/Manifest
@@ -1 +1,2 @@
 DIST rutorrent-3.8.tar.gz 1241643 BLAKE2B c432e8691d35447cd0698eee8edeee4060238dc39cc8cbb178c1169f166fa1d483493181ce0d2f468106ae01dd0f58d4fbb2f334de393fabb2b0aa73363e2b7f SHA512 ea3dfa74234a1eafcbc9e71d6c6d953a46fdf8e189237b8df0ec58cf46ac30404f7a15bb783ec7567ab6f28daa3987ee219039dd360e3c48d16aea244263c9b6
+DIST rutorrent-4.0.2.tar.gz 2221825 BLAKE2B 96867dbd818949388dedbfeee80ae85d22c9f3b04636d66797a96fc7b1de7541128445a989f642d711bd93aaf0840b56fe4e7bb7f29a02d122d939039eeff835 SHA512 f1f3cf7712246c02c73753e5ec8c3b5c0af4797699adeabc59822c165d06d7291d50a2d065b2d729273f907e1ec288391b1f02bc733a2b40d3e818a2de983528
diff --git a/www-apps/rutorrent/rutorrent-4.0.2.ebuild b/www-apps/rutorrent/rutorrent-4.0.2.ebuild
new file mode 100644
index 000000000000..f7dbb6ae40d3
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-4.0.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp optfeature
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Novik/ruTorrent.git"
+else
+	SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+	S="${WORKDIR}/ruTorrent-${PV}"
+fi
+
+LICENSE="GPL-2+ MIT"
+
+RDEPEND="
+	dev-lang/php[xml,gd]
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	rm -r .github || die
+	find . \( -name .gitignore -o -name .gitmodules \) -type f -delete || die
+	if [[ ${PV} == 9999 ]]; then
+		rm -r .git .gitattributes || die
+	fi
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# can not use fperms beacuse of globbing
+	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+		"${ED}${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	keepdir "${MY_HTDOCSDIR}"/conf/users
+	keepdir "${MY_HTDOCSDIR}"/share/settings
+	keepdir "${MY_HTDOCSDIR}"/share/torrents
+	keepdir "${MY_HTDOCSDIR}"/share/users
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/conf
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/share
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	optfeature "Show audio file spectogram" media-sound/sox
+	optfeature "Display media file information" media-video/mediainfo
+	optfeature "Scrape Cloudflare based sites" dev-python/cloudscraper
+}
diff --git a/www-apps/rutorrent/rutorrent-9999.ebuild b/www-apps/rutorrent/rutorrent-9999.ebuild
index ad651140c198..f7dbb6ae40d3 100644
--- a/www-apps/rutorrent/rutorrent-9999.ebuild
+++ b/www-apps/rutorrent/rutorrent-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit webapp
+inherit webapp optfeature
 
 DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
 HOMEPAGE="https://github.com/Novik/ruTorrent"
@@ -13,41 +13,45 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+	S="${WORKDIR}/ruTorrent-${PV}"
 fi
 
-LICENSE="GPL-2"
-IUSE=""
+LICENSE="GPL-2+ MIT"
 
-need_httpd_cgi
+RDEPEND="
+	dev-lang/php[xml,gd]
+	virtual/httpd-php
+"
 
-DEPEND="dev-lang/php[xml,gd]"
-RDEPEND="virtual/httpd-php"
+need_httpd_cgi
 
 pkg_setup() {
 	webapp_pkg_setup
 }
 
-src_prepare() {
-	default
-	find -name '\.gitignore' -type f -exec rm -rf {} \;
-	if [[ ${PV} == 9999 ]]; then
-		rm -rf .git
-	fi
-}
-
 src_install() {
 	webapp_src_preinst
 
+	rm -r .github || die
+	find . \( -name .gitignore -o -name .gitmodules \) -type f -delete || die
+	if [[ ${PV} == 9999 ]]; then
+		rm -r .git .gitattributes || die
+	fi
+
 	insinto "${MY_HTDOCSDIR}"
 	doins -r .
 
+	# can not use fperms beacuse of globbing
 	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
-		"$ED${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+		"${ED}${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	keepdir "${MY_HTDOCSDIR}"/conf/users
+	keepdir "${MY_HTDOCSDIR}"/share/settings
+	keepdir "${MY_HTDOCSDIR}"/share/torrents
+	keepdir "${MY_HTDOCSDIR}"/share/users
 
-	webapp_serverowned "${MY_HTDOCSDIR}"/share
-	webapp_serverowned "${MY_HTDOCSDIR}"/share/settings
-	webapp_serverowned "${MY_HTDOCSDIR}"/share/torrents
-	webapp_serverowned "${MY_HTDOCSDIR}"/share/users
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/conf
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/share
 
 	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
 	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
@@ -57,3 +61,11 @@ src_install() {
 
 	webapp_src_install
 }
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	optfeature "Show audio file spectogram" media-sound/sox
+	optfeature "Display media file information" media-video/mediainfo
+	optfeature "Scrape Cloudflare based sites" dev-python/cloudscraper
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 6cf239b2aa8c..7d817bc32848 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index c3b2c080a6e0..ab091f174f4d 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -94,103 +94,103 @@ DIST firefox-102.8.0esr-vi.xpi 611418 BLAKE2B 860ae06dba6cfbd9f6b8bfa4a2aa8d88de
 DIST firefox-102.8.0esr-xh.xpi 427933 BLAKE2B 82b1d0b73d180993968be57bd2d0c3835c2a8154d06943a877b5122c7ae8fe17631fd1bc4c1596fe4e5b44bd31c22cb66182d39fb4364ba771e0ae3a37732a33 SHA512 aa62d9cebc3d37aecf9dd84b6fd53550a035a3177eede052327d3bb917ef36cdafd7ff4bfdc63704823ffde0bebe4a9888e24524deb3bc74d20d17aa47de9e05
 DIST firefox-102.8.0esr-zh-CN.xpi 613305 BLAKE2B 1de6727ae56d346666db1619cb456b011799bcc1e91cef92ee60e4a7f228c4e87a1fe7dbf9b62555c5d3b2e56604463be482aada1067254225d9c9fad560d4ae SHA512 ea575f9545118b4d017abae1bd9d99af33d562ef073385b525478923f8e093ee62f2b6e28ee0d1e48d75543f4fd16c46e6d867a8794b1f33212100a0e34ceb21
 DIST firefox-102.8.0esr-zh-TW.xpi 614571 BLAKE2B d0332f219a6443f3bd99ad33715ea1e83438c764c5ad1634704baff7b641fe7bd4890e253264cf07da9203cac0ef02fed3324b14fbc556d3dcb8ba028888da5c SHA512 0656e9f4565de49b2c8c249615b45e8e91ac1ba4704a1a00eebe3f2f1f653f2e717e4237f0356c22d6b4f16cf4798f3fd558c8af7afed139d46dab16fabcefe8
-DIST firefox-110.0-ach.xpi 457766 BLAKE2B 166b12fc0400ca240640eab4c074dc259e4c38800b93452757afdf15ffbb8cb775e2e99d50a791e3e1a2342d065f56157bb143dbd191c45b15810fa34048fa63 SHA512 f9ed95380afdda2b556922916584521a7eafd912ebd421f92c82eb0c2ee618e15bec68741cd51351696b7f2eb7c33ab97827a45193868eca2de7f23054f86f06
-DIST firefox-110.0-af.xpi 418305 BLAKE2B 14d880431623f655eb33f3a6a0232f4996ea137ecbce064d5347de82363efb0824481911ffecf3a0fac98546922fa372f2ea8cae9033e0b3c646e8360d7d560e SHA512 3b8f5ed26c394a5bd451657fec83ee1fb9cd6318c91bb7fceb1ab4d3ff04e8b066d24a4718ab360233622ca21ac27896eab5d53f6e05af403880243c6721d2e8
-DIST firefox-110.0-an.xpi 501238 BLAKE2B 02b9aa6014817ab02db61a99d8118c1f2775c7d42be9986333c37f71571fbd60026491edead6c0c26057baf98b841e86900bf4cb187b5466ace3b0c7ffc51b63 SHA512 a4fc90cd1d97040c48d4d6804c7a6ea3c740bbc45c21a2b4fe0d396534e78423738d288bd54c5d65096b94e40c110003f0540938ba83bc115f69e6ecd481ef45
-DIST firefox-110.0-ar.xpi 568264 BLAKE2B c4ccacbe0f8f833c91413ce7db75f39eaea4b2f29db14b6d83369c420561621d86b4534fb6f3b439202b8c899c6092199f58e6e8e469077010ac16ba21d7dc2a SHA512 4c4f4b6cc4185d8a5ccd52980c236cd5a84a6732f7943a7580e1241a32e4562b774459a5a7f94de1a163586a4097ee05b991f15d5e928de080354e84135f636a
-DIST firefox-110.0-ast.xpi 487468 BLAKE2B 1be6f483ce27fd23e75ac89cf8d1bcbc976686ed783e659739267c6d05e589892260681e96c1c8bc844e07c170b9156e76540b1be9151c30ee79b279dea42530 SHA512 9c7778723e8c07987fcefe4fa3c5710859bd55f8e0ed0579eb8690652e10bbd9307470f625d4810ce13737f63d7db06b284ef29a42f347afedabaf3484efd0e7
-DIST firefox-110.0-az.xpi 490056 BLAKE2B 66231a1055ad707ac6938fbd23d55c9d9d7a5504215d9d5eb31266b03b29927a7a85631c9e8ab21bfbdb57b1f1415923e10433f84204bf7ef2d03a0ce26a3e0f SHA512 756f5938184ebe10e46724d7805c9ea86b066a9339398e7cc4bb2b514edba310981977a4439d249951e84df1b7b83c2b0fb8f51db487858e3c01a80178413f71
-DIST firefox-110.0-be.xpi 652579 BLAKE2B da9f88506d08a511b491978320ab0a6f7418dbd003d392dcca6f2621774755f34ee6c59f926399f8f9c49b98e9791503531b3b12b151d9390a5936b17055cdf0 SHA512 b0c62ab93c736428d25acbd722aa621feaa601bb00a8d87da3253405be04c87d36b5a71c7e5b66f4f1a34d836d26f5629a2375a61d5a1b65bdc7bced1b17a978
-DIST firefox-110.0-bg.xpi 579992 BLAKE2B 70adbd5670c3f8102332165c462f088c43b49a5676023a673e2ae0dc183614414a432ee88c6d37ac6d2ce18f21a7bc4fc6244b0e36079d605cfb64be6464d4b2 SHA512 6c97c21466b88bf2b5f2d68784241940f0759ddf82921a365e798734844341ed851a48518fd45a0a6693801cd7738e98b400bda08d0002696cbed4319cb7626e
-DIST firefox-110.0-bn.xpi 579339 BLAKE2B b00cc3bd5ee414e737397ba07e6ebc05d5266d2d47e2f0ca73e421b5e8d3415fd844b04f60a57ad43181129a445d67bbaac412903179bf7029c4886303c6fd4d SHA512 eee4ea7899d4eaf5ad9346c5bf7afc91b0f19ca064c50b85c51221608ccc7f629c65f4e358e2b5d7db3b8a90b6a1f976c8e98dffe7879b94f845bbffadc94bc8
-DIST firefox-110.0-br.xpi 546492 BLAKE2B 263af6cb6d6a7355ddde4cf282dbea91de986f0ecdc4add8b016e7845e0c4ad8c6ede786f7d635f90e949f842dba3e8568ca9c439c8bfad018502845868bfba7 SHA512 8ad5269de65833801c2b26167070e3566c033af37a5417ab0c8ccb2fca8291d14e7b6bda5304084b666337e28a7b15a99ae6f140a94e36423e4678add81dd3d6
-DIST firefox-110.0-bs.xpi 461730 BLAKE2B 6394b1dd3aa487708112643a883008392d81372d89a6486283500d84762040b18fff576cb740e343951c9ad5bdc963e0c8e390266baa3b5bf8e524cd854f64f1 SHA512 e495358e090be17b624523c86ee2ce9c6554b2eee37c8b2bd7bbf7818f7135652f29f8d362cb74dc87b5193c8d346c3d8438635a05e05e4891fbe24e62688e30
-DIST firefox-110.0-ca-valencia.xpi 540139 BLAKE2B 6a4f0aa0a3740d02b61407a34dceb06abf3e109d4c37df4fb18cfa01b3992903c66e98e4e3ea18af6d7e824b86cd752e93fa2f927fa531f3cd37b6e9e7ef14c9 SHA512 b50ebedb3cfd08348dacb646a8466467754e58443e2683f72b6acabd7e94dc687549c7ac0943f160b209c6f4e08232c48a0fdb77ac76b249ca544014e38c0dca
-DIST firefox-110.0-ca.xpi 554783 BLAKE2B 55ed4bf968ec46510effc98a41f7d3a6310f2d66a865ab1d9177d62524c2eaeaa66ace16d9788017f69c9e22a5ae6e4b2fe83f4c03fb158be28f5382935b86c3 SHA512 064a7add5945e994a1e8f69a93ea66ac3f2cb1d3f03206f4a10464d954ca98a2c59ed40807cba60bfce9e7292ed0b642017399294baef231d5709f3590b563a2
-DIST firefox-110.0-cak.xpi 555434 BLAKE2B 70ad875c3ea5535032f03615632838e6b92665fef5311a10271fcad5ed08d10b663bf40258ee8ee29f9715052f7a7c85e355a96d845387675b66be75e92bd9d1 SHA512 898179fe1a81dcf7c8af75a083362d7fae03256167e4c1c91e331acb8361f54abdc86fae03fab4ce2f5ed444815a186e5e0f7a2ea6614c6def2847a1091306fa
-DIST firefox-110.0-cs.xpi 591249 BLAKE2B dc31a4caf8999a8f9a646e1a9a2aa182eb9263ece1d600f7e649f824ce304efd432decd61f0e33c5734abaecbf6feeffca81d2774b342cd621d11892b0492fa9 SHA512 c82eef048ad87719c4da53d655005253f5b1caaf289a3ea6f683fe51590d3c145ae5059463d54e74ce491b340c98fdbee7eff7980264b4af41e267e5af6c0728
-DIST firefox-110.0-cy.xpi 567859 BLAKE2B 5b49d3100d335a9c052a1704ab278d422fe01fc9465ff6775c46ad6fafcec64dfe94dae6e34c372915db5991b2116200593930e2d30fb31cc7da0fdffc5cce07 SHA512 8acac7208932319eb039989b7df455cc02afe84d8440e02af0c697b70ddf50f99a8b08e8c0f1f965c89e14a3be6f138d099fb90d433c642713bc6f9e2debf49b
-DIST firefox-110.0-da.xpi 558098 BLAKE2B 093bac5c53f258419d379a6e49998db47150ed27d90e2fc77f908e94f5f90c889305e0a518c45a1d35ecf5566b2a9a49c36972754a1cbdc6359a7b8ac2050eb0 SHA512 34c48965cf5cb89d7d2f7bf132d2ca63df1de179f1b5cf4c3647fc1faaf52d551da3d8655c868920626ae7329cc3f315a0104b6315e0a3cb9b55c7da247f0d0f
-DIST firefox-110.0-de.xpi 578970 BLAKE2B 9a1f1dafb8e5bf9d297eacd7007de23fcc2a69539a327e14b9ee62ae9e3296bf29eb86174bac7e61183df67acfdcf4ff9c3c086cc22d045c52114c2f291ed459 SHA512 ff9c5990ac796c883b0598e9ad098a80c772433b8234ea1e95f3d1f55001056298cdbb48795cbf672509d94d69696c2dbb0df69dbdff223702b6b820ef776af4
-DIST firefox-110.0-dsb.xpi 589316 BLAKE2B bbffe00a1a6ea3fdae411a375712af0674ede5f93ffcfa644d31fd330eb2ad126bf177a7112cbe81ca9c6f8c53b4cc8c6f158b333bffa9adc30d2a2f24e0c176 SHA512 50f59ad44e9e90ce4449cb3888b2b27d9c7c1979614cd2caa1a2d4632745fe01731f303c6c114a67547042e20fa44d540b587e42f0193abe5e37455f8ca4d83a
-DIST firefox-110.0-el.xpi 667180 BLAKE2B aa346700d62e9d9efe6f6aa1ec3135434153b7e9c57dfbfd0268ad10dba175f572f24604f2b4bd9e53f0e19fd8e224ea4e4ee5c5db5cc85d1e74c557b5ae0d66 SHA512 591023f5e61a1742661a311cf5c699d8a87f08e4453b006ccb9c66e0c628c565ab4fe6a1d33f5768f015bbffd417bf548f9eecdbf0ce5aa40aff0f1d33894165
-DIST firefox-110.0-en-CA.xpi 531651 BLAKE2B 3f1dddd29688862c5f852475f07610d4add753a3a1832bc4b3b9bc38bf2dffafedbae69387ec45096f4ee7c4696326737011a3120f2dd58a45ac1447bfbdf9b0 SHA512 c8b4afd5c25f9131aa3c41880ccf2d6408341c82e7c2f579ff163af39413cfba4dbd1a7124f6fb8d2fcd5ee020dca3ccba9339fb15dee8f3034739597ea1c691
-DIST firefox-110.0-en-GB.xpi 535380 BLAKE2B 16f9291ccf11acdf0d0670925ea8ddd0eb71535aef09f34b88568dd2cc6fc7cca4c64adb073cbd8355296ce558e078b86a8e4838e27456052e7ff9b419a9799c SHA512 5fa857e8156d0bb6512e8b9b45fcf48fcae3d78f763f2dfc707cf85b11ac870973375996c1be2c98fdbbb2a144175c75ff8ff2a7355955884f35fb7872a1518a
-DIST firefox-110.0-eo.xpi 560353 BLAKE2B 49e8e3110017055c94f6d85e50c028655ed425b87eb1d9b351e1b410f9bbb84de433152cfd68b5eec70b32c059f327205f5f3ee073ccd23925edd68caf2dffb3 SHA512 3246a934b8913ae5f9a08359e083e3e5b4f7962acb4520792b96848903d08b3a50b735ff56b32fd5857c9edd2f3106fc8e6ea4346f2b7fb6c4504a917d3313ab
-DIST firefox-110.0-es-AR.xpi 573022 BLAKE2B abac791edbdc3c9041b3caa50e40cab526dbbdbb508044917c8c2383104b62e650d45538dc24e9a65c6bb698f4c46c5805f2be8d49b7c358385407df7381e489 SHA512 6537160919839acca8ea20545280a7b81f736230347f6f0e581f70fba5ac3c3c4de36fa6aa637bdd69d9f8d2bbb01a488680e6f566cd9e4578df49131b7bbfc5
-DIST firefox-110.0-es-CL.xpi 572248 BLAKE2B 6c7de6da9deaf7851691c424f3f6005a99c874aaaef11f08c06ab62321a21a0ad12c773965da95bb0da05196d77d463a7c8b7a72f0bd1ad21f3c886d5e96344d SHA512 034a941f178ace1b089947f5c6a165b31649219548927dcbcffffdc3b1ef528c9bcae176c08d754195d69fa4f6dada10b37f761a44675d28ce4f28de1daa70a9
-DIST firefox-110.0-es-ES.xpi 566016 BLAKE2B 80ff0ec0d379ff7e7ece253a16d4e2960fb71f46d9011fc8eec951b214766b52e8ef77e012d1b672c24604b08ebb5938f9eccb98a52154ff624bc68f6719dc12 SHA512 bae1ccfdb9d3b6efaebab685360b61442e0ec4d1391a0799187ef25e93faeedc4ad503dcfa5deb94c6f02ba552629d85a873264ab2f67a8313c44411404a89f3
-DIST firefox-110.0-es-MX.xpi 575394 BLAKE2B a114ee942f36e3cf54da79d95df95dfa718d2c58c287351508e5c639ec50ea604e92852e1ba6b2cf75ee2452a2437d7487ce1f74536e5f306ff847b00adee71e SHA512 b9a1a2e230108752ef312e8e7a959b8398c58e70c8a8eb6e7326cd503ea1fc7a76b37374894cbb0251828d5a38f50d52bb43ad3835f496c93bad97dff8be1ec6
-DIST firefox-110.0-et.xpi 534623 BLAKE2B e6d4273bc2a9dd6c79bc387dbcda108f7eb59fd56c2c3f28f2ebb5d6f10d606fe43c467d630518a68b5352a33391f6f62e41767681ba91177724027f312cae02 SHA512 4f7b72ae3e9331dae4686f7bbd9c1bb6ba6f69a470bee8d07ba30c2ef39d5415c3718428948d3ad8d5b71eb90874fbf2f448894f62423356de93ef5938a00b71
-DIST firefox-110.0-eu.xpi 561986 BLAKE2B caf5cc92d7e0a69a5eb58b13ac12872da9970b43691209a0b9cc2e05f854918a9d98c316f3cd7658b11ee905884357d28557f1ff1589cfd87fdc87f22ff9b512 SHA512 d0d8767120e9c77baf159527ed6715401d05f7f7db0db99b3a740446cb505e2d7f540f0206d0829b641a5c0bf8f18ba25cd511776be13c700dc1b2de5612f58d
-DIST firefox-110.0-fa.xpi 571857 BLAKE2B 8c1668ce7d05b1e3040a031c477fcf8dfee09626637200c2721f6feff0ae991035429107cf1080cbb5de68f4e041401cefa0281f9d66c459298bbbfbcbe64c79 SHA512 f4891f85865a0d696a38bfd7826b8247a5e459bfda2a5fdab08b07227e2cd29de2f074cf160eb74e5a0fad203637adb48b290054b134ff945cbae6a6309952dd
-DIST firefox-110.0-ff.xpi 474130 BLAKE2B 40d94429594feeb285f3f964274b6f27e066576536e3e4a497b59f89838a44f7042c7a6e9521ae65ba9d97a8cedc512f3c880983f34d898aeb4d7a03623b6a57 SHA512 548936edbf5de453d2cccf0bd78137d7a888e68bd2b5c7e827ea0fc4620eefba968e7559ede9ecf9403cd47bea7a5bca4b72a61a37603164a4850a39d2c2b97c
-DIST firefox-110.0-fi.xpi 557017 BLAKE2B 432a990ed5ef865dc027f77ea2a559e7edfec074b06b95a3d9f80c035f16d24b499984daba1e0b0c076abd71447f0c6b7aeb951ee1837b6ee776fb7a2f771432 SHA512 cdb8426655547bfce0aad790194df29205b39e39772a25a71ce7e8e7ee16f1e66c0420497628f92eddcd43594b18caaf76d604e5d5e249a2a65ed410cc9f07e8
-DIST firefox-110.0-fr.xpi 584583 BLAKE2B 61b4e7a87ebd3e5e162dc2a51b92e59d0368d07040d7f99db0486076e454962934780426891c743022c3789f1f00f929a03fa21e0865807a04fd077ffdb435bd SHA512 8ae58f1c156ca8fad10fa2036f0ea9e9611d8b8f23ea1168be927a792fecb25f77dd415ef2357f6454bf57f4fa6a8ed31c455773ef9f508f0f449b4ba87d505c
-DIST firefox-110.0-fy-NL.xpi 568575 BLAKE2B 40e7c348e3571b8d5db22643a3c287e1c6817b13046d7dfb53e9220ff921855ccaa011b953c558d724afb4d96e35a387041c885b338e8390abbdbeebb1293ed8 SHA512 3a3bfb996ceda950f1b1a607604685ce46cbe830993a804e0ada13824a62498456579f774fb8de1696a2f4cfeb9ae6d1c52e2e873c0c5859e518e01061d55e41
-DIST firefox-110.0-ga-IE.xpi 470627 BLAKE2B 8967b9aa8335e2e73b23315535c917af9b42fa1964cc3fe7f0ff97a6e14f24f6ba3588b966690b5cdcbc786d6dcaf9602ba7b0121fdb3ab732cdfeb8144cd1b2 SHA512 90807f4517987a2fd4dbb718050fcf84a9605195a30f83b8f6a4d9a82a8bc2f91f9507ee95776163e319e0c8d63a423b307dbfb8702f815a128ec04497ea9d11
-DIST firefox-110.0-gd.xpi 548691 BLAKE2B da79abad7e946b625f43dedaa15251e127bb8d0df3b1f2739e650433ed9e94d5d05c058b5592471c1029d630872d751a1532cbf9e8280bd829ce6ddd9d1f864e SHA512 43bb57e0001dc812089bedaea012c3d8bdfbc3aac2201a2237df6d93518cd07c840e0360295d883e839549515402e612b07cdf3877c3ff656434da399fa313bb
-DIST firefox-110.0-gl.xpi 543495 BLAKE2B eaeb21bea907e3a21b220fe6f826578763fd9e3a0947fe10207363f664c97c221dad3d6f5048db3c3241cdf91990a08840d944f1bd127bd97e9913e1925b6745 SHA512 ce58c7c4c693bbd1e01776e026570d7e7c3d0a0131fb0efb62fc4b9ee6dd05a1c4d4093a1c81b1b54745c5f2bcb7f6e38bb65d42f150eb4bae5e0710e2c1681e
-DIST firefox-110.0-gn.xpi 583839 BLAKE2B fc6c182df9a7efef6697a78cd46f244832d03a51a0c08e19a5b6b4dcb39684225eca68285f7568be118cdc222c1c763c57d12d7067e9557e85d9fdfa65fada9c SHA512 e704ff2d2826bc50a78a77e494bfb4d28ef69f7c22bc8806e26a38e99280636088c54a830305870f6b9d9b19e937259d848aeea4e8469a1c7914c2a8a3eab861
-DIST firefox-110.0-gu-IN.xpi 528992 BLAKE2B 95d7f9338ddd582f335802786d67e24043ad3deaf1e5f9ee44bfa2ddc25fcb317b3b7cbee7b0b71a61a2ad253eb07584d07e4f6ae2ff20590e8f6b214374aa0e SHA512 160734698698542d1bcfa1dba91cb412856b71aaa6d4be86c6aa1a2d16c204f024043eff87ff5d3eaab70cecc314bf08677f8621ba92e1a5eead0e051066b0a3
-DIST firefox-110.0-he.xpi 578897 BLAKE2B 00720a042b705d3b63ec5f4335c4f2bf91721fa60ea6b2d74d5dc6c67b05fa32bab3bdb50c32aaec282d1f972ce638780619b4d399781b8710853fd7cab10177 SHA512 4d8eaf8643bdd349dbb60cffb77b53a946f0096bd7b9cbd2d78fca6bd804d7c5b0d408fb1453d3eb8077b66046e0db8eb4f62819c3e59fa76ec00c5b91246ec4
-DIST firefox-110.0-hi-IN.xpi 557869 BLAKE2B f576c56a0ada87ca0cef14727baaa84ef2948c2dd0b4d5cb6a29f0e24ed8bf962082086831b6566785a99aceff48c7d396850d3ecc72ce303c4e4cae0869759c SHA512 35c6321df40564e047168f6b4acaa56399f3353640c447f652e205fa5cea63d57e8eacce438921dd38f9c2404950f193c5adda836152cd4d5155bbde92c5af58
-DIST firefox-110.0-hr.xpi 547283 BLAKE2B ae536e5169251450928e28de89ad1e1e86ac05c8853742e2ae49d5490d031a7a886aa7b1c666baecdae7c39ecbf82d5ad92ad43bb3d788404fc9f065b941a50c SHA512 a7a6a26aefb35bdd045ee60c1c53531985797d7e9c0365035253923b3382cc71b03ce1364a9ba7f6dc02c43440a7d721eef223b655855950f38df13eaa7bd7ce
-DIST firefox-110.0-hsb.xpi 588114 BLAKE2B 915bc6675e101232b22178c426fefb964838e22eefedfa412edd3bae362c4128aff43b5272fe69246b88c8be15f0cc8e95d702751e2065fb5ea21295ac3b7d00 SHA512 8e68cb9f8eb86e4a9d64f6f24ed4c9ff8eb5d2cf74bf28536c60eb5afbc57a9dab8a74286800bfed5aab051a6b9999eee32446b3c38327da3486365234f61a3e
-DIST firefox-110.0-hu.xpi 593285 BLAKE2B 9e92164a544c804d1b6e27de604f523abb372b561772d7e2a45ec553f32e5e3a59f69c9d6c64ee76cd14336ef4d0c7def2b6ae4ff1a5423710d0a514aff8ce1b SHA512 caf57941e3ac5e762e46c7bf66878a20336f84833d99cc099fa0c4353d16ae51ea691ba950f242ed470d1ee944c0272bf713c0905c151c1c2d7850c440b4c7a0
-DIST firefox-110.0-hy-AM.xpi 595634 BLAKE2B 6bc1452ad3bd5b2712f518bef45af0761fa8f2911e3612f35e66ccab57011d02324805e9812b26e38343720e6452019137a85a5b131d36ff8607c1f9bb3dd75c SHA512 c5ea392c4b26299ef4d275e7170086a0461f662cbd002c39b26aae2b646c5dfa36e021f8dbb317da22299fc23985d7a694f65dca7e7de4e5f86ca5999294d747
-DIST firefox-110.0-ia.xpi 556994 BLAKE2B 7a6ba1aae7e6731a532156df5f9d6eb97ecdce3d348a4d8d5c626c509243224694af7d53a87f447d70d7ac1393441a191da74823c617457db2cdaaa854492cdc SHA512 9b2fb33214356ad28860fe64abf8f559387d5acfab964318d7cdef848011768c6a86a831db45ad1fd6a217b328bc0c0f17fd0ebb7e59951769045c259236005d
-DIST firefox-110.0-id.xpi 553923 BLAKE2B d7254c5d9730ce142dbc7ce976111665681034a843fd2864984220d2f5bcdbc53e51bea4bb419ec964a2ccf764a7ef16cb5f9a42ff68c89feac729843bffe64b SHA512 0d16874ab4c7c45efc452f718c3477fe8b90f823c5386d0a5366873f6051a2831a90bd7e4117291343909d1c0a584138f12bcf2b464d8f975a14148e87ab2457
-DIST firefox-110.0-is.xpi 565689 BLAKE2B 68d217e933f5f77066b005a8300fdc671396f3b1434831a615ba580cf5074e3aba9825c87cbb6f0c06f35b77c5cbc39d307b31048ca9160d38404e2383302882 SHA512 5a2ca0542882bb972c1ec83c3d8463203ab7dd2dffcdf5f9233f5a3e89ecafcb508a920eaf145d4ddd0b515ed322869735ce5c485a92cc344564aaba92fae9cd
-DIST firefox-110.0-it.xpi 496397 BLAKE2B 1b1c19190b618aab93546934bc59862fbd7e1c0c52dd6f428d62caeb470e8be66ec8c07ff70576f9ed6823749ad868d131884795309778fa1fac6798bd9694d5 SHA512 8d24a64c78058f4cc1c198e5a42ef18ca3c2f68d4cc3cb7a5e0ccdbfa8699a48c792bf273e32a30a5fe60d3470b7ac5c15beb347fc3c373bcc39b1a56068f272
-DIST firefox-110.0-ja.xpi 618089 BLAKE2B c432fd7ef2ee4d3c08a8db96abb1ec4c298b9f0a88db7cd8dff9b1e260ffef0b4658f2bd42a77ca1625e40308394c311b6179bd42980d6dae5080139c037b0b3 SHA512 86c82daffd879986c031a5683c0660f6f4d6e6dbbd1d74f34928e8bb18b1ae3eb8da6b078df7689454051b21488e5345308e8d853eb630c4475d0f7e76ec10bc
-DIST firefox-110.0-ka.xpi 622407 BLAKE2B b0d570b5ff448d9b01d8bc7afad993d4c8abb2bf786d94cab8f38a4c13f6f5af015ee43a748ae5789f2a9c3005528085f75c9b1f90328464fc1368e90f9f1666 SHA512 8981ac78576c6266c6bd6e56b605b05e643c0407dcfe9e70fd028b22e0499948c0a33a49d2f71479a5fd5efde5824b3411e24b53381e6d41e466ee6ae333a381
-DIST firefox-110.0-kab.xpi 574108 BLAKE2B 6f27d4becbeda651c9246b57da3c4a1a3cab8015cde0b2b1bd072b696ddac568d683ab2ebc2144df1007db357ef7ac9ea288eed9df3e02036d522fb0b642307d SHA512 509d2b57a499cf6ff71a002880f5dddc155f13c1827f476c5300acb3bc9b708f732f306dea310f55c4102f948cfd13cedb4b6674a648c821eee5d497968974e8
-DIST firefox-110.0-kk.xpi 645400 BLAKE2B 5e4ffe1b00cae7d40cb151ac456d412c6260205823855b71dcfc0d1290cf3a08650cd70eae970be8bf38ff24dc961a3602437894fa90adffde0788ae775e1a33 SHA512 96093b80364383b146e4f007764a6e7297f6a682b9cb3d39648cfa4908fe8d0e078eb6509281b5d36ec9cbd240f1511196626e9afc2cc4140aa77ef6e723e13d
-DIST firefox-110.0-km.xpi 531028 BLAKE2B 02aa09b3f699a7d95225cd98cf41c25ebac9d7e03c3c8e07c5a897bd76e5eafb7818d60ac0e491e07497fa477ab136087ecfdbaaa585a7c19dbbb21030ab9669 SHA512 15bf9b089072e7e349d2af723c3c81d1221cd471a58850daeb8f4ccd02161d7a74dfeaf20774a5a2c19c8be14208d3cbd1c022f8689aac47aa0504aced1d3a4f
-DIST firefox-110.0-kn.xpi 496274 BLAKE2B 0adddf55f55398fb83389adc853fdcec452881e8aa47f5a5802050ed551d7f020d0baf14e632fe6d8e777fed9d273f71e2aaf43d7810893cc718857d042a1df4 SHA512 6eb2aac8a2c3b8f8ab40a4a74713b32f29adf5c91a92e8e78b7ce744844fd9b2dbb57c0c2bed3afecd3dfcbbbb788d01c7b655996a7d0fa074674bdb176a7c04
-DIST firefox-110.0-ko.xpi 605670 BLAKE2B 06dd5381632383512f800dd748855c64ce8dbf002e0ae4c927dda237fb37bb9fe8d448ca6281b09fa6eb7b7e4b92dfbd8c20467f5768dde2bc5354eeea23b936 SHA512 622868c5ca40b59cc840b0ca22299e591a222235a2a248fa9f7cea9250e380333b5999ceb5a1533a434e4a7a48dcb2eb7609f5b26ad09e6c19423a294c156f76
-DIST firefox-110.0-lij.xpi 471134 BLAKE2B 14931b1a928ac8e5dc018c1de89edd69403c64ecd1a9b132ea2f7ff377390bb3975d6bd00e5b362a5409cbf4c59ee5c29209d6a84d0769914b78f800a8e93347 SHA512 593b6800a2d2f61738642e456859709b046febee2a0f952bd4f37443182ba04647ea8b5bd1968dae885f4f1e877194730f20d2bc54f61f14c1cdace0db495342
-DIST firefox-110.0-lt.xpi 566265 BLAKE2B 579ef42efe8e0a55c5e791761d5f3aa912970a2b39e7e9af6f9a04339d4a52fe1c456b182300955b3437b62af88a17cf2e835b5413cf86a8eb2026dae4dcbb3f SHA512 ad75acd8f469177439693bf530cd196eb074726baddd47e9e34272ca1e61dd3d6f4c178a4f323b24deea720f652a38595aa29a90785c58de1af8caf9559c472c
-DIST firefox-110.0-lv.xpi 470789 BLAKE2B 3b3cc7e00c4e12614026fab54d4d7d8288bde83c0fa6acc91b4deb7f5f1fb407ff37637a132c4d0dd225f098a9824e82bf9b26e27e09a5d9df666a3b369fdb45 SHA512 66625b6480d07ec64fef67aec2b65dad4b6f95ba5e763d15debccb2069e624cdfc563927681239acd60b3aa290f589ef1fe27ce99c4add8de349d2e3a6fc1733
-DIST firefox-110.0-mk.xpi 484129 BLAKE2B 53fd9f68d04a380d5bd70c688a4e95100a56c267f3f06381c0b1d1945fb7123d61ef0b62e9cc30f47fb8eccc1c0292b702ccb12ac24197e2fbca09894d6eb072 SHA512 9836ab4f73715fb953d9d85834518fd562ad966de4a0a431d524c6e2c2f4546349f196018d95c63f1020053795c8c8530bf0245157029228353275a8b0daeaf0
-DIST firefox-110.0-mr.xpi 531174 BLAKE2B befe28c691c5d49a7b9bdeb770c7b72574feb63114e28ab68149615502c2a7bbbe4917c0d2391becf06b10b3b21df527f8927caddf6c879a68c7a1aa23802d53 SHA512 31ef73a40e9b48be592ab772fcbcbd72586afb37dc11cb663c11522ff49f76f050edb2ebd8a12cd0078fa9adbcd8740ad22b50dfc2f9540ef62c9de3fe6c4373
-DIST firefox-110.0-ms.xpi 450482 BLAKE2B 9b0392389b3fe2fe74e82c309474fe023fcb736e9ef4d5e1935dbd435b0b03c36d7a63a930eafc5127de30d6a5e134cda6dd81908a5f3a8fa643595990381807 SHA512 1c32b4ae9bd90749f5a7cd205c50dc4e5655c27ce9ef14f4b69ca23094c3d035dfa286ea89063411374c21c97eb0c61e4eb4b34ba91f6a8d2ea223422552631b
-DIST firefox-110.0-my.xpi 516589 BLAKE2B b61c4f3092b390c0f14973a851c9fd05bf62a889bf281bde606150d14d10252d9a9c170064c1acac5272eafd07e7e603d84a393ab8b144bc13d5e8201811686b SHA512 fc168f27f9b0f016cdf7d61489389f665a09386a2da10d585903028806a6f1d3303a78ce371bd9b468b90f9cf4e964b8f3188b30c7162cbe7297cad3dc170ac2
-DIST firefox-110.0-nb-NO.xpi 554917 BLAKE2B b18a4e4a753d87abf27fd059b2370d61b6c1532187b7c4ca601b79f434d2c0b9a835f7b75e591dbc6c738920d4f8bc20ae9f41842c85823da8c110422626cc1d SHA512 6a2604ac55899cd01ce454e89f9338e6c187d50195eec619252b69213958b9e96753e563b2b5e997e38141588e869cdf94a41b4534dea62e99248c502cf189e2
-DIST firefox-110.0-ne-NP.xpi 484686 BLAKE2B 0629d2861214f19bf73c6717926b01044121900e84e0acd4d576b7478607e2500c1e753029e2f1338d428396a9e3094cbdcb3dc30cee7c42e6355dcba06d54d8 SHA512 7b2582d6308bd5bd9947587c3e7f07378338117b3b335fb67e99dfc25c8853bba3bf60a9e4fcdbc214c898ab110e4db4073a249bf411ef7eb6f561885d9ec160
-DIST firefox-110.0-nl.xpi 562660 BLAKE2B 4b5fb38b7211d30fc6fc0a2677aa893841dc7afdc326bf3311ecdbd45f6d439b2dc926c9bc2917cbafc4bdc727281a112e7a154895cba91fd0a543d00b4d0f71 SHA512 a216fa4b955eeb7f52095aab2823a4b7572f65ad149b07135d2a3032de3499fc1ed9df789ab0d0d439b7d42f8cd1fc1681c1325a68175e9092d3a91925f753fa
-DIST firefox-110.0-nn-NO.xpi 556384 BLAKE2B 45479e8668707db783fc3ec771e0c1eb8d69f432a193eb2f4704b922f77c328de651e723595c4f65cea70d0b8ce2def9635f7c279bf0f19e72b1025e69a10d5d SHA512 4eca8d94c99ee46881368a18a3f0d6ea6d2859bc18ec1c448efcad7d822059b9c24927d3f6053045fbfb5a61c3c6b9959b4c8dff8a8fd3560ab485223ac4fdd6
-DIST firefox-110.0-oc.xpi 579331 BLAKE2B d9dccc80f1671f232004645e37eaf22b99b1d5677b374351db326523c59391decba8b73a45101dc6e198a9ea091c468d1830a6ba496edd25d30b620002bc75f0 SHA512 cc9c3c169c5dc628ca401b8c69142f471b6e4de893f1879782ceacc00af3754872084c0f20666fb81e01d4f2aebfe8b3fa8bf80dd42d2b72d116fc02fb27afdd
-DIST firefox-110.0-pa-IN.xpi 636181 BLAKE2B aa5873076ba838266e36075c07e0ede752d1c606f6dcfa903200ffe6ecf86bed753068b22f5fc7323045322822ad4d84f6c1df0c5979fd864167b8434cb6ab40 SHA512 df68e1085d7eeff7d07a9225a87830d7d0b5b25e46f58d5d07c43cd79aca55d33435a1f7eef5f11598077c7824c90ebe682a514fe05fd242f120dc8706a4ac14
-DIST firefox-110.0-pl.xpi 586002 BLAKE2B a34f1a32154efa6c60788ff0b2575a77ab1af5d3eb951de9cc16e7db67ed95ac2947e57c1e2a2321570363d789b9c4944cfc542a78d5ac304a8774bb66db7492 SHA512 d0e26248162c6e78686324886e2eb74e9c0c532a17647b89b924fe05c8ffe1810f57488d8bd5985773f020e7d30ac3be3a61de4e0f284617d6c85f028060c167
-DIST firefox-110.0-pt-BR.xpi 567190 BLAKE2B 756c4ba96e98977430df84b4234a5ae5e81c1d4bf4f4d0eb0d78734c483b1253a7d44d03eda63eb2a615b5def5a0e53971d47a7588203d1972a177e464888510 SHA512 5abd2d65020569f73dd4f6992d978ad47db88a4c34cbc0f4f5b045ee13762c212c8d83b51c324bf3b00a442a4b747fdf9386fe906cfb9b990de9df431d25c360
-DIST firefox-110.0-pt-PT.xpi 572576 BLAKE2B b879aa5203f4003da0402c855e03adcd2840f89ba4e8d1ce2ac0f904480d922b11cb397d077a3548b04ce5d70bd042f61bc67fa499f046d1cb7416823ed7a224 SHA512 0157a187e53bf91f8c286182320403d4ea544781818f65cad2c11ed4a226e43e0b276938c1788c37c85da587653302d52d2483410b60e7849e7284abf2585ec5
-DIST firefox-110.0-rm.xpi 560554 BLAKE2B 80cb1c3d4e74266d1a2441bd976fddec11ec08049bb2ee2e72523c688645e46b1f07748630407cd4760248e74d72a15332456411c82dd65f3719239dc349fe4b SHA512 40510103ec11577cc6645349c74f6124d5e1509594cea3dc627c0d0e26829e5917fce4e58ab3f43780db728183eae8dfc2fa18efb954e1810cb1bf5d350ad30a
-DIST firefox-110.0-ro.xpi 533699 BLAKE2B ebaa14f4536ee9463b7dde55191b6876430e83a185b16f2b7f4f727627581bb18e9e76dae378bb7083eca3e3b7e066881d9c8489c9feb89717ea978352c04f57 SHA512 8c15a0d44c06878e2d66bdfca4873e822fd90cc76550398139aabc984739e7028ae10f228e450eef111b2c10342cf9965dcbfa5ab0ed5fa8f3a7bd5f686c56f3
-DIST firefox-110.0-ru.xpi 657165 BLAKE2B fce5f4da630f5d7eea92c6cebf32225f774d335eeb0997e7c70ee4daea6b754811cf9edea4a3e4d99a16e68cca8be2fbd6ff23b6f9e24d168018f9913046c786 SHA512 1e78f73b9ee117b97b138bb9ed528fdb46c5a95a945e4f13c21b19fff822d1ddc3cd6c786d9f3c982e1063f7166e981a36fb635f19fc1e08f0d908094a308ccc
-DIST firefox-110.0-sco.xpi 505319 BLAKE2B ed099f2d726cd29e839c3254e0a577856a283bcda249cf77ccf07d8c489ac2e77b75621a03a879d29babaf9d3e7b0310f5e95822a7d879ea1149524ba8d33031 SHA512 4b6452e16a3e61d71bf8261049f114fe502c1894a71252aa125a1d72a07105bf6606c38c7700af1f6a2bfecd1833602c180d875c18efb4ac7f36c48a58130057
-DIST firefox-110.0-si.xpi 574128 BLAKE2B 45bdfbfaa48b91f206426dd435a67f684495dd59d4f5b0acfc9bc5e0be76d98995e8ebe65ef1c30a52af691bf281409dff1b92e59718ee643fd65472d9814b2a SHA512 e1dd3a00d641355d3329888d8408920e012d6ab804ac63a4dd6b72eb2a3b1a34181b35239143c0a85734d803901dbca3b1e8c2d97a0b9ed9e8e5d876c981b4c1
-DIST firefox-110.0-sk.xpi 593384 BLAKE2B dd90383719835bda107c557914a30b8728499111168cc34efd061b18b1db24bcf56d9527750a5e2d34bc0fc88dfe971830e56443afde3fecb8a8dc83e6e252c4 SHA512 9ee29a38da1b668ecf56990dfa36103206300cdb2f39718aa698b24bcb6218608045d76797f5ad2b60367e2577dcc2655f6d008ebd4a4109b27cbe46a719a491
-DIST firefox-110.0-sl.xpi 566383 BLAKE2B acd9b56190bd23c23188dca4e78c0618744a9133e7b72a51bb91776e2870d389d1c7eb0d848e78fe143a45ee25afc38100bcc852ffbf924f043434a3c1922013 SHA512 dade34435b74e7b0dc57d5259c5ae0be7cfc40819f091bd27049babec604336c58de8e3b92c289e211a986c7cbcdc32f9f198c0ce9f456017715ceb69903857e
-DIST firefox-110.0-son.xpi 422459 BLAKE2B 06429dfdd0cb765246050b9126a03eb68fd799f5b45d9ff572649818204010e35ea5b60b85bef8626cf85f5c5bcb358f3834e02a07255585ca719ce1d4fcca7b SHA512 01c4f1bfaea5a2d3347fa4e41e9fe48a2cfb60a373308ffa229d317508cc6098cb34e0771db9baef81f70bf79bbca356f21cc94800d4357fe44b6cfaf0961630
-DIST firefox-110.0-sq.xpi 581630 BLAKE2B 44251912393f6db9da34f4a77057c47bc3474253aa11c619689cb46d7735eeed550ac787757118060b1b8ae8bf0358299193bd2bd4d1c7f84f55180cc92ca65d SHA512 951191be18300729014e07171a3ea10a205d7092c5f05de6fd8ce219c1c5b5d960a74247138387ceea766776cd48070dcbaf325fc9e543148967016d4063f57a
-DIST firefox-110.0-sr.xpi 621091 BLAKE2B 059e4fbce708f53ac97f32ff812cb914ec4dc03ea96cdbe0382af368f0471e8ba55ddd6189ad4f9ee70314e21edafb4a256ef22d9c1fb75e9968f7f473bce043 SHA512 e56ad7ea8b2c73950e9a60555e3957e4bc0b8c6327af7e91ac7e9cb464e83fdde244f98cc39deced84e543496f4a003448df4fbc7c84584b760b5f829260778c
-DIST firefox-110.0-sv-SE.xpi 566320 BLAKE2B b2153a8ccdefaef91303226371c19d541e161d5f7007d6243eb36c0351b29da96ad706008bd604fc36d6649d641b0b5fd891d4f78d2d3d8ba3dcce1456efa48f SHA512 b3909a001a6c8bf3c0afc8551fffacf252b2c66defc5db7ed90e7ef59391378d3716c45d5fb3ee82c6c23ca766a43ce8c3b4e29667e824b627cb7a03fa759e1c
-DIST firefox-110.0-ta.xpi 508561 BLAKE2B 19e1d1149723dc6c95116a53e680558bacefcd05cd9f54854472c40d8f1945bd1a696b4d43ca266afb7e500f2eeb34af95ffe87bff48c4a9e1b6f2f058f97703 SHA512 eff8a1589116f2a25596c978e4ee3b4e9a3210c300afce7d89a02577ab55586290af7904bc0ee61e25a80946e088a95f9599182cf94185b58e6cc6146a6f8041
-DIST firefox-110.0-te.xpi 556278 BLAKE2B 1913398c2040703c1e67500a670f07c6782b6ac24955ccb2c0ea9d36f83d5630e940a00df7c44f200564881c535bbb3293e76c2cbe6a984eb708675b4e85d040 SHA512 65e2ae14f586f62335dbd9dbf9154db263c0072f4fff83bdb817439ca369a4a88b58ecd5c1fdf9e45f550d9e9e5251714df60d2e466529d180ab3250664f1353
-DIST firefox-110.0-th.xpi 636762 BLAKE2B 1d10e91150cb7d1855c0d3f9549c0749a817588fb315da6eb8d67a8a3489cad3537c5f020b7177a8da50b8bef284c2c531056d623ac101db15e1816af26b4520 SHA512 2e5f32659f2315438c3a9fe8937660acac03d9a8f6a38aa2041609b4332e331236f27154a1a059d57ac3db138b80c5818ae1d51986a8cd6c5d8364962b73c89b
-DIST firefox-110.0-tl.xpi 523706 BLAKE2B a5196d21433927862cd2a0b6588f4c7205f2dba7587a3a22e5fc039525686ea446ec058cd4883e1e0928479c8a4c5136c3a9051eaca5cf7c7c506d2ccdb62c11 SHA512 9e535e9a6dc4848ea18a8b491230206b00415582c3e95a2528a49d1206b248a32951c34a34921aad2935579c48f0406041bb3bc2b90ba21e4616930111ea9386
-DIST firefox-110.0-tr.xpi 577877 BLAKE2B 4839c6306a862dc2a763d36ee5f61b06fe100478391702139b23468979908efcf48d8428fe3730d435e022962afee602ea6f0d7f4b907b9e14dd40f8636a266f SHA512 7a2d12da7495cb5b66309e148749c5383de0cdb310bd0af08ec606a6250306e8d11568bb02f229e11898281918f9463e282494f08c36af1d7016035b920f5d0e
-DIST firefox-110.0-trs.xpi 487275 BLAKE2B f5a3e419fda8219b80cab13ddb3fe0a65b2a406b634421a6e1471e2a52f42a1be97c46d9e2f8b33a4a7b311097f9f181c24a90ef52ba4a0778e97d5cfee3b0cb SHA512 ed6165deef4012e656f1b51dc1345950c6adaccd67c89313252b2e831389ee8cf9bb52dd480fcfbd947fea2e8888bc903ec3f2e8a4e2ec91497029c94928fdea
-DIST firefox-110.0-uk.xpi 650249 BLAKE2B 3052ee1d78d32d6582bce51704046c042d6aaad2f74f5a7f972020876c183352fd167e4d29b01f47c600db8b1ba62714a8cdeb6db62bcb93fda0aa2335fa3990 SHA512 20b618f26b14ad85163a479b8f4c4acbb54b811132393bc673c9ad622870cd2d2086743f9fed4a434e215bbb64ede547ac29056e98f0313f1b4e0a374c85f5de
-DIST firefox-110.0-ur.xpi 558068 BLAKE2B e2cfb6e0e808cad232d757d6fcaa9e963a94a431ee1bf6ed94910fbdbc509288fc00b12059800aa51347d544166a3a15291e16a820f8b74b9bdcafdc339619eb SHA512 6b2729802f8c6e9026b05ee6bfcef4642055dba9f00e7f01ab2ad59070466efd3fb90d927de90b2150b0da658180a89b73e50e40b6cc6acfe4f7248b2c86f4a3
-DIST firefox-110.0-uz.xpi 478753 BLAKE2B 5b41080753c51f446982b5cc3d44a65ae05661a53eb1671b34ab9f13d06cebad37d281f4f842b4eccb1f6cd846ac3360862c3d86a3e0fec8402aff54b194c14a SHA512 e8d14efa69dd6e584b6e58fd459cd48536524a863e6178925b7e2301e282614e16ed77edaacb5c7adf8bb60a8031cd50b11921fd98f3a3b649abb66e12f2e154
-DIST firefox-110.0-vi.xpi 600468 BLAKE2B 0e43fb4c8c3058754f29bbe1ee086247c6a66eeff07f2cf18db5802187d3ad324d34ef75699b8bb3708e2b32b45bc079b1452ea3cc77adcc83e43f78515e1900 SHA512 478b09fe0fbdf4dafe6eda7c845d0765586cfaf1761d899f799d5ed6100ae2b166c3cc757724e7b0424531ec3501a1e8eeb8599359a2ec722813179b43fb1fb8
-DIST firefox-110.0-xh.xpi 416885 BLAKE2B e04de3e3f8dfdd2479af336d7ee0159d60b4c1684a56715012b9e94a813bb99ef40a5600f366b2994a7219bbfeb8610da2e049491fe422900e85a2e06bdeb45a SHA512 336575462198c4800bc39508ba2cddab314c22265ec423e6155df0061b45daad3ba07671109a95a76602393e2b5da473029e671d21beb417dfec188e1fb391ca
-DIST firefox-110.0-zh-CN.xpi 599820 BLAKE2B e883807740ae15d8fbafb5858e65ebf2053b032032444362cf3222dfda4e7893c0f0f12c5a1748b510953226d95df3a7f21889a61fa1f43e7c56560412d9e53f SHA512 324d8a3834ce9ecac7fcf7af4a8db5be221c2a6d4731822cf3c54ecb3ca7dc398ea8288f365c7cf8f8233bfe714c3c232c4e8d01d3b2b705cd5c726304d0a817
-DIST firefox-110.0-zh-TW.xpi 602195 BLAKE2B a6d1fec05b52131642b7d4a1cb7988e64bcaf398b813bf86c3a2adc170ec350e27b1ddf1d0b7a4e5fc1a5d2b139dc63d65dc9f48e7ebdeaebb451883ce456932 SHA512 201892c437d07daec97365c4b51e1e686677ffc25965537e4fbe4764e9ad5f04029d557cfb1173c110b230979f4708fe6d0ad43b70517aa56a6fd95b7d72c673
+DIST firefox-110.0.1-ach.xpi 457762 BLAKE2B fda32f74826c349f71e65e0104394379ed44cf2cd08912e3cf8cb09c0b4741ad4bb085cb3682e38c443c523454909b6dbe82f133063efe14e7d720099a95ebc4 SHA512 906002d4303a2e2b4590aaa317dfd8d895a04e2740e08e9004000f75396a202f6b3ebe0e7d380a30dc6aef86c0240ca0b03afc3657a1aea698341fa27ee746e8
+DIST firefox-110.0.1-af.xpi 418315 BLAKE2B f941f4f8dffd6f40309d1baf249cd297ca0e6b45db0d114aebae7ae11cf5f5be51f13564a34e4e73bc609fcc65b65d55530cd4f0189b9a698c3f62290efb565b SHA512 42896c8925978cdab3b0c920b3984f90db1c7ee3a24308327e462ab7220b6b444f142c017c9bbd86d87e744a560e3a734e3dbc5b2062835975f1495005d9e92c
+DIST firefox-110.0.1-an.xpi 501245 BLAKE2B dfc3a04334120a635bf8d4e780fa2fcd0ef754e1f6f041f78cb120558c04a9394a922aab00f7a3553d916cfd5208f35eb46cd4cdff1379c3116dccace508e6a5 SHA512 4a73803d2a3c45f72d80cdf8ded4fbdb92619a72ddfef01aff67aa7e173dca8cce6f6cf8254012e91d4c40be5fa0fccfba1465c7720f6092881bc6e7c02f7493
+DIST firefox-110.0.1-ar.xpi 568249 BLAKE2B 6a73a37b2ea4e06a7527896b91779ed28de2e6d577263a234d29d3e5ff2faa58445ad163c6c8b8b2d12cb94b6ffae2089e1c538d78e9991e6414eb2080a9d260 SHA512 e70c4f2784efed74c0d23bea0ab69dd6dad04ea312f63c6629f6e52de3c4432943fc4dc616e91f54856ede766ab36e50ff02fa328cea800d6789c3a7a83706bf
+DIST firefox-110.0.1-ast.xpi 487472 BLAKE2B 35b1baf84ce3ccda479ee7134c7bebac7b661ec8b2e29d86fe72a84378b5d84aa91db06ede4f77966d8d8d98a1ee36de461cf1b098b94a59a3433bc55e5780a4 SHA512 a3cf5081331b33eb0d72ce3850600a2ae65f662ed8ca3366a43fec320807462d7c238be821eedc0d773d94d2f3330e7e326da3d59e51d3ea0e852b009e7abfad
+DIST firefox-110.0.1-az.xpi 490047 BLAKE2B 248be1d5983d5893372edfd88469fa78f7682a0af81995b43a7a80ce1909d6ca4265abe06feb8490e771465ef10df7c328eb5d2a267b4f24e918962f27c87047 SHA512 f4a3a6f7f639cc15d9693d61b690a436a8f9905205e7f1163df2a2fc4c8a554cb4b2e17f65901765b61c97003dd0b51da28e0531797487d2c344967811ec3b01
+DIST firefox-110.0.1-be.xpi 652589 BLAKE2B 7e24ef23bae7dd17019d0eb26bc5155c2640ca8cb0e444172615bfaf4094edd1a3621bb4c7087dc876f2fc7a7a87fc11bf0f04ede7d2c19380b73362d65acc27 SHA512 d99866a721b7cfe617fc67aeccd46c267e933d90c04f8ea5093ced0594d4612a73af7e6df2ba5edc2d5597224cbfc13c8e1e25963ac7a90bcd949611804392ea
+DIST firefox-110.0.1-bg.xpi 580006 BLAKE2B 93a7955fcf8a82befa1e63d953d0ffa96455b424b242ae9871679c924dc66064fe408707571afc841d3d8e9d3e6cc7e8e9bfaef3329a1d08720075418e49121c SHA512 79b448eed896d30bb8f2e5fb9d5384c6d1f9d7c5b266a3ec42634ace5ac6a1b8bd0daafce9c2bc04ccf742185fe8f2747e330c426b97e76020211ec8b398ea7f
+DIST firefox-110.0.1-bn.xpi 579351 BLAKE2B ea2de565b3fdafbea385bb83bd2c05f85cde88b0672bcb227fe38edeb5d4e4d6bcdc7db246ec454df19dde0f71a00be6556470fd74fd1e0986b4c6d8759fca1d SHA512 e0209b1bd84c68466b1bd19aa6302284b1afb219653ecee738dbf1b3e958fce6a0571029a4e1fbd3a02d293e556156ec93ab25a4035a361976c44b60dfde6d65
+DIST firefox-110.0.1-br.xpi 546492 BLAKE2B 7a77d5f87ed80e9147fdb267cd5d895867e8b771b3434b46c8ec9aca5017f9f70bfd8f95dbe54b2c89866602a0bb7247ea0be70752ecf831bdeabf501ed72385 SHA512 01d9177ffcfcfe5c97292dbf37fd26b48a3766385984d99d7c7517b708544849070e5109bf4b76163a27b2930d490bc7de84e1986568de6f9932a2d6441d809c
+DIST firefox-110.0.1-bs.xpi 461738 BLAKE2B 3f8c995d9110a1c64df610a390180bfc61bcd10e76ae482e12479e5260053614a484d8b0c059a3914e839dd3f0364df7db20f2fbb256e7ef1b065517178a0c56 SHA512 484be8a4e21f1c96ecef82c498b99275c106f2ff0360a73636979822533d7de69b344c074871fb34c512480bf9520641d1f93073c65a4047e1b9543585f767e7
+DIST firefox-110.0.1-ca-valencia.xpi 540143 BLAKE2B 07d29d002e31af30b92a1ba351c27164a7b3d2d04d7b3108b8b82498cd83bb3b0bda0ef2ed3a58c2d58781ecb19fba19abe5365bc49605e83c695dc400cdff76 SHA512 e6e83a71c198f7c7a9bf6243c0bcfc41d00afd546090da7a0db56037c872744b590845e2c925c80a09612f0f0e6488105aac3dbf266c593a84e083b0d9e1b733
+DIST firefox-110.0.1-ca.xpi 554782 BLAKE2B 993174fa389a61f3928a1f7ab3d85ebf4262973d0a02b30e3c8212ea874e96a0258cf6a93c24c0676c27b818704e98abb1c431810f59f17da06ee8a3e85583d0 SHA512 f2c67e989a845cf6de2ee15034c10400f8ed29f7cce1428ad5a8f3225e99dca098947717612bc5903dc5cad766252895e2062b98e4d38c3107c934cf2e249d65
+DIST firefox-110.0.1-cak.xpi 555439 BLAKE2B 39321c170a54f9f9c9b2ccc4f593b202f36b3f77034e3f0daddc0fc4eef4450c8bf6bbd003b5380dfa4a95c019c4770137b5ae754c380ff4ce23e5d66797980f SHA512 26cc556ef9f8cb71c8b4b586841cc1a995305e40484575179868b28f970a58f073b931f427aab1987787de166ecda13446b73f1f9718be58e60c1f808a304639
+DIST firefox-110.0.1-cs.xpi 591256 BLAKE2B 9ce58a740280b1d558572cf80d7b4a0acba0ed40724f05f77339ee82e63b4408d0585c22f04f7f4c8c70cd13d7411602682b63570078c8a72c71525c4f78a4f6 SHA512 d876df2b729642c802654800f078d4468559337c06519eda42d09094a21cf36fa47f86fa9136b38d25dba88cb5932e1009d5e6bd9d233b29e05131741c27fbef
+DIST firefox-110.0.1-cy.xpi 567860 BLAKE2B 43ff3c283b99da68a1da1d4da5a9ba79f964667fef0bcbb1fbbabf3d8249151cab9dadd699b6d00d71ec7a811074aeee800313625aaaf807d439cc2fe7a79b05 SHA512 1730660ce7cbac77c2678e1e41c5803cfd7b65d8e1c9ad2daa3f3e2f99ee2407d131832774a24b1a42903bd9e527f45c7bd91836ede42f1384d625d24b8f5013
+DIST firefox-110.0.1-da.xpi 558098 BLAKE2B a86eb8a832b7845337bf16ccb912338f2c6a8095df87a9c5da460709162224c9e95112e1535b29078c121f5bb5f81f7921be1607efab092fedfdddb95200454f SHA512 4e7b08422062cbe0c5fec98ed2891350ecb112193a580131e1ec5db0acd3415135c3621ba380a2d8cdafbcb57336599882c98325c1756d5d97df63b5e00014c7
+DIST firefox-110.0.1-de.xpi 578967 BLAKE2B 150502ce8379c5d3984abb0a10b8e01d3880332999198f2f4ff24ea94e52fdd405f0e92b006d8b237e61161c52dce2260f8cfd2771ff1b19b10ab255e47af8f1 SHA512 2b8d1297c7501591f0892b82b28796df12c5503728071f2009a946f4377ba45d17dbd9b96b2c69c448fc372f8653500b1199d01eba937b5584dfe23c75392801
+DIST firefox-110.0.1-dsb.xpi 589305 BLAKE2B d13ecdaabcff9c2d0512cfd661307334363c973ffaa3dae0fdbfe7f135cc54502a442388930adc6e0ed6efc749d71bbf64ccd698c4a922fdd4bf648581f72c6f SHA512 d2a59f6d7f378f6fb90dc4fee0f5ae54011d4b203cda9a5a3f31c479e6af78e61739934667ecfa0b5fb4c2c95d7d302df10ee793a3acc8eca928365b922bf483
+DIST firefox-110.0.1-el.xpi 667175 BLAKE2B e67d7c7ce81fdf6d6a3148caf78fd656f6dca4da13f394e1bf698c6b21f58123e984b771d2a4d58b2c58d762d7fe5f8f3557408cf3f09599244bb67c3186b971 SHA512 4df5453baa25f405a181239b53884a6832df441bbaa4074466f7f2ed794639f1bf586f435cb0493f008b60ec6448e9a8328d0c8a64649600b5d9f70866bf1171
+DIST firefox-110.0.1-en-CA.xpi 531661 BLAKE2B 79101ddb54ebdabfd73b5def3475f58e6bb95221f641c459ecd2577c09ba24fc8405fde7175b6e04ba4e003fa6f86d098735a8c9ebc9ea23226f9abd3cc123e6 SHA512 0f55c7bb763e50a78b5b79ceac09e2bba33f76b1da2b4ca832cd575070fa7f604eeb3a51cbcefddbe98809911afc8be7146ff8347ed64f3e07c5080bfab055e1
+DIST firefox-110.0.1-en-GB.xpi 535373 BLAKE2B 185027bd208518e8cd83810eb4ff62f122d012a9307882664a99d148d56f656a73d32e5337e46ea9ec357ec965843d8c0ca008f5c7ad8492b55d924bf587ba29 SHA512 3a20306c6642052f89011f41940216cff1019e3f5a1db0e365d0d20b9fcb22b0fe310b080c16b6a2b4f392cc8da008009b226fa9f717c19de10920e8d4b38cd2
+DIST firefox-110.0.1-eo.xpi 560361 BLAKE2B 8fd238057a0c7130f89f1a00eec3887ebde1f44b2570c2cefa74660d7f31036046375feec0322f1c5f41d6059dd38285230e75fa80cdad067863887f6c880776 SHA512 1d8f7f247705cde60d3f06f1c3cc5b9f03310c570c0daf53b663122878dfdc6d3775d29003f90ebe3c87c0122d97876402ee8054dc756f626adc4f97ddd4fec2
+DIST firefox-110.0.1-es-AR.xpi 573024 BLAKE2B 4f949a9109f969ddcfe629f5e000dbf5cffd4780583dfb22f92068c1395632c3c325bba4b9cb90e3a39223cf68529f88537fe7209b50a84f3d1dc9e5b3d1050d SHA512 a0df270daace758b7ef6ab213c12bb9d83aee48a7273d72c5d71ae7b3ad4f155dc918e732f5cc26ce6fc7c05db5f434d2b9c68b1bde057697c31004cdffc3393
+DIST firefox-110.0.1-es-CL.xpi 572237 BLAKE2B 1aa7a0b37e51907acc24ef75ccd08af0ff58d2b033bb73050cc37077fda4e2998b1eb36b903d38a8a4cd4285ef85d9e3e91db80de03c2db5d60d6d25c2185b9e SHA512 e5bea09eb21f767be59c9d28eaea19423798189618c5a0301fed8577cbca715d86183c1b4545acf32c486027e70c0932fb0238f014f888ea271d5b5fdc7a83c6
+DIST firefox-110.0.1-es-ES.xpi 566006 BLAKE2B b23ab5735bd9913e8312955339b308eaabae13edb1882671129cb9e05f79cc0d1934b6bdb5e1331a3e1d2eace87a0142c5ba7f556957c23f0e0449eb6444a7fb SHA512 9ef79e41a0ab1f642e6e3fd1242dde69e62d2949dd1406b3b6f4461a966924e33911502e2c61914c155dafe867aa443116585c6248f87fc380f21465ba88fd03
+DIST firefox-110.0.1-es-MX.xpi 575385 BLAKE2B 45debea3205ed98a5ac31a68d644fe9d9ada17b324d0aab0adaea4df1c5c5e4cbf68bbdcad7ae56c4ad5336b9dc9466c530c0bdd8e94821136680910f0a8b767 SHA512 bc18cf218ebb7f47fb82971380a7eeb45bda0a6535635965a53da5849d73edecc827fa4c7bc6c23b32056d63868693d12ea19cd693d31ac344ae26d22389622b
+DIST firefox-110.0.1-et.xpi 534629 BLAKE2B 23144d9df4f55a6a554bb72410ff9636a9174ce47f6026469a9de69c8f5304f1e8cb67e5a654ef320abf68e7350092ad12bd6bc27cde2ca77c6e039dfd4622e9 SHA512 caea76c1bb6c15f6964dbca87874a5f3e4679a43bb63a91434a6e8c8268926a1c3d9dc652dae6ef0c783e54a611a38dcc69cefe6ed068793903d12afe1464c12
+DIST firefox-110.0.1-eu.xpi 561985 BLAKE2B d81c9a2eda8c6481984c273c8d2cb067d4e7dbe52906265f2448fe416ddc33bd3ed98561443f5a9eae074fbe86b2d6142f1a975d3527c863bc6685ed8d6e4a21 SHA512 03482ca0c9f429aeafdf1a3e7eef88afe29f07b7d2d6aa8c2c3b6d95aad33cd853fdc4d35c8b29d739f9f51e72c6c8a56e74a9a91509238abba604daf48fe276
+DIST firefox-110.0.1-fa.xpi 571856 BLAKE2B c2d276fb4cddf1ed6e7685c5b32bec0ea2f17476d2a9b14ffaadc4b5135298b483631d37fcb3971635620178481686208220cb77319f64d65b809e8110243ca0 SHA512 112a68b654c4e0c045d2c92ca175b55af54c85cb7b05a0309633b99b0d0e09ca8da88ebad5bda149276297104351f8dc351ed177aba9878d03348617038431d9
+DIST firefox-110.0.1-ff.xpi 474140 BLAKE2B c4939880aa82cdc102402aed327c6bfbd56f5e08f92c642a4bf98f1b7c70bab879e237276b26bc349d97001afb6db6eb67ca535db4e4d21dcf3e51cdd1a953f2 SHA512 e7fe318145196c9598e0cb1e3ee3cd1536b5b56d90988bf1ba7f11863fe01f1e5f0afb5e35f5e534a1420a3aa11faf508af2ec6f01fe01386767c1b2b89b36e5
+DIST firefox-110.0.1-fi.xpi 557015 BLAKE2B 21debc9177df1267fc60c182e6d58cf4683de888dddbaa5f2ae3f5c4003b37b19c3364c95f4df766d7e34ef0e3aa127bdc63b59576601e6a0721dbb3757988b1 SHA512 c17b1326a0c692b7b65c6aee3bb1c0a08c0ab80cb90196c5be2cf88ce0c0e002e17e2d83e894bfe20d1393849ea0120eb73974c0086492c091a871fe50154f8d
+DIST firefox-110.0.1-fr.xpi 584582 BLAKE2B 2fa49279be90c5c92855105947314bf9b178eb858ca29e27772783727d101b134f349ce3aa816ff056391191cf19d18dd1e5485add5b148f144f0a08f627bad0 SHA512 7a6ae285cd757e16019e4071e5d289150258a6bb3825ad1e499b111dd0f2609d24554994e5e94ac6a467c9169e5c9a0e62625af88877732b60a8c14c3e1f7ca7
+DIST firefox-110.0.1-fy-NL.xpi 568580 BLAKE2B b66dfc23eda3c4aebf779aaa307e8be5a4959aaa58ccb6915d8deabb9aabc51332438e2d6f223eb800ebe5acb7835e20337af39ec7a956db3fa789ddf8184cbc SHA512 1fae0fe2164f73ac101239cfcddcc8aaaf278c0b2d5468fc0ceb97cf2e42024410d18e8ad5c5e7d35f28bd768b69e0d2ff5b93d0921ac400def2adffd0702df2
+DIST firefox-110.0.1-ga-IE.xpi 470626 BLAKE2B 0fc0b038a16cad527c9b33a7e4e3854b0c8385f8770f6ab504e36c7a61b914b51488ad8b5093d048f9f4a6fa55860fa8973c4b92b0dc42123cf7ab0a054bec40 SHA512 f4d75ecf9a1b1058e92e1c60067f0b7615f17259955b219b63c5ba56504657b3bab24b67cbe2fc68a8071a4f367a7e5fb403f99b081068829c15061c327a10d4
+DIST firefox-110.0.1-gd.xpi 548688 BLAKE2B ec41a0892ce0d250767a755e6d652c6639452932c3f52ebc229c6e7f597344457a6893e0b71511d44a32f76bf08e76ad421fecc708fdc4efdcdc93dc9ef439a6 SHA512 eb2daba1782e9d1013b46a64393f50db14a8c29d6592945e451686aa849a55291105f398af8b04aba5c9752d3e7a65d1338233ca6f060690f4622a3e729997bb
+DIST firefox-110.0.1-gl.xpi 543500 BLAKE2B 26ae2d3ee8dc69b0c5414dcf157148b2f4a3935d7ae9d6b4c8cf046f9c0d76941edabe9e2681a96e12bc5dee480119d656d1a2720361ceec52d7804ce835fc33 SHA512 7a28bcfd6854312900e0b2ae92184c3f80671ed3293a33b6045f2837702a3fde5087432a07f2ac9a4cac902a773928a1aaa5a73d8d66e9b53c0e27ba286227b5
+DIST firefox-110.0.1-gn.xpi 583840 BLAKE2B b9257807061bdeae91838a66371e4b38f0060062990332b1232d322277eb2129776395fbc0e47fb6440d45857afaab6c83f4ffb8509f19a016781ef37af5ef28 SHA512 2fee9be639ab7e81abe4483f2eebd7717f1360ad4625da37ab99e1964f82371629e687fcd691bbb316b3999b627e4e26f239cecf98723dcd74c7ebbddcd9a196
+DIST firefox-110.0.1-gu-IN.xpi 528996 BLAKE2B 63bd913283290097d6281eda373f61c40e7b00bcf99bb5811c7bf5b4403aa895888b826c75d37f65220316c59bef4f227f3925ee3344f6284578affb73971e19 SHA512 f6a35580a77fce17045535245f5da1154067a6b3c6fb6557558cd7b867bf9d45d882fd37993eff21f167080bfcce54ff90c3facfeeea4f872dfb8b180eb66ee1
+DIST firefox-110.0.1-he.xpi 578901 BLAKE2B 480127e6f98e1ed0d40ac52146ddbb08253943c6a1c7924e287c96915170a27abf3b628d6f9cf83bef571c6a18153bcb6ff028de23676db8770da8f0fbec328a SHA512 058a67411ceb24a2de63bf1458d8bb0e4a89346c13672404094490758b0c86b22ad576a14626089af38a6e6c64918fe7ee5835ff18395dbc56a3ce5ea0f9dd95
+DIST firefox-110.0.1-hi-IN.xpi 557876 BLAKE2B a1a614751a71fffe649606dbb90510dbd7ddda4287c9b2f34ec04202e450859bc0fbcb198e9e4f25f3f6a8dae2487a8dcc0128bff5bc1aa90e5e9656ec1b15f8 SHA512 c14df5b22cb301ebbe0583fb1867036b3389b3596482dde955a67bf6ed725a7eb2ef82a60be4fb434e5dff3c0658c5bf3d172a06e723ea3b9cb255aa148b38a4
+DIST firefox-110.0.1-hr.xpi 547286 BLAKE2B d4c51fdefdf635321152242f1ed46c5879e9a5d79df5571dd1720fbfa9b3461180bfe7ff15194985524144658d3e8c6fe3617b9b1d8793d08bb06369fdfe3c18 SHA512 9b7197ae615b0c8ed445366a41b113e058875908fe700c4cf1d4dc3aeb5f8429266722502d05c6a881a4c4c45ef9b52c769b7f9f4bb752cd1910f87594fe01b3
+DIST firefox-110.0.1-hsb.xpi 588111 BLAKE2B f828f6f13f5c3aa46c3467ba43ef57d59285515498702b482554e4c914736e95b2a210cd50e63f347547c11d94919c99ea39274e0f211f1dbd6e12574b69ca1d SHA512 308a7c8298277bc50fa96f9e7c3bf20a2d84bf4c0ef0c034220b0ca46615ebcfdd8c60e8aca828bbbe6c11844639b4cc6936f8b16fed2b5dc847c176f1d2592c
+DIST firefox-110.0.1-hu.xpi 593294 BLAKE2B f10152c37ef61b368f57aa2356b79eacb635b6b229ccf1c903243071d0c54042d374bd0aabd064d96fe06a9852047cd1d70622718f99b619924ae0df4c065245 SHA512 28dce369da1479f41212dce5e8e93b6baba8d921d50a8babe1f82b7c226948e38ee2541ae3a6bb101e27a4c2488fc9228148435412fd395fbffd60fc476cf58c
+DIST firefox-110.0.1-hy-AM.xpi 595642 BLAKE2B 45a8c0f0629f1fb9073d1bb25e6863412a1641cbb54c11a60234c38e2251a646598151f53c69f97bd9c4bdbf16f2abcdf114f703cc6eb10d546504152fb3ebfa SHA512 656141bc35d571ba62af6f68de5325f88d2229120c9b2537e2ef9250a9188549180a0ebdf9f15a8b55357f7477b9322117c868dae2ceb743b6d014a262e96e2e
+DIST firefox-110.0.1-ia.xpi 557000 BLAKE2B d99fe7b87e97652cd799fd5f54e4d05b997f7b71bef2a01ce133d88d0b63526dbc416e405975b16bc9735789cdb393b7569bb0952337ed0e14e8a38190bdb58b SHA512 037ab2b66116c1a3aef5d8ccc2b3d35a2fddf52a9fb9d5de0968b30797c60edfa6cfe8d5c2ebfc7664dfea4bacfd1d8a77c8f3a677ae812ea0febaef2c3741ab
+DIST firefox-110.0.1-id.xpi 553925 BLAKE2B 4ecf68d7b51185466ae3e0d17b6f6444bcbfa79dd4416bab395418754bd386794feac352d94dd863528cd780afffbd19f08b06b0fc63837707ea58ac99eab550 SHA512 a7fc0e1217fc9b87dfaa9f61d069dc7814b0cf21e7b3c13e2c27eb00fb13aeea166029e3b5a1df268598a1c29322aa3520a8e4fe87d9223ce645300e060c5510
+DIST firefox-110.0.1-is.xpi 565678 BLAKE2B 9d61eb7a948cd5db62522e22d06544f245ba0756f0c976e039dd25d81c4b7c7860eff715701c964b523c51d87d0adb4125099f195e0330580b494b196f965582 SHA512 2b3fa4888b73153f8cf54ca2774180d2599feb873ec27583dd40b74977f5c4f21125dd08fb78f4d9a3376bc7b1a4f61dad57459be689b630e23dd34a9e742538
+DIST firefox-110.0.1-it.xpi 496389 BLAKE2B 9e6c166f9a5c593e60b5a412c65fdc406e3503defaee645ff95f309b36a0aca0e3c04e2f673d8ec939ab403a8b58120cffa6d29bc2343f43d101394b20546c5c SHA512 2ff0b85ace287f441c9555eee687d4615914015227596a25deef732bfe28b671bcc6708b24d80bdf76f9746474ba22185a182feb2c785e112142774ed8b5a7c9
+DIST firefox-110.0.1-ja.xpi 618099 BLAKE2B 22c984eb82c5c60eb8ba73e180d2e49dafcf2f2e2d43fd8225210ac6b6fbc4c3795fc9c7b3309feb9fb0fd3b63d9c6082874cab76a32647db7283d19516cbc4f SHA512 fb4f9d8d160858cb41689c068440f4d92512d88abb89552f9b86d6f3099f195106ffbcc79394932ed35736384baaba91e0b85c28b976e794488ac17f433cdbb2
+DIST firefox-110.0.1-ka.xpi 622398 BLAKE2B b994485b789599845081f988a00757337346c756ac668a6725a105b568d27d6b7e91f2b30020630b7276a01a12acb4e8ef30f3ea3a2e20c70ea9b1ce0939559c SHA512 dedd48f2c112bc91c33f2c7e7a2c37dfe8aeaa4c518fb4c70fe943fd894d4910aa8707ce04ab85313594232a3ea88d5fd5903873832db898465a8fe976f3b006
+DIST firefox-110.0.1-kab.xpi 574109 BLAKE2B ddd6c900391ea990214a9519fec1ce5bf3d7cc53fa2c911b2381981bdd150c36730c24dab33f020943e6beb29d81d2b3db6c0bf6ac855792cb3912583c5dc1b3 SHA512 17f785a4f17f00e9533d80ee555f93587a01f3325cdf7d59030aaacccad20a3749089c927d7ceec1a97c518393949c00f451b13e6b82f94a2caf2d58969bf1dc
+DIST firefox-110.0.1-kk.xpi 645408 BLAKE2B 19fe16e808d1c56c986e287d81132609319225f3632668d35ad0b962542485afef898d4e16ce31bb870048f3588869e673ece1b8b2756fd7fb9ff7df26b28678 SHA512 2374665376df4c91092f0941124914f91acab821b2266ba50da31d3d0728ab0672ff2fa5ccb23eef895228c10d8aca1aa27a035dbe408c177e67f75158ed0022
+DIST firefox-110.0.1-km.xpi 531022 BLAKE2B e48a5998b96761a9ccd45fb652a9bc57c4d059cdb9ec3f89aeda95001f577ab383e504875c2434f696a65deab2a3480ae7a652bd37e6753b79174fb87292bd71 SHA512 f86918783de58240704d31e862fe5c9f154759e247e0014a4f96b7bcccf1300f0e01f55690b7fe77486709bccaadf5f39887061fc99e41f57d360d405a514403
+DIST firefox-110.0.1-kn.xpi 496283 BLAKE2B 494b3062e67194616f175ab2ac28703517a604812d9aa62573b7a88472b601c0535d205260998e6601d5dbd5a3ae709c37e3057b6d8add0866b1e1df0e784806 SHA512 bcadf4ecae0fcab880746c7a7e1af4264842e0d8018da4cf14129f984cea1e16ac4df06bde37c239caf3fed4e38b5925680ab8ba3c32fbf31ec79f9400493606
+DIST firefox-110.0.1-ko.xpi 605669 BLAKE2B 098dc89757c071f1adcc72706243902217453721d8e286bb5b150f0c5f2ac2289a76010efb5712310596eeee120b5f3c75be2d0aca264c174516848416369c2f SHA512 02c32fd971dff31134e346f2a6d7e7571e1bd66b48a9a22d73b6febfe3154a4a26ad67109665376801fc9c357650019f7f81711a51638fd7840b4874ae09c7c8
+DIST firefox-110.0.1-lij.xpi 471131 BLAKE2B 32a0dab00ca3f88ac5888a03060d84572c355b003586a64f835a1692e8bdf9d6323af365ac50b8ce5cdba0e1413306785f6e61454ec9bad51aea5bf47b99bcc0 SHA512 046d60d3f22c4dc04255aefd05fb7595e98d0aa8e23bf9f7a7e2cf3a1640f93bf00e7e273380c958829da9630996ca27c9f65fa1619d7ac99a22e5d678a510ce
+DIST firefox-110.0.1-lt.xpi 566274 BLAKE2B c62706836c6c811b8a598ffa4b95947914fe36e61a6270aae08c67918b8f8b511beed118d83fe64cf20e82fcae6ac50625b14ac45578cc3c9e1fe4dc2715bba3 SHA512 9706f26b25ad251f108688a8e70e287efacb9e6a6dcb7ae28150e73542c19117d8401d1b53413432b30bf74f2ddcbdc1b8e8307eb66071880bd8e7c0c695e41a
+DIST firefox-110.0.1-lv.xpi 470793 BLAKE2B c32deea4792d7e1aeeccfd6cc441d44b79b7a50bdd954f4dc11019cae14e6c0f46c6d8cffb35ceff98e8eec22165ea27ad9f35603d2f6b34e5d42e8a8d5b35e4 SHA512 dd7b3a023d1102b94ad17e4d90180deb9cc8718458e882225e4ee560643669de03268224be1903169da402b744f7c82f31bc6aeb75f33f27410ebac80a66c46a
+DIST firefox-110.0.1-mk.xpi 484130 BLAKE2B 8c1d0e291091cc24788bc2995e995354ca9673431ac16ea1f1226aa337f362236b2f4ba8c423aed06be6a103cdbd347271fcec1d59de2d4b5018e597397ebe80 SHA512 85b51c86185c62961e09868079f8df1b8afcc1af2f6661dbaff7d29b7eee0fa8b6c1bc6dd5d8aa0136b4b3557c71ed223b58e78f235d207f41035f4d4fae42a4
+DIST firefox-110.0.1-mr.xpi 531177 BLAKE2B c98c4fc1316675d22b52d06f49d369b1826272dc1afcb4ac63c270069d53b4cdba73cc13aab57fb3463401e081a20fc98ec2d857072241498874725d2fa70f6c SHA512 4d96809400dcb37939b35d3602f54623d7fdff64bee6a3713aa17e7988bb8b64dfee11370d1fef58504fd495e13e9571919655ab311e2b715fef4567a0cc2ff4
+DIST firefox-110.0.1-ms.xpi 450477 BLAKE2B 10f6fa3167d8b38aa47a8157ebb3181020d138b6afccc73be5258730caa593dbb227f174e7a78efed8c2727bad626fba2ab206a9d1da16098778950f9d20cf7f SHA512 3ced367ef704177e1b54bd915062db772184e3df59ea92c845253aa22b1b2c765a24e7655fb4a0c073eca636e5a6c67be0f9bba4375226cd071a3a75c71dfbc6
+DIST firefox-110.0.1-my.xpi 516587 BLAKE2B e3b051aa6a12345b3f910870d048a7fdfd6a50b7dd89b87b27350140a09049298de8c33aeec22fbe22d3b2999a40cc2e20eb6533e3c0fb2c1b43db178dd8430d SHA512 dd3b15be3c78b538aa9e54ae6acab9a41e8d8b9f76f6ee4e2a3d15b06db0f13bb0b39a1384f87ef3bdaf1ec3236b3eba84c20305e4e4e1143acd1e83e3bd95b7
+DIST firefox-110.0.1-nb-NO.xpi 554926 BLAKE2B 94eaa949d7bcd99e7d2eaeabff8b2c10e444553cc76cdb624fdccb6b5d75cb5e102aa7c562413f1c3af9c743f85e2e3cda308442ff9fb6efac761448d49a2213 SHA512 9450f612385951319080d01ada65f7f270af00a207ef70e57ff62afaa6252de9f8479abc5ae5c36eafd216c382b30a98d7b5ae0d83fed683a90c483b5ba50a95
+DIST firefox-110.0.1-ne-NP.xpi 484690 BLAKE2B 7ed7dab09a96b697d6f4e8c77792d81d25468fde369dc5ecf4ec947cd829dd7803b024430701b371afa6aea763241dc2a7673abec270a0cb713d65debe1aff5a SHA512 6677edea8977b2f6b1b4542a043b32730442ec40f3a014a58bb51880f2c011f95865e91f0d05cff2c2423612d254af304a5ff9eac03e1ad1444eeaad4375b31c
+DIST firefox-110.0.1-nl.xpi 562664 BLAKE2B bae7c1ea4cbf71a4d636daac3b685999fbeb623679d54d2ed30e659a5626d18e7527e7a6b06a7a694747b3e763740ace08c356efe06898fc17823317eedb9c60 SHA512 f463bbf904e7e4d4864c0e33f475a028801df873265f2829e9973930c86391d44694b0a7e5966bb3652e3335a6c9cbfcace8bb0e67c2189944bde59004ee6b94
+DIST firefox-110.0.1-nn-NO.xpi 556391 BLAKE2B fd348d530509dfac108252864843b8f13941e92029e9516b9394fd7ea7d8cd4c024eb4ace185337d4519d4a09d9eed4737df49b924ec691b7a3fb5d27fde4b57 SHA512 22614d7c522229baac153e154c8db9155cc8acc7cf242ad6d630ae7c5945ff65dd5b5f80598fe26c817ebd42799af9b7599119ab547c775e8bf15a4fd3512fdd
+DIST firefox-110.0.1-oc.xpi 579322 BLAKE2B 94963f95a54b2ae734c2e02f48fa95261fb426740d43e702082231f00fd868cae571b9310e4c10d27b1c70c75ee2f920dd07c6caedefdbe229d08988144ce446 SHA512 970e99170c1f0e076ff96107c62ccc82ffcd28a95c463198cb07d15fb92be6c64de9c2dd89f9670427dc90e4cf4d6cc599f595c6752ad147ef3dd5976e163a45
+DIST firefox-110.0.1-pa-IN.xpi 636181 BLAKE2B 91deba1d6dfd1bd0b25d409f75181471809d2e7e1b6187778d02c77b0f074b51640f27e19bdffeb60c992713cc0ba2155044c5306c8551311ac6dd87e7dd1649 SHA512 d68622fed4b7ff788a239af3a9f5f218cf4645c8161257ff32444e564747e9cce0daee8b1daf5f06c4e803ed09ac4a26fa7efe110e5a885055cf5616a48a75d2
+DIST firefox-110.0.1-pl.xpi 586009 BLAKE2B fc1658161514dda0feabd03334e7b308af4e41777146e80df24d329a8c8642713eb3440c1acbfbb22ca905002b27b882a9917a36295ade66e2d2830b1ef5f7e5 SHA512 69ec98eb1cf9ec558ab49551b3b79c9eae5d86d993102dcd27d44c1d52b9de2fabe6fdaf17a8f668a7de0c4f5efecf7c15ed699ec145c922cd826aa041af8e4d
+DIST firefox-110.0.1-pt-BR.xpi 567197 BLAKE2B 038e4afe6a59fa36673b95a8650593d1f9282f62d24734ef14e721f5889eff0e1bd7ae1e155c75d619d942058107c99d909c9253e95e6984f645dc76f7e54f15 SHA512 ccb6a5016d0fbba58e58d3a4a1bd7981b7f37d4fddb8f9cfc78d50bfd1b5ff2b7e23db252797c4965daf7a1da9eddd46d86dfe0ce62623b172f1bc9f9f887bc4
+DIST firefox-110.0.1-pt-PT.xpi 572576 BLAKE2B 0034d80daaa4c0347864e60e67d1b32e0f322f77e4fdaed11a477ca520b90ca2dcb463877ef3ffe685a1cb19af5e4a549892c104c302efb22c5fc8ae20f400ff SHA512 d2d9236b8bda720b719f416b87a7de431966919500dec18550afd4aefb4e00081505746b7d639390000d0365e7bc62901dc54ff377b01714f0ee1c463428c0dd
+DIST firefox-110.0.1-rm.xpi 560564 BLAKE2B 4ef2dde8ea34fae800a3b61ba597222571ef03c1405cace0b1195149f4ed86ef28c48863735e81fd3ac5beb0c0308225e474007b271a3e183e8d8580002ab564 SHA512 00651230d1e2fcef180e9bfd2ee8d788011aab1f649c1cc89169abe97f0df810be7bafa3944c4b11945b39d69c93e716279c2511c81112989941fc1a6f74cb4c
+DIST firefox-110.0.1-ro.xpi 533696 BLAKE2B b391090477181a00f4ee7157b15d27a38ea70ab5445894cc1126d271df213d41aecb25003d3bb4eca65e2537850a473a684ec8eb1365381a53b7f211cf79ca26 SHA512 cdf42fa01933b7f96b3bb30ae0cf15365586a6cfa8323f7eee3becf082013152f4857d713436fcf56f7571d0fbcd09ee2d12fa3884045b0ca9f637a44aac4833
+DIST firefox-110.0.1-ru.xpi 657162 BLAKE2B 160acedc67e633a5707dd570a894bdd48b9878b24ed3d500093c44425fa6b6f1540db1acbb7f0e29ff2d468fd99d4b1500a38e5dc668f20e9a79bc640262cd56 SHA512 27b3decdbb1efd5cd7ea1fe08679ee36fb9a03bae8a970ca37b58099eb5d8bd3001551650665d6c2f4dac45c5b40b0e23615a16d807523057328996c7e7d9f59
+DIST firefox-110.0.1-sco.xpi 505312 BLAKE2B 936d925886109a41ade7e97b4dea59385e2b34202d6fba7c7a4a52798ee83b2a95ff25b4b6b87cf42b837e1f14b20cd9aa00db6870c69f8afac30a998b5fa886 SHA512 99e2a0268880af56dec094b8ac20a94f78a5a803c9c89882f89dc489199ec560454a45a6403ffb4bff3171c3f3c3ceb2e901514be0767f644fd364a0cc21924a
+DIST firefox-110.0.1-si.xpi 574131 BLAKE2B 6b3e7d2bcc49b63dd1513f5e6cf26866671fca9d676aed47c15064e40207750472726b03c07885405435d581356ffb315291534b068ddaa9b129a3c22a7d3c3d SHA512 ba35ea58e83806c79466b54dbaee4a967e15d0428b43bd1278dc906eaa9ac8bd9b63fe766f0e93897a93434e257bea74a9fb9ad12f59e119a8fe2601e7afd76b
+DIST firefox-110.0.1-sk.xpi 593385 BLAKE2B 11f06197922726aac3468beceea4c21c475fd6dbe6527727560cf17574834fa0fdf29423ae4f4a4fc634461ae15f7683f42706ff3692b3d212f7fcd446b931c8 SHA512 9505aab4f34cbca685673f0f10a414b0a0f7d3e3a6378495b4ab3fae78c344c3e75d5fd7c882565b41f719776910890aa05d8c4add0520049504bcf824918de7
+DIST firefox-110.0.1-sl.xpi 566382 BLAKE2B 3f540db0494283e5e04b39ce652b42c9ecb53d72b31179e587387c9bb23531fbc47b1984c918f0477bd57a138a162c5d0fb9b6dec636d35c61b8af84824218c5 SHA512 72a8749a7d1b3258500a6b9dbf0c3b21c1deb7b9b1cffd3ff4df747add278c77f49f39381d4f3ee45fd78881d0a41b2bea00d1d7d0bcd54d601d38d307e27c4b
+DIST firefox-110.0.1-son.xpi 422457 BLAKE2B 04babac264fea21675959f429d017a0286535521441664f4b286af09583d4c4b5ae687490cf2771077589dbfc11e746a785c1c1ee0d60160d5f51f135f0231da SHA512 bc23e6d30e2d35baf7fa7be12784433eceac4b61db4ca49d3f67de48279ea3dbbfe5fafa885a8388527ad306efd0cdced6593a603e94c6c1bf1217ed2966e3aa
+DIST firefox-110.0.1-sq.xpi 581639 BLAKE2B 582d99cc5b5166ba2db0c56578ea0202d82b415e14b75a65b4b473c9aa6ff46c0713094331aa3fa3fcef5a0c6ba3554f715ef99c352deeaad94d2562d98bea9f SHA512 e8c7d39303c8d46d7704d876bde12475a853b457a4468f384d6326eecee382558a211f22a6b1859cc781619e4d40545ecb6076d091c32aff958b6065e7d3dbe5
+DIST firefox-110.0.1-sr.xpi 621092 BLAKE2B 6db5a1392adc982f001b86afcf2949d65da6c6de458c9adac673b350f28ef46c8ffb4e1d7655d627b58e59cc98498255635399f7a3c2c72ac404f17c67175461 SHA512 2be1ac69ba2a2eb3a222e9898d5a4210ee57a5d22e4548f455ac3a47f6bbe579eee6ab4bcaee9b1f7f6377e8248e518625b5dd8092bcc678f9dc736b02b16241
+DIST firefox-110.0.1-sv-SE.xpi 566330 BLAKE2B 52f7e626a9877a78871342afd2ac44116c6d9545148d147ebb9e88b7ce1fed398e952587009fe587c328fac4785994442cf14373305b747611c200845e9bbb08 SHA512 037563730b0d99c6c9ecfe84f6dec9c6e48eade137725b2efc940b9ede58a66c995aa8c3d53af9f8874f7ada38962b72491361493f755d58ea8bd68102466301
+DIST firefox-110.0.1-ta.xpi 508561 BLAKE2B f5cea728483ffcb17486f98bf6b1b013e23bd989a496056dd2faf10893e67ef4aae3030907fbb75a33ecda69cbc93594df4ffe4883d252718748a5e763e33246 SHA512 fc92e80acdd56432fc5fde6b355652b29540ecb984501b80b91d5c5c7cc34051a9e2e1ffc1feebefe9a5d210a1986d3204243f7f6bd1fe2bf49748da7ca767e3
+DIST firefox-110.0.1-te.xpi 556285 BLAKE2B e03fddc6c5e13315a2d25b792afe325016771f687cb08cd333dc11b991aa526e1d17c340d82a8692937acf7575d7936e816ed87f710a40247a7ec12773695bd9 SHA512 0830cbdf0dce054c10f63db171f43550825c6c26a1815f8a8a2fcce726bdb3caf86004bf85d7d394b4d8aa6141ab1e57ea25802e632ac853756497994cd03855
+DIST firefox-110.0.1-th.xpi 636774 BLAKE2B 1f1c92fbc46586ceb586575f836db0b54b9394726daed762788631415d8c31000783f46195bf22e219eee14e18d881b8cfc5ee13f6b568bbd80bdd823d0ce82c SHA512 a3b4c3c0e4d3f0a3bf4734085e7e82c0b7dcd9aab046156fa58798e341a237b62503e69a8b2d2409dceee4eeeb71202393e57d1583cc47c995b93afa70212b16
+DIST firefox-110.0.1-tl.xpi 523711 BLAKE2B 12800962c30143477c7649117ebbb34a28900fb472c599e782059ad8729680d93b442eaaf6412a0734676591c2891141c77647674893f68f15351e4e25efe094 SHA512 dac94ffc2ff490b28295ac89856b79a37367bd25d85ce1ec08cd5f0e0ed6ddb875e1d7e28a89d22243cc4cfe67074f22dde8fd9e209f378eed2dd5722126b83e
+DIST firefox-110.0.1-tr.xpi 577878 BLAKE2B 3b505e078f4d613931aca5c4e8ea50353f4e3deae3b658c51d41bf198270b54c1c09e85fef8f54697d353ba551212a3ce172f44a13e2c810db368ff3e613ddd4 SHA512 377a409eeb8a468505027dfe791095b94e1f3e140844e57f3d9475d0839bd9ae75ae6d76aa4bbc4fa26262762270a8dfcf34c2d426cbe918f3f3cf273bb60a9a
+DIST firefox-110.0.1-trs.xpi 487282 BLAKE2B 876ca3ea39e8fff980321c64abc784445cf2321e2b1263b788070a0f74c3894450503bc24eb2596916a6e95f75c96778287c4d27dc23389c39c4e3747d49250e SHA512 0761c94c9d1bf22a3e35cb08892630203a5066e8e854daa2b235c395e38723de8bd8f00f1dec867e8298b91a82db537dbecac7083184200ac57148e3d45f4ab9
+DIST firefox-110.0.1-uk.xpi 650248 BLAKE2B fbf07118a60a0d1eaec119d7e6503b73a1805c64a1f2c1febba4ff7fa8df652223c0c8aa67545eb818f19430685d59c43c4ef009d0e0316de867f431337c0615 SHA512 efc9fcdaca232510f3034cee2c8d6ef858d4080bbffa640e55c4b3aaf9e7d7ff054a6d6bf13c0ae9b90b74901759c79f7c3c81ee5f932528832e4022e3ca5c7f
+DIST firefox-110.0.1-ur.xpi 558069 BLAKE2B 9911c2a1d230b7179f21233de4421d1699795591c982d664c453a1ef9a441f852a5f31c8114e44e31961a52bbd58d8f034a65a160ffd3c38f16dcdaf2f758653 SHA512 c2703d2f5b3cd3d2823a5445b81415db8db4523acb544444155b6e7e499fd324459642599e2d11be2e3607cd7bd260e8de0e358b73886d5fc4a3af9f0a16c5b7
+DIST firefox-110.0.1-uz.xpi 478758 BLAKE2B 217317687e596fc7a03eeb8ea24ed24f1be9d99000c489663bba604d63f6536d98c34cf8d752750d4003098e7e2cb6bbfa4daa579c803df3feb1adcffb25b932 SHA512 90e5412a06a243abc54115b0406662eb3d9ba48e8299a16e01794ae07da4b6e39307f015e6f52e7e99751507ac3b854e29fbfbd8ace4952117b09757cf817e5d
+DIST firefox-110.0.1-vi.xpi 600480 BLAKE2B 5b8266aa34e1f55b0b1776e44528a1e8d49db7571ee7ee6e5abca0ab2142841d28c83fe8677efe9a50d3194d2090b7072b8383918903fc6e2b9cd0d067bebddb SHA512 2dcea5f3063a0b83a86b0f65cf5008346575a4ee287faee8ac6e4298b53e221d4075f18a38bf64bd4822b67cc58c0f95e7cf26ec06d7f2bdca86dbcbeb0e699d
+DIST firefox-110.0.1-xh.xpi 416890 BLAKE2B a9dc27bf5848f9f8d4513398b633d1d17ae6e99f61dd27c3ed5aa4a933019e11c6bb0c39b925f81e4e0c5ab687aa9e23b3baa5016190e1717a45f8850e86d22e SHA512 28e5edb88683286464039f14d3a901aa3bf0d31dd3ac192c897396521896e25afe73f32a5d70b57440b3145737c1cd26b052a4983aab2a2ae63386835305f5bd
+DIST firefox-110.0.1-zh-CN.xpi 599824 BLAKE2B aa00d351216e606dc79e0e81dc2d32b7e465e3877b2410f19c9cc864e33b84a36f9b44b45a32689bd45a0250a5fb205cf7c6607d74dbe63b477bdb106cc31aa5 SHA512 f8afe4451da1b47ba4be65fdcd42770fab9e86ffa870722316b645b9301778fe6c2dc1ced395dd5a4c23f6972d4f4ffa2ea4e26d97acc1a524171fc5539e51c9
+DIST firefox-110.0.1-zh-TW.xpi 602201 BLAKE2B b7c64c74c480fd9459765e578d7c07ca656392a35317ca8a40e633df793176c307abac230498dfa704b1e88c4478b7f7ba39e8078370bc935c4c9528d74f30dc SHA512 3375915a30562cbf4ecf6aac3a1083135bc8afda22f17ac0f4edd9013f749de0e06c685fb85f7b59364e242a8d86a49f0c3a5e46248f7f576cf56a31ec9bad5d
 DIST firefox-bin_i686-102.8.0.tar.bz2 80553728 BLAKE2B d1c5aed8e92c1c1d029f1dcb1cfc9dde169c2e9bdbdd4ac2a76f549b408a4643ccd53bd68c9e9699f67ea2693a6a3a1ad4ded3b5f52a02cc351bb586e29fb33a SHA512 62e364d289f935549d83d44c9db4484815a0c2c2ccbbb7323940f2a7a78697e4e64b5bebdbe9fc1724a51b510f010be01465012f0474aa3d955fd484ecb8ca37
-DIST firefox-bin_i686-110.0.tar.bz2 82796823 BLAKE2B 4ebd7e08772e760bdf64f7cd88a2bf4992912892df9b94316ae9602a9dd7fc0ce52e80e9753186fe057c9cb4275a85c17daefdb69521acea3463f35d88e23e71 SHA512 97a05c71d003f6172cef054f4d35fe0b365d25a0ca49d91e446b7eb08662af946447cbf2f249aa61d697b58145cbf094de03ac6dd3ac86fe65629172a6bc4d0e
+DIST firefox-bin_i686-110.0.1.tar.bz2 82795561 BLAKE2B b52d9253f0a66d06fb27dee8ea49eb24647d29957fbdddf5aa0c2e1ce7345e4186c37302515056136dcb2e723a92ef156e73f43352734a54fdbde4da31ee53b0 SHA512 7a0e20cb76207e2cd7e949f2227b0f74aa33bb1d81143f342110b0dd8abd927331ff9945591e6e25d79ac18c1ddffd389d2b3fa7d14160b8e34ae18c1e083af9
 DIST firefox-bin_x86_64-102.8.0.tar.bz2 77387173 BLAKE2B 155f980da71368984dab3e921e50257ecb5a0766ea872475f7247e93de11fea06366a22222e4f7f20b955d76c984bb44592dfe32a8a66de3f9196c51f76eaefc SHA512 bd4431c7f64b9832eeddcb04906356ca1d95d96a91c0ae9affabe2669c7eab27b8ee28fba5ca8889bffdd2be004a84cd90a8d8701d034a60537a04f8cb8c3bf1
-DIST firefox-bin_x86_64-110.0.tar.bz2 79426331 BLAKE2B 3ada8661abd6c5049e7e9c9e24143bddf275d7e9763565200583d864c8a7144201178698583289637cc2b8e53ba337d9884d0be04865afffc35bef4a9896f9fe SHA512 c07c08f42d53a5e7753aa30bdf2e712295da799c08fdb2d970ef663b2f6e2584c77c390a21fac352b7832d4e6f4a23397eaae600620497df041fad04a922b83e
+DIST firefox-bin_x86_64-110.0.1.tar.bz2 79470140 BLAKE2B 51cbc4f786c3ca505dba6acc974cd79da31aac5049a49cb5b210be2822fcf8235dddafec9435a91464228cb59aa986d387dd5eedf7e32071849cf00dbbbdf082 SHA512 49d402057ec7068adb3402e2fead823724e5eae6e5827c6233e5ddb899f442a976ada16f8cff20ca53cb8aea96d02a50e906d2f75a836d980ae7b3a6d2da2796
diff --git a/www-client/firefox-bin/firefox-bin-102.8.0.ebuild b/www-client/firefox-bin/firefox-bin-102.8.0.ebuild
index 4cf4605c69ff..f81d5b9db36a 100644
--- a/www-client/firefox-bin/firefox-bin-102.8.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-102.8.0.ebuild
@@ -26,7 +26,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
 MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
 
-inherit desktop linux-info pax-utils xdg
+inherit desktop linux-info optfeature pax-utils xdg
 
 MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
 
@@ -370,4 +370,8 @@ pkg_postinst() {
 		elog "If you still want to be able to select between running Mozilla Firefox"
 		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
 	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
 }
diff --git a/www-client/firefox-bin/firefox-bin-110.0.1.ebuild b/www-client/firefox-bin/firefox-bin-110.0.1.ebuild
new file mode 100644
index 000000000000..d134ec543678
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-110.0.1.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info optfeature pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="rapid"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+COMMON_DEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!www-client/firefox-bin:0
+	!www-client/firefox-bin:esr
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/alsa-lib
+	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:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	>=x11-libs/pango-1.22.0
+	alsa? (
+		!pulseaudio? ( media-sound/apulse )
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-libs/libpulse )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local show_doh_information show_normandy_information show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+}
diff --git a/www-client/firefox-bin/firefox-bin-110.0.ebuild b/www-client/firefox-bin/firefox-bin-110.0.ebuild
deleted file mode 100644
index abdd46820f3c..000000000000
--- a/www-client/firefox-bin/firefox-bin-110.0.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit desktop linux-info pax-utils xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="-* amd64 x86"
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
-
-RESTRICT="strip"
-
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-
-COMMON_DEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!www-client/firefox-bin:0
-	!www-client/firefox-bin:esr
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.26:2
-	media-libs/alsa-lib
-	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:2
-	>=x11-libs/gtk+-3.11:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	>=x11-libs/pango-1.22.0
-	alsa? (
-		!pulseaudio? ( media-sound/apulse )
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( media-libs/libpulse )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="opt/${MOZ_PN}/*"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
-	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	mkdir "${S}" || die
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			MY_SRC_FILE=${_src_file}
-		fi
-	done
-}
-
-src_install() {
-	# Set MOZILLA_FIVE_HOME
-	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	dodir /opt
-	pushd "${ED}"/opt &>/dev/null || die
-	unpack "${MY_SRC_FILE}"
-	popd &>/dev/null || die
-
-	pax-mark m \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
-		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
-
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
-	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^} (bin)"
-	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local show_doh_information show_normandy_information show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla Firefox shortcut."
-		elog "If you still want to be able to select between running Mozilla Firefox"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 87aa362cd2f1..0df5a138d936 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -98,101 +98,101 @@ DIST firefox-102.8.0esr-zh-TW.xpi 614571 BLAKE2B d0332f219a6443f3bd99ad33715ea1e
 DIST firefox-102.8.0esr.source.tar.xz 479172816 BLAKE2B 0b4cbf11028abc73a8479fb94670e98f0a293fc12381b1eccbadd64a33db068ab7434357abbe3ce0773382c7c90b8fe4d2258cc55abe8bdc2f551bba1dc2b797 SHA512 93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275
 DIST firefox-102esr-patches-09j.tar.xz 20236 BLAKE2B 35431fbc56c5470dac2839fd218d2a589558cf964eab2373f2db7a01e6e0dfee329b1b63f6a421bfd4c9bf8c3ed9877067cdc462742a1cc59d78d1d10264ebac SHA512 7fb82ff3ef2cbca339ab05ac07f0409088a87dfe37314d31d441bae1beb181cbea799dcd63dd560d0ccde24b665379118e5e99a1c1a2385d859378901593089b
 DIST firefox-110-patches-01j.tar.xz 17060 BLAKE2B 80ab1437311b33248edeadacfd53522ac388bfdccb89f721ab9dbf9dad7ee82b1cea978e553c42728c9a2a5d4fd6d2f101d42eab78a220e4181aa1068ed73278 SHA512 c8d2610bf7b1e5d1f1a1bd608b3ac8f0239e45cb08b6a2d9c63dcd19f900dedd99942a35539c5952ddaa84746c064ca2930c3c1b68758914ca5a9f1016e86ea0
-DIST firefox-110.0-ach.xpi 457766 BLAKE2B 166b12fc0400ca240640eab4c074dc259e4c38800b93452757afdf15ffbb8cb775e2e99d50a791e3e1a2342d065f56157bb143dbd191c45b15810fa34048fa63 SHA512 f9ed95380afdda2b556922916584521a7eafd912ebd421f92c82eb0c2ee618e15bec68741cd51351696b7f2eb7c33ab97827a45193868eca2de7f23054f86f06
-DIST firefox-110.0-af.xpi 418305 BLAKE2B 14d880431623f655eb33f3a6a0232f4996ea137ecbce064d5347de82363efb0824481911ffecf3a0fac98546922fa372f2ea8cae9033e0b3c646e8360d7d560e SHA512 3b8f5ed26c394a5bd451657fec83ee1fb9cd6318c91bb7fceb1ab4d3ff04e8b066d24a4718ab360233622ca21ac27896eab5d53f6e05af403880243c6721d2e8
-DIST firefox-110.0-an.xpi 501238 BLAKE2B 02b9aa6014817ab02db61a99d8118c1f2775c7d42be9986333c37f71571fbd60026491edead6c0c26057baf98b841e86900bf4cb187b5466ace3b0c7ffc51b63 SHA512 a4fc90cd1d97040c48d4d6804c7a6ea3c740bbc45c21a2b4fe0d396534e78423738d288bd54c5d65096b94e40c110003f0540938ba83bc115f69e6ecd481ef45
-DIST firefox-110.0-ar.xpi 568264 BLAKE2B c4ccacbe0f8f833c91413ce7db75f39eaea4b2f29db14b6d83369c420561621d86b4534fb6f3b439202b8c899c6092199f58e6e8e469077010ac16ba21d7dc2a SHA512 4c4f4b6cc4185d8a5ccd52980c236cd5a84a6732f7943a7580e1241a32e4562b774459a5a7f94de1a163586a4097ee05b991f15d5e928de080354e84135f636a
-DIST firefox-110.0-ast.xpi 487468 BLAKE2B 1be6f483ce27fd23e75ac89cf8d1bcbc976686ed783e659739267c6d05e589892260681e96c1c8bc844e07c170b9156e76540b1be9151c30ee79b279dea42530 SHA512 9c7778723e8c07987fcefe4fa3c5710859bd55f8e0ed0579eb8690652e10bbd9307470f625d4810ce13737f63d7db06b284ef29a42f347afedabaf3484efd0e7
-DIST firefox-110.0-az.xpi 490056 BLAKE2B 66231a1055ad707ac6938fbd23d55c9d9d7a5504215d9d5eb31266b03b29927a7a85631c9e8ab21bfbdb57b1f1415923e10433f84204bf7ef2d03a0ce26a3e0f SHA512 756f5938184ebe10e46724d7805c9ea86b066a9339398e7cc4bb2b514edba310981977a4439d249951e84df1b7b83c2b0fb8f51db487858e3c01a80178413f71
-DIST firefox-110.0-be.xpi 652579 BLAKE2B da9f88506d08a511b491978320ab0a6f7418dbd003d392dcca6f2621774755f34ee6c59f926399f8f9c49b98e9791503531b3b12b151d9390a5936b17055cdf0 SHA512 b0c62ab93c736428d25acbd722aa621feaa601bb00a8d87da3253405be04c87d36b5a71c7e5b66f4f1a34d836d26f5629a2375a61d5a1b65bdc7bced1b17a978
-DIST firefox-110.0-bg.xpi 579992 BLAKE2B 70adbd5670c3f8102332165c462f088c43b49a5676023a673e2ae0dc183614414a432ee88c6d37ac6d2ce18f21a7bc4fc6244b0e36079d605cfb64be6464d4b2 SHA512 6c97c21466b88bf2b5f2d68784241940f0759ddf82921a365e798734844341ed851a48518fd45a0a6693801cd7738e98b400bda08d0002696cbed4319cb7626e
-DIST firefox-110.0-bn.xpi 579339 BLAKE2B b00cc3bd5ee414e737397ba07e6ebc05d5266d2d47e2f0ca73e421b5e8d3415fd844b04f60a57ad43181129a445d67bbaac412903179bf7029c4886303c6fd4d SHA512 eee4ea7899d4eaf5ad9346c5bf7afc91b0f19ca064c50b85c51221608ccc7f629c65f4e358e2b5d7db3b8a90b6a1f976c8e98dffe7879b94f845bbffadc94bc8
-DIST firefox-110.0-br.xpi 546492 BLAKE2B 263af6cb6d6a7355ddde4cf282dbea91de986f0ecdc4add8b016e7845e0c4ad8c6ede786f7d635f90e949f842dba3e8568ca9c439c8bfad018502845868bfba7 SHA512 8ad5269de65833801c2b26167070e3566c033af37a5417ab0c8ccb2fca8291d14e7b6bda5304084b666337e28a7b15a99ae6f140a94e36423e4678add81dd3d6
-DIST firefox-110.0-bs.xpi 461730 BLAKE2B 6394b1dd3aa487708112643a883008392d81372d89a6486283500d84762040b18fff576cb740e343951c9ad5bdc963e0c8e390266baa3b5bf8e524cd854f64f1 SHA512 e495358e090be17b624523c86ee2ce9c6554b2eee37c8b2bd7bbf7818f7135652f29f8d362cb74dc87b5193c8d346c3d8438635a05e05e4891fbe24e62688e30
-DIST firefox-110.0-ca-valencia.xpi 540139 BLAKE2B 6a4f0aa0a3740d02b61407a34dceb06abf3e109d4c37df4fb18cfa01b3992903c66e98e4e3ea18af6d7e824b86cd752e93fa2f927fa531f3cd37b6e9e7ef14c9 SHA512 b50ebedb3cfd08348dacb646a8466467754e58443e2683f72b6acabd7e94dc687549c7ac0943f160b209c6f4e08232c48a0fdb77ac76b249ca544014e38c0dca
-DIST firefox-110.0-ca.xpi 554783 BLAKE2B 55ed4bf968ec46510effc98a41f7d3a6310f2d66a865ab1d9177d62524c2eaeaa66ace16d9788017f69c9e22a5ae6e4b2fe83f4c03fb158be28f5382935b86c3 SHA512 064a7add5945e994a1e8f69a93ea66ac3f2cb1d3f03206f4a10464d954ca98a2c59ed40807cba60bfce9e7292ed0b642017399294baef231d5709f3590b563a2
-DIST firefox-110.0-cak.xpi 555434 BLAKE2B 70ad875c3ea5535032f03615632838e6b92665fef5311a10271fcad5ed08d10b663bf40258ee8ee29f9715052f7a7c85e355a96d845387675b66be75e92bd9d1 SHA512 898179fe1a81dcf7c8af75a083362d7fae03256167e4c1c91e331acb8361f54abdc86fae03fab4ce2f5ed444815a186e5e0f7a2ea6614c6def2847a1091306fa
-DIST firefox-110.0-cs.xpi 591249 BLAKE2B dc31a4caf8999a8f9a646e1a9a2aa182eb9263ece1d600f7e649f824ce304efd432decd61f0e33c5734abaecbf6feeffca81d2774b342cd621d11892b0492fa9 SHA512 c82eef048ad87719c4da53d655005253f5b1caaf289a3ea6f683fe51590d3c145ae5059463d54e74ce491b340c98fdbee7eff7980264b4af41e267e5af6c0728
-DIST firefox-110.0-cy.xpi 567859 BLAKE2B 5b49d3100d335a9c052a1704ab278d422fe01fc9465ff6775c46ad6fafcec64dfe94dae6e34c372915db5991b2116200593930e2d30fb31cc7da0fdffc5cce07 SHA512 8acac7208932319eb039989b7df455cc02afe84d8440e02af0c697b70ddf50f99a8b08e8c0f1f965c89e14a3be6f138d099fb90d433c642713bc6f9e2debf49b
-DIST firefox-110.0-da.xpi 558098 BLAKE2B 093bac5c53f258419d379a6e49998db47150ed27d90e2fc77f908e94f5f90c889305e0a518c45a1d35ecf5566b2a9a49c36972754a1cbdc6359a7b8ac2050eb0 SHA512 34c48965cf5cb89d7d2f7bf132d2ca63df1de179f1b5cf4c3647fc1faaf52d551da3d8655c868920626ae7329cc3f315a0104b6315e0a3cb9b55c7da247f0d0f
-DIST firefox-110.0-de.xpi 578970 BLAKE2B 9a1f1dafb8e5bf9d297eacd7007de23fcc2a69539a327e14b9ee62ae9e3296bf29eb86174bac7e61183df67acfdcf4ff9c3c086cc22d045c52114c2f291ed459 SHA512 ff9c5990ac796c883b0598e9ad098a80c772433b8234ea1e95f3d1f55001056298cdbb48795cbf672509d94d69696c2dbb0df69dbdff223702b6b820ef776af4
-DIST firefox-110.0-dsb.xpi 589316 BLAKE2B bbffe00a1a6ea3fdae411a375712af0674ede5f93ffcfa644d31fd330eb2ad126bf177a7112cbe81ca9c6f8c53b4cc8c6f158b333bffa9adc30d2a2f24e0c176 SHA512 50f59ad44e9e90ce4449cb3888b2b27d9c7c1979614cd2caa1a2d4632745fe01731f303c6c114a67547042e20fa44d540b587e42f0193abe5e37455f8ca4d83a
-DIST firefox-110.0-el.xpi 667180 BLAKE2B aa346700d62e9d9efe6f6aa1ec3135434153b7e9c57dfbfd0268ad10dba175f572f24604f2b4bd9e53f0e19fd8e224ea4e4ee5c5db5cc85d1e74c557b5ae0d66 SHA512 591023f5e61a1742661a311cf5c699d8a87f08e4453b006ccb9c66e0c628c565ab4fe6a1d33f5768f015bbffd417bf548f9eecdbf0ce5aa40aff0f1d33894165
-DIST firefox-110.0-en-CA.xpi 531651 BLAKE2B 3f1dddd29688862c5f852475f07610d4add753a3a1832bc4b3b9bc38bf2dffafedbae69387ec45096f4ee7c4696326737011a3120f2dd58a45ac1447bfbdf9b0 SHA512 c8b4afd5c25f9131aa3c41880ccf2d6408341c82e7c2f579ff163af39413cfba4dbd1a7124f6fb8d2fcd5ee020dca3ccba9339fb15dee8f3034739597ea1c691
-DIST firefox-110.0-en-GB.xpi 535380 BLAKE2B 16f9291ccf11acdf0d0670925ea8ddd0eb71535aef09f34b88568dd2cc6fc7cca4c64adb073cbd8355296ce558e078b86a8e4838e27456052e7ff9b419a9799c SHA512 5fa857e8156d0bb6512e8b9b45fcf48fcae3d78f763f2dfc707cf85b11ac870973375996c1be2c98fdbbb2a144175c75ff8ff2a7355955884f35fb7872a1518a
-DIST firefox-110.0-eo.xpi 560353 BLAKE2B 49e8e3110017055c94f6d85e50c028655ed425b87eb1d9b351e1b410f9bbb84de433152cfd68b5eec70b32c059f327205f5f3ee073ccd23925edd68caf2dffb3 SHA512 3246a934b8913ae5f9a08359e083e3e5b4f7962acb4520792b96848903d08b3a50b735ff56b32fd5857c9edd2f3106fc8e6ea4346f2b7fb6c4504a917d3313ab
-DIST firefox-110.0-es-AR.xpi 573022 BLAKE2B abac791edbdc3c9041b3caa50e40cab526dbbdbb508044917c8c2383104b62e650d45538dc24e9a65c6bb698f4c46c5805f2be8d49b7c358385407df7381e489 SHA512 6537160919839acca8ea20545280a7b81f736230347f6f0e581f70fba5ac3c3c4de36fa6aa637bdd69d9f8d2bbb01a488680e6f566cd9e4578df49131b7bbfc5
-DIST firefox-110.0-es-CL.xpi 572248 BLAKE2B 6c7de6da9deaf7851691c424f3f6005a99c874aaaef11f08c06ab62321a21a0ad12c773965da95bb0da05196d77d463a7c8b7a72f0bd1ad21f3c886d5e96344d SHA512 034a941f178ace1b089947f5c6a165b31649219548927dcbcffffdc3b1ef528c9bcae176c08d754195d69fa4f6dada10b37f761a44675d28ce4f28de1daa70a9
-DIST firefox-110.0-es-ES.xpi 566016 BLAKE2B 80ff0ec0d379ff7e7ece253a16d4e2960fb71f46d9011fc8eec951b214766b52e8ef77e012d1b672c24604b08ebb5938f9eccb98a52154ff624bc68f6719dc12 SHA512 bae1ccfdb9d3b6efaebab685360b61442e0ec4d1391a0799187ef25e93faeedc4ad503dcfa5deb94c6f02ba552629d85a873264ab2f67a8313c44411404a89f3
-DIST firefox-110.0-es-MX.xpi 575394 BLAKE2B a114ee942f36e3cf54da79d95df95dfa718d2c58c287351508e5c639ec50ea604e92852e1ba6b2cf75ee2452a2437d7487ce1f74536e5f306ff847b00adee71e SHA512 b9a1a2e230108752ef312e8e7a959b8398c58e70c8a8eb6e7326cd503ea1fc7a76b37374894cbb0251828d5a38f50d52bb43ad3835f496c93bad97dff8be1ec6
-DIST firefox-110.0-et.xpi 534623 BLAKE2B e6d4273bc2a9dd6c79bc387dbcda108f7eb59fd56c2c3f28f2ebb5d6f10d606fe43c467d630518a68b5352a33391f6f62e41767681ba91177724027f312cae02 SHA512 4f7b72ae3e9331dae4686f7bbd9c1bb6ba6f69a470bee8d07ba30c2ef39d5415c3718428948d3ad8d5b71eb90874fbf2f448894f62423356de93ef5938a00b71
-DIST firefox-110.0-eu.xpi 561986 BLAKE2B caf5cc92d7e0a69a5eb58b13ac12872da9970b43691209a0b9cc2e05f854918a9d98c316f3cd7658b11ee905884357d28557f1ff1589cfd87fdc87f22ff9b512 SHA512 d0d8767120e9c77baf159527ed6715401d05f7f7db0db99b3a740446cb505e2d7f540f0206d0829b641a5c0bf8f18ba25cd511776be13c700dc1b2de5612f58d
-DIST firefox-110.0-fa.xpi 571857 BLAKE2B 8c1668ce7d05b1e3040a031c477fcf8dfee09626637200c2721f6feff0ae991035429107cf1080cbb5de68f4e041401cefa0281f9d66c459298bbbfbcbe64c79 SHA512 f4891f85865a0d696a38bfd7826b8247a5e459bfda2a5fdab08b07227e2cd29de2f074cf160eb74e5a0fad203637adb48b290054b134ff945cbae6a6309952dd
-DIST firefox-110.0-ff.xpi 474130 BLAKE2B 40d94429594feeb285f3f964274b6f27e066576536e3e4a497b59f89838a44f7042c7a6e9521ae65ba9d97a8cedc512f3c880983f34d898aeb4d7a03623b6a57 SHA512 548936edbf5de453d2cccf0bd78137d7a888e68bd2b5c7e827ea0fc4620eefba968e7559ede9ecf9403cd47bea7a5bca4b72a61a37603164a4850a39d2c2b97c
-DIST firefox-110.0-fi.xpi 557017 BLAKE2B 432a990ed5ef865dc027f77ea2a559e7edfec074b06b95a3d9f80c035f16d24b499984daba1e0b0c076abd71447f0c6b7aeb951ee1837b6ee776fb7a2f771432 SHA512 cdb8426655547bfce0aad790194df29205b39e39772a25a71ce7e8e7ee16f1e66c0420497628f92eddcd43594b18caaf76d604e5d5e249a2a65ed410cc9f07e8
-DIST firefox-110.0-fr.xpi 584583 BLAKE2B 61b4e7a87ebd3e5e162dc2a51b92e59d0368d07040d7f99db0486076e454962934780426891c743022c3789f1f00f929a03fa21e0865807a04fd077ffdb435bd SHA512 8ae58f1c156ca8fad10fa2036f0ea9e9611d8b8f23ea1168be927a792fecb25f77dd415ef2357f6454bf57f4fa6a8ed31c455773ef9f508f0f449b4ba87d505c
-DIST firefox-110.0-fy-NL.xpi 568575 BLAKE2B 40e7c348e3571b8d5db22643a3c287e1c6817b13046d7dfb53e9220ff921855ccaa011b953c558d724afb4d96e35a387041c885b338e8390abbdbeebb1293ed8 SHA512 3a3bfb996ceda950f1b1a607604685ce46cbe830993a804e0ada13824a62498456579f774fb8de1696a2f4cfeb9ae6d1c52e2e873c0c5859e518e01061d55e41
-DIST firefox-110.0-ga-IE.xpi 470627 BLAKE2B 8967b9aa8335e2e73b23315535c917af9b42fa1964cc3fe7f0ff97a6e14f24f6ba3588b966690b5cdcbc786d6dcaf9602ba7b0121fdb3ab732cdfeb8144cd1b2 SHA512 90807f4517987a2fd4dbb718050fcf84a9605195a30f83b8f6a4d9a82a8bc2f91f9507ee95776163e319e0c8d63a423b307dbfb8702f815a128ec04497ea9d11
-DIST firefox-110.0-gd.xpi 548691 BLAKE2B da79abad7e946b625f43dedaa15251e127bb8d0df3b1f2739e650433ed9e94d5d05c058b5592471c1029d630872d751a1532cbf9e8280bd829ce6ddd9d1f864e SHA512 43bb57e0001dc812089bedaea012c3d8bdfbc3aac2201a2237df6d93518cd07c840e0360295d883e839549515402e612b07cdf3877c3ff656434da399fa313bb
-DIST firefox-110.0-gl.xpi 543495 BLAKE2B eaeb21bea907e3a21b220fe6f826578763fd9e3a0947fe10207363f664c97c221dad3d6f5048db3c3241cdf91990a08840d944f1bd127bd97e9913e1925b6745 SHA512 ce58c7c4c693bbd1e01776e026570d7e7c3d0a0131fb0efb62fc4b9ee6dd05a1c4d4093a1c81b1b54745c5f2bcb7f6e38bb65d42f150eb4bae5e0710e2c1681e
-DIST firefox-110.0-gn.xpi 583839 BLAKE2B fc6c182df9a7efef6697a78cd46f244832d03a51a0c08e19a5b6b4dcb39684225eca68285f7568be118cdc222c1c763c57d12d7067e9557e85d9fdfa65fada9c SHA512 e704ff2d2826bc50a78a77e494bfb4d28ef69f7c22bc8806e26a38e99280636088c54a830305870f6b9d9b19e937259d848aeea4e8469a1c7914c2a8a3eab861
-DIST firefox-110.0-gu-IN.xpi 528992 BLAKE2B 95d7f9338ddd582f335802786d67e24043ad3deaf1e5f9ee44bfa2ddc25fcb317b3b7cbee7b0b71a61a2ad253eb07584d07e4f6ae2ff20590e8f6b214374aa0e SHA512 160734698698542d1bcfa1dba91cb412856b71aaa6d4be86c6aa1a2d16c204f024043eff87ff5d3eaab70cecc314bf08677f8621ba92e1a5eead0e051066b0a3
-DIST firefox-110.0-he.xpi 578897 BLAKE2B 00720a042b705d3b63ec5f4335c4f2bf91721fa60ea6b2d74d5dc6c67b05fa32bab3bdb50c32aaec282d1f972ce638780619b4d399781b8710853fd7cab10177 SHA512 4d8eaf8643bdd349dbb60cffb77b53a946f0096bd7b9cbd2d78fca6bd804d7c5b0d408fb1453d3eb8077b66046e0db8eb4f62819c3e59fa76ec00c5b91246ec4
-DIST firefox-110.0-hi-IN.xpi 557869 BLAKE2B f576c56a0ada87ca0cef14727baaa84ef2948c2dd0b4d5cb6a29f0e24ed8bf962082086831b6566785a99aceff48c7d396850d3ecc72ce303c4e4cae0869759c SHA512 35c6321df40564e047168f6b4acaa56399f3353640c447f652e205fa5cea63d57e8eacce438921dd38f9c2404950f193c5adda836152cd4d5155bbde92c5af58
-DIST firefox-110.0-hr.xpi 547283 BLAKE2B ae536e5169251450928e28de89ad1e1e86ac05c8853742e2ae49d5490d031a7a886aa7b1c666baecdae7c39ecbf82d5ad92ad43bb3d788404fc9f065b941a50c SHA512 a7a6a26aefb35bdd045ee60c1c53531985797d7e9c0365035253923b3382cc71b03ce1364a9ba7f6dc02c43440a7d721eef223b655855950f38df13eaa7bd7ce
-DIST firefox-110.0-hsb.xpi 588114 BLAKE2B 915bc6675e101232b22178c426fefb964838e22eefedfa412edd3bae362c4128aff43b5272fe69246b88c8be15f0cc8e95d702751e2065fb5ea21295ac3b7d00 SHA512 8e68cb9f8eb86e4a9d64f6f24ed4c9ff8eb5d2cf74bf28536c60eb5afbc57a9dab8a74286800bfed5aab051a6b9999eee32446b3c38327da3486365234f61a3e
-DIST firefox-110.0-hu.xpi 593285 BLAKE2B 9e92164a544c804d1b6e27de604f523abb372b561772d7e2a45ec553f32e5e3a59f69c9d6c64ee76cd14336ef4d0c7def2b6ae4ff1a5423710d0a514aff8ce1b SHA512 caf57941e3ac5e762e46c7bf66878a20336f84833d99cc099fa0c4353d16ae51ea691ba950f242ed470d1ee944c0272bf713c0905c151c1c2d7850c440b4c7a0
-DIST firefox-110.0-hy-AM.xpi 595634 BLAKE2B 6bc1452ad3bd5b2712f518bef45af0761fa8f2911e3612f35e66ccab57011d02324805e9812b26e38343720e6452019137a85a5b131d36ff8607c1f9bb3dd75c SHA512 c5ea392c4b26299ef4d275e7170086a0461f662cbd002c39b26aae2b646c5dfa36e021f8dbb317da22299fc23985d7a694f65dca7e7de4e5f86ca5999294d747
-DIST firefox-110.0-ia.xpi 556994 BLAKE2B 7a6ba1aae7e6731a532156df5f9d6eb97ecdce3d348a4d8d5c626c509243224694af7d53a87f447d70d7ac1393441a191da74823c617457db2cdaaa854492cdc SHA512 9b2fb33214356ad28860fe64abf8f559387d5acfab964318d7cdef848011768c6a86a831db45ad1fd6a217b328bc0c0f17fd0ebb7e59951769045c259236005d
-DIST firefox-110.0-id.xpi 553923 BLAKE2B d7254c5d9730ce142dbc7ce976111665681034a843fd2864984220d2f5bcdbc53e51bea4bb419ec964a2ccf764a7ef16cb5f9a42ff68c89feac729843bffe64b SHA512 0d16874ab4c7c45efc452f718c3477fe8b90f823c5386d0a5366873f6051a2831a90bd7e4117291343909d1c0a584138f12bcf2b464d8f975a14148e87ab2457
-DIST firefox-110.0-is.xpi 565689 BLAKE2B 68d217e933f5f77066b005a8300fdc671396f3b1434831a615ba580cf5074e3aba9825c87cbb6f0c06f35b77c5cbc39d307b31048ca9160d38404e2383302882 SHA512 5a2ca0542882bb972c1ec83c3d8463203ab7dd2dffcdf5f9233f5a3e89ecafcb508a920eaf145d4ddd0b515ed322869735ce5c485a92cc344564aaba92fae9cd
-DIST firefox-110.0-it.xpi 496397 BLAKE2B 1b1c19190b618aab93546934bc59862fbd7e1c0c52dd6f428d62caeb470e8be66ec8c07ff70576f9ed6823749ad868d131884795309778fa1fac6798bd9694d5 SHA512 8d24a64c78058f4cc1c198e5a42ef18ca3c2f68d4cc3cb7a5e0ccdbfa8699a48c792bf273e32a30a5fe60d3470b7ac5c15beb347fc3c373bcc39b1a56068f272
-DIST firefox-110.0-ja.xpi 618089 BLAKE2B c432fd7ef2ee4d3c08a8db96abb1ec4c298b9f0a88db7cd8dff9b1e260ffef0b4658f2bd42a77ca1625e40308394c311b6179bd42980d6dae5080139c037b0b3 SHA512 86c82daffd879986c031a5683c0660f6f4d6e6dbbd1d74f34928e8bb18b1ae3eb8da6b078df7689454051b21488e5345308e8d853eb630c4475d0f7e76ec10bc
-DIST firefox-110.0-ka.xpi 622407 BLAKE2B b0d570b5ff448d9b01d8bc7afad993d4c8abb2bf786d94cab8f38a4c13f6f5af015ee43a748ae5789f2a9c3005528085f75c9b1f90328464fc1368e90f9f1666 SHA512 8981ac78576c6266c6bd6e56b605b05e643c0407dcfe9e70fd028b22e0499948c0a33a49d2f71479a5fd5efde5824b3411e24b53381e6d41e466ee6ae333a381
-DIST firefox-110.0-kab.xpi 574108 BLAKE2B 6f27d4becbeda651c9246b57da3c4a1a3cab8015cde0b2b1bd072b696ddac568d683ab2ebc2144df1007db357ef7ac9ea288eed9df3e02036d522fb0b642307d SHA512 509d2b57a499cf6ff71a002880f5dddc155f13c1827f476c5300acb3bc9b708f732f306dea310f55c4102f948cfd13cedb4b6674a648c821eee5d497968974e8
-DIST firefox-110.0-kk.xpi 645400 BLAKE2B 5e4ffe1b00cae7d40cb151ac456d412c6260205823855b71dcfc0d1290cf3a08650cd70eae970be8bf38ff24dc961a3602437894fa90adffde0788ae775e1a33 SHA512 96093b80364383b146e4f007764a6e7297f6a682b9cb3d39648cfa4908fe8d0e078eb6509281b5d36ec9cbd240f1511196626e9afc2cc4140aa77ef6e723e13d
-DIST firefox-110.0-km.xpi 531028 BLAKE2B 02aa09b3f699a7d95225cd98cf41c25ebac9d7e03c3c8e07c5a897bd76e5eafb7818d60ac0e491e07497fa477ab136087ecfdbaaa585a7c19dbbb21030ab9669 SHA512 15bf9b089072e7e349d2af723c3c81d1221cd471a58850daeb8f4ccd02161d7a74dfeaf20774a5a2c19c8be14208d3cbd1c022f8689aac47aa0504aced1d3a4f
-DIST firefox-110.0-kn.xpi 496274 BLAKE2B 0adddf55f55398fb83389adc853fdcec452881e8aa47f5a5802050ed551d7f020d0baf14e632fe6d8e777fed9d273f71e2aaf43d7810893cc718857d042a1df4 SHA512 6eb2aac8a2c3b8f8ab40a4a74713b32f29adf5c91a92e8e78b7ce744844fd9b2dbb57c0c2bed3afecd3dfcbbbb788d01c7b655996a7d0fa074674bdb176a7c04
-DIST firefox-110.0-ko.xpi 605670 BLAKE2B 06dd5381632383512f800dd748855c64ce8dbf002e0ae4c927dda237fb37bb9fe8d448ca6281b09fa6eb7b7e4b92dfbd8c20467f5768dde2bc5354eeea23b936 SHA512 622868c5ca40b59cc840b0ca22299e591a222235a2a248fa9f7cea9250e380333b5999ceb5a1533a434e4a7a48dcb2eb7609f5b26ad09e6c19423a294c156f76
-DIST firefox-110.0-lij.xpi 471134 BLAKE2B 14931b1a928ac8e5dc018c1de89edd69403c64ecd1a9b132ea2f7ff377390bb3975d6bd00e5b362a5409cbf4c59ee5c29209d6a84d0769914b78f800a8e93347 SHA512 593b6800a2d2f61738642e456859709b046febee2a0f952bd4f37443182ba04647ea8b5bd1968dae885f4f1e877194730f20d2bc54f61f14c1cdace0db495342
-DIST firefox-110.0-lt.xpi 566265 BLAKE2B 579ef42efe8e0a55c5e791761d5f3aa912970a2b39e7e9af6f9a04339d4a52fe1c456b182300955b3437b62af88a17cf2e835b5413cf86a8eb2026dae4dcbb3f SHA512 ad75acd8f469177439693bf530cd196eb074726baddd47e9e34272ca1e61dd3d6f4c178a4f323b24deea720f652a38595aa29a90785c58de1af8caf9559c472c
-DIST firefox-110.0-lv.xpi 470789 BLAKE2B 3b3cc7e00c4e12614026fab54d4d7d8288bde83c0fa6acc91b4deb7f5f1fb407ff37637a132c4d0dd225f098a9824e82bf9b26e27e09a5d9df666a3b369fdb45 SHA512 66625b6480d07ec64fef67aec2b65dad4b6f95ba5e763d15debccb2069e624cdfc563927681239acd60b3aa290f589ef1fe27ce99c4add8de349d2e3a6fc1733
-DIST firefox-110.0-mk.xpi 484129 BLAKE2B 53fd9f68d04a380d5bd70c688a4e95100a56c267f3f06381c0b1d1945fb7123d61ef0b62e9cc30f47fb8eccc1c0292b702ccb12ac24197e2fbca09894d6eb072 SHA512 9836ab4f73715fb953d9d85834518fd562ad966de4a0a431d524c6e2c2f4546349f196018d95c63f1020053795c8c8530bf0245157029228353275a8b0daeaf0
-DIST firefox-110.0-mr.xpi 531174 BLAKE2B befe28c691c5d49a7b9bdeb770c7b72574feb63114e28ab68149615502c2a7bbbe4917c0d2391becf06b10b3b21df527f8927caddf6c879a68c7a1aa23802d53 SHA512 31ef73a40e9b48be592ab772fcbcbd72586afb37dc11cb663c11522ff49f76f050edb2ebd8a12cd0078fa9adbcd8740ad22b50dfc2f9540ef62c9de3fe6c4373
-DIST firefox-110.0-ms.xpi 450482 BLAKE2B 9b0392389b3fe2fe74e82c309474fe023fcb736e9ef4d5e1935dbd435b0b03c36d7a63a930eafc5127de30d6a5e134cda6dd81908a5f3a8fa643595990381807 SHA512 1c32b4ae9bd90749f5a7cd205c50dc4e5655c27ce9ef14f4b69ca23094c3d035dfa286ea89063411374c21c97eb0c61e4eb4b34ba91f6a8d2ea223422552631b
-DIST firefox-110.0-my.xpi 516589 BLAKE2B b61c4f3092b390c0f14973a851c9fd05bf62a889bf281bde606150d14d10252d9a9c170064c1acac5272eafd07e7e603d84a393ab8b144bc13d5e8201811686b SHA512 fc168f27f9b0f016cdf7d61489389f665a09386a2da10d585903028806a6f1d3303a78ce371bd9b468b90f9cf4e964b8f3188b30c7162cbe7297cad3dc170ac2
-DIST firefox-110.0-nb-NO.xpi 554917 BLAKE2B b18a4e4a753d87abf27fd059b2370d61b6c1532187b7c4ca601b79f434d2c0b9a835f7b75e591dbc6c738920d4f8bc20ae9f41842c85823da8c110422626cc1d SHA512 6a2604ac55899cd01ce454e89f9338e6c187d50195eec619252b69213958b9e96753e563b2b5e997e38141588e869cdf94a41b4534dea62e99248c502cf189e2
-DIST firefox-110.0-ne-NP.xpi 484686 BLAKE2B 0629d2861214f19bf73c6717926b01044121900e84e0acd4d576b7478607e2500c1e753029e2f1338d428396a9e3094cbdcb3dc30cee7c42e6355dcba06d54d8 SHA512 7b2582d6308bd5bd9947587c3e7f07378338117b3b335fb67e99dfc25c8853bba3bf60a9e4fcdbc214c898ab110e4db4073a249bf411ef7eb6f561885d9ec160
-DIST firefox-110.0-nl.xpi 562660 BLAKE2B 4b5fb38b7211d30fc6fc0a2677aa893841dc7afdc326bf3311ecdbd45f6d439b2dc926c9bc2917cbafc4bdc727281a112e7a154895cba91fd0a543d00b4d0f71 SHA512 a216fa4b955eeb7f52095aab2823a4b7572f65ad149b07135d2a3032de3499fc1ed9df789ab0d0d439b7d42f8cd1fc1681c1325a68175e9092d3a91925f753fa
-DIST firefox-110.0-nn-NO.xpi 556384 BLAKE2B 45479e8668707db783fc3ec771e0c1eb8d69f432a193eb2f4704b922f77c328de651e723595c4f65cea70d0b8ce2def9635f7c279bf0f19e72b1025e69a10d5d SHA512 4eca8d94c99ee46881368a18a3f0d6ea6d2859bc18ec1c448efcad7d822059b9c24927d3f6053045fbfb5a61c3c6b9959b4c8dff8a8fd3560ab485223ac4fdd6
-DIST firefox-110.0-oc.xpi 579331 BLAKE2B d9dccc80f1671f232004645e37eaf22b99b1d5677b374351db326523c59391decba8b73a45101dc6e198a9ea091c468d1830a6ba496edd25d30b620002bc75f0 SHA512 cc9c3c169c5dc628ca401b8c69142f471b6e4de893f1879782ceacc00af3754872084c0f20666fb81e01d4f2aebfe8b3fa8bf80dd42d2b72d116fc02fb27afdd
-DIST firefox-110.0-pa-IN.xpi 636181 BLAKE2B aa5873076ba838266e36075c07e0ede752d1c606f6dcfa903200ffe6ecf86bed753068b22f5fc7323045322822ad4d84f6c1df0c5979fd864167b8434cb6ab40 SHA512 df68e1085d7eeff7d07a9225a87830d7d0b5b25e46f58d5d07c43cd79aca55d33435a1f7eef5f11598077c7824c90ebe682a514fe05fd242f120dc8706a4ac14
-DIST firefox-110.0-pl.xpi 586002 BLAKE2B a34f1a32154efa6c60788ff0b2575a77ab1af5d3eb951de9cc16e7db67ed95ac2947e57c1e2a2321570363d789b9c4944cfc542a78d5ac304a8774bb66db7492 SHA512 d0e26248162c6e78686324886e2eb74e9c0c532a17647b89b924fe05c8ffe1810f57488d8bd5985773f020e7d30ac3be3a61de4e0f284617d6c85f028060c167
-DIST firefox-110.0-pt-BR.xpi 567190 BLAKE2B 756c4ba96e98977430df84b4234a5ae5e81c1d4bf4f4d0eb0d78734c483b1253a7d44d03eda63eb2a615b5def5a0e53971d47a7588203d1972a177e464888510 SHA512 5abd2d65020569f73dd4f6992d978ad47db88a4c34cbc0f4f5b045ee13762c212c8d83b51c324bf3b00a442a4b747fdf9386fe906cfb9b990de9df431d25c360
-DIST firefox-110.0-pt-PT.xpi 572576 BLAKE2B b879aa5203f4003da0402c855e03adcd2840f89ba4e8d1ce2ac0f904480d922b11cb397d077a3548b04ce5d70bd042f61bc67fa499f046d1cb7416823ed7a224 SHA512 0157a187e53bf91f8c286182320403d4ea544781818f65cad2c11ed4a226e43e0b276938c1788c37c85da587653302d52d2483410b60e7849e7284abf2585ec5
-DIST firefox-110.0-rm.xpi 560554 BLAKE2B 80cb1c3d4e74266d1a2441bd976fddec11ec08049bb2ee2e72523c688645e46b1f07748630407cd4760248e74d72a15332456411c82dd65f3719239dc349fe4b SHA512 40510103ec11577cc6645349c74f6124d5e1509594cea3dc627c0d0e26829e5917fce4e58ab3f43780db728183eae8dfc2fa18efb954e1810cb1bf5d350ad30a
-DIST firefox-110.0-ro.xpi 533699 BLAKE2B ebaa14f4536ee9463b7dde55191b6876430e83a185b16f2b7f4f727627581bb18e9e76dae378bb7083eca3e3b7e066881d9c8489c9feb89717ea978352c04f57 SHA512 8c15a0d44c06878e2d66bdfca4873e822fd90cc76550398139aabc984739e7028ae10f228e450eef111b2c10342cf9965dcbfa5ab0ed5fa8f3a7bd5f686c56f3
-DIST firefox-110.0-ru.xpi 657165 BLAKE2B fce5f4da630f5d7eea92c6cebf32225f774d335eeb0997e7c70ee4daea6b754811cf9edea4a3e4d99a16e68cca8be2fbd6ff23b6f9e24d168018f9913046c786 SHA512 1e78f73b9ee117b97b138bb9ed528fdb46c5a95a945e4f13c21b19fff822d1ddc3cd6c786d9f3c982e1063f7166e981a36fb635f19fc1e08f0d908094a308ccc
-DIST firefox-110.0-sco.xpi 505319 BLAKE2B ed099f2d726cd29e839c3254e0a577856a283bcda249cf77ccf07d8c489ac2e77b75621a03a879d29babaf9d3e7b0310f5e95822a7d879ea1149524ba8d33031 SHA512 4b6452e16a3e61d71bf8261049f114fe502c1894a71252aa125a1d72a07105bf6606c38c7700af1f6a2bfecd1833602c180d875c18efb4ac7f36c48a58130057
-DIST firefox-110.0-si.xpi 574128 BLAKE2B 45bdfbfaa48b91f206426dd435a67f684495dd59d4f5b0acfc9bc5e0be76d98995e8ebe65ef1c30a52af691bf281409dff1b92e59718ee643fd65472d9814b2a SHA512 e1dd3a00d641355d3329888d8408920e012d6ab804ac63a4dd6b72eb2a3b1a34181b35239143c0a85734d803901dbca3b1e8c2d97a0b9ed9e8e5d876c981b4c1
-DIST firefox-110.0-sk.xpi 593384 BLAKE2B dd90383719835bda107c557914a30b8728499111168cc34efd061b18b1db24bcf56d9527750a5e2d34bc0fc88dfe971830e56443afde3fecb8a8dc83e6e252c4 SHA512 9ee29a38da1b668ecf56990dfa36103206300cdb2f39718aa698b24bcb6218608045d76797f5ad2b60367e2577dcc2655f6d008ebd4a4109b27cbe46a719a491
-DIST firefox-110.0-sl.xpi 566383 BLAKE2B acd9b56190bd23c23188dca4e78c0618744a9133e7b72a51bb91776e2870d389d1c7eb0d848e78fe143a45ee25afc38100bcc852ffbf924f043434a3c1922013 SHA512 dade34435b74e7b0dc57d5259c5ae0be7cfc40819f091bd27049babec604336c58de8e3b92c289e211a986c7cbcdc32f9f198c0ce9f456017715ceb69903857e
-DIST firefox-110.0-son.xpi 422459 BLAKE2B 06429dfdd0cb765246050b9126a03eb68fd799f5b45d9ff572649818204010e35ea5b60b85bef8626cf85f5c5bcb358f3834e02a07255585ca719ce1d4fcca7b SHA512 01c4f1bfaea5a2d3347fa4e41e9fe48a2cfb60a373308ffa229d317508cc6098cb34e0771db9baef81f70bf79bbca356f21cc94800d4357fe44b6cfaf0961630
-DIST firefox-110.0-sq.xpi 581630 BLAKE2B 44251912393f6db9da34f4a77057c47bc3474253aa11c619689cb46d7735eeed550ac787757118060b1b8ae8bf0358299193bd2bd4d1c7f84f55180cc92ca65d SHA512 951191be18300729014e07171a3ea10a205d7092c5f05de6fd8ce219c1c5b5d960a74247138387ceea766776cd48070dcbaf325fc9e543148967016d4063f57a
-DIST firefox-110.0-sr.xpi 621091 BLAKE2B 059e4fbce708f53ac97f32ff812cb914ec4dc03ea96cdbe0382af368f0471e8ba55ddd6189ad4f9ee70314e21edafb4a256ef22d9c1fb75e9968f7f473bce043 SHA512 e56ad7ea8b2c73950e9a60555e3957e4bc0b8c6327af7e91ac7e9cb464e83fdde244f98cc39deced84e543496f4a003448df4fbc7c84584b760b5f829260778c
-DIST firefox-110.0-sv-SE.xpi 566320 BLAKE2B b2153a8ccdefaef91303226371c19d541e161d5f7007d6243eb36c0351b29da96ad706008bd604fc36d6649d641b0b5fd891d4f78d2d3d8ba3dcce1456efa48f SHA512 b3909a001a6c8bf3c0afc8551fffacf252b2c66defc5db7ed90e7ef59391378d3716c45d5fb3ee82c6c23ca766a43ce8c3b4e29667e824b627cb7a03fa759e1c
-DIST firefox-110.0-szl.xpi 518015 BLAKE2B 1d792f957eae4b6e8546565203fef42af1f4fa65655dd99d1676e7227970dec5f55032a127a22891825cefaa894c923ef0c98e621de9df4a8d3c55646762eaca SHA512 972fc4f47f7e25f5916001876341114a592d9b79067dea45a5b3862063c99fce6842dbd1008d3bd1b080e4f73215248e1b8107d8a96ba1a9fc9e7d5aa0edf277
-DIST firefox-110.0-ta.xpi 508561 BLAKE2B 19e1d1149723dc6c95116a53e680558bacefcd05cd9f54854472c40d8f1945bd1a696b4d43ca266afb7e500f2eeb34af95ffe87bff48c4a9e1b6f2f058f97703 SHA512 eff8a1589116f2a25596c978e4ee3b4e9a3210c300afce7d89a02577ab55586290af7904bc0ee61e25a80946e088a95f9599182cf94185b58e6cc6146a6f8041
-DIST firefox-110.0-te.xpi 556278 BLAKE2B 1913398c2040703c1e67500a670f07c6782b6ac24955ccb2c0ea9d36f83d5630e940a00df7c44f200564881c535bbb3293e76c2cbe6a984eb708675b4e85d040 SHA512 65e2ae14f586f62335dbd9dbf9154db263c0072f4fff83bdb817439ca369a4a88b58ecd5c1fdf9e45f550d9e9e5251714df60d2e466529d180ab3250664f1353
-DIST firefox-110.0-th.xpi 636762 BLAKE2B 1d10e91150cb7d1855c0d3f9549c0749a817588fb315da6eb8d67a8a3489cad3537c5f020b7177a8da50b8bef284c2c531056d623ac101db15e1816af26b4520 SHA512 2e5f32659f2315438c3a9fe8937660acac03d9a8f6a38aa2041609b4332e331236f27154a1a059d57ac3db138b80c5818ae1d51986a8cd6c5d8364962b73c89b
-DIST firefox-110.0-tl.xpi 523706 BLAKE2B a5196d21433927862cd2a0b6588f4c7205f2dba7587a3a22e5fc039525686ea446ec058cd4883e1e0928479c8a4c5136c3a9051eaca5cf7c7c506d2ccdb62c11 SHA512 9e535e9a6dc4848ea18a8b491230206b00415582c3e95a2528a49d1206b248a32951c34a34921aad2935579c48f0406041bb3bc2b90ba21e4616930111ea9386
-DIST firefox-110.0-tr.xpi 577877 BLAKE2B 4839c6306a862dc2a763d36ee5f61b06fe100478391702139b23468979908efcf48d8428fe3730d435e022962afee602ea6f0d7f4b907b9e14dd40f8636a266f SHA512 7a2d12da7495cb5b66309e148749c5383de0cdb310bd0af08ec606a6250306e8d11568bb02f229e11898281918f9463e282494f08c36af1d7016035b920f5d0e
-DIST firefox-110.0-trs.xpi 487275 BLAKE2B f5a3e419fda8219b80cab13ddb3fe0a65b2a406b634421a6e1471e2a52f42a1be97c46d9e2f8b33a4a7b311097f9f181c24a90ef52ba4a0778e97d5cfee3b0cb SHA512 ed6165deef4012e656f1b51dc1345950c6adaccd67c89313252b2e831389ee8cf9bb52dd480fcfbd947fea2e8888bc903ec3f2e8a4e2ec91497029c94928fdea
-DIST firefox-110.0-uk.xpi 650249 BLAKE2B 3052ee1d78d32d6582bce51704046c042d6aaad2f74f5a7f972020876c183352fd167e4d29b01f47c600db8b1ba62714a8cdeb6db62bcb93fda0aa2335fa3990 SHA512 20b618f26b14ad85163a479b8f4c4acbb54b811132393bc673c9ad622870cd2d2086743f9fed4a434e215bbb64ede547ac29056e98f0313f1b4e0a374c85f5de
-DIST firefox-110.0-ur.xpi 558068 BLAKE2B e2cfb6e0e808cad232d757d6fcaa9e963a94a431ee1bf6ed94910fbdbc509288fc00b12059800aa51347d544166a3a15291e16a820f8b74b9bdcafdc339619eb SHA512 6b2729802f8c6e9026b05ee6bfcef4642055dba9f00e7f01ab2ad59070466efd3fb90d927de90b2150b0da658180a89b73e50e40b6cc6acfe4f7248b2c86f4a3
-DIST firefox-110.0-uz.xpi 478753 BLAKE2B 5b41080753c51f446982b5cc3d44a65ae05661a53eb1671b34ab9f13d06cebad37d281f4f842b4eccb1f6cd846ac3360862c3d86a3e0fec8402aff54b194c14a SHA512 e8d14efa69dd6e584b6e58fd459cd48536524a863e6178925b7e2301e282614e16ed77edaacb5c7adf8bb60a8031cd50b11921fd98f3a3b649abb66e12f2e154
-DIST firefox-110.0-vi.xpi 600468 BLAKE2B 0e43fb4c8c3058754f29bbe1ee086247c6a66eeff07f2cf18db5802187d3ad324d34ef75699b8bb3708e2b32b45bc079b1452ea3cc77adcc83e43f78515e1900 SHA512 478b09fe0fbdf4dafe6eda7c845d0765586cfaf1761d899f799d5ed6100ae2b166c3cc757724e7b0424531ec3501a1e8eeb8599359a2ec722813179b43fb1fb8
-DIST firefox-110.0-xh.xpi 416885 BLAKE2B e04de3e3f8dfdd2479af336d7ee0159d60b4c1684a56715012b9e94a813bb99ef40a5600f366b2994a7219bbfeb8610da2e049491fe422900e85a2e06bdeb45a SHA512 336575462198c4800bc39508ba2cddab314c22265ec423e6155df0061b45daad3ba07671109a95a76602393e2b5da473029e671d21beb417dfec188e1fb391ca
-DIST firefox-110.0-zh-CN.xpi 599820 BLAKE2B e883807740ae15d8fbafb5858e65ebf2053b032032444362cf3222dfda4e7893c0f0f12c5a1748b510953226d95df3a7f21889a61fa1f43e7c56560412d9e53f SHA512 324d8a3834ce9ecac7fcf7af4a8db5be221c2a6d4731822cf3c54ecb3ca7dc398ea8288f365c7cf8f8233bfe714c3c232c4e8d01d3b2b705cd5c726304d0a817
-DIST firefox-110.0-zh-TW.xpi 602195 BLAKE2B a6d1fec05b52131642b7d4a1cb7988e64bcaf398b813bf86c3a2adc170ec350e27b1ddf1d0b7a4e5fc1a5d2b139dc63d65dc9f48e7ebdeaebb451883ce456932 SHA512 201892c437d07daec97365c4b51e1e686677ffc25965537e4fbe4764e9ad5f04029d557cfb1173c110b230979f4708fe6d0ad43b70517aa56a6fd95b7d72c673
-DIST firefox-110.0.source.tar.xz 499042592 BLAKE2B aae3b34f1642ddab5f0fcd104b4168c9d9856a1bbbc197ff3c8e1bbae0c8d1c033db6e974e10b5352f4457e890c50f1f9d5099a6b7200c3474b71ac7e6317113 SHA512 52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9
+DIST firefox-110.0.1-ach.xpi 457762 BLAKE2B fda32f74826c349f71e65e0104394379ed44cf2cd08912e3cf8cb09c0b4741ad4bb085cb3682e38c443c523454909b6dbe82f133063efe14e7d720099a95ebc4 SHA512 906002d4303a2e2b4590aaa317dfd8d895a04e2740e08e9004000f75396a202f6b3ebe0e7d380a30dc6aef86c0240ca0b03afc3657a1aea698341fa27ee746e8
+DIST firefox-110.0.1-af.xpi 418315 BLAKE2B f941f4f8dffd6f40309d1baf249cd297ca0e6b45db0d114aebae7ae11cf5f5be51f13564a34e4e73bc609fcc65b65d55530cd4f0189b9a698c3f62290efb565b SHA512 42896c8925978cdab3b0c920b3984f90db1c7ee3a24308327e462ab7220b6b444f142c017c9bbd86d87e744a560e3a734e3dbc5b2062835975f1495005d9e92c
+DIST firefox-110.0.1-an.xpi 501245 BLAKE2B dfc3a04334120a635bf8d4e780fa2fcd0ef754e1f6f041f78cb120558c04a9394a922aab00f7a3553d916cfd5208f35eb46cd4cdff1379c3116dccace508e6a5 SHA512 4a73803d2a3c45f72d80cdf8ded4fbdb92619a72ddfef01aff67aa7e173dca8cce6f6cf8254012e91d4c40be5fa0fccfba1465c7720f6092881bc6e7c02f7493
+DIST firefox-110.0.1-ar.xpi 568249 BLAKE2B 6a73a37b2ea4e06a7527896b91779ed28de2e6d577263a234d29d3e5ff2faa58445ad163c6c8b8b2d12cb94b6ffae2089e1c538d78e9991e6414eb2080a9d260 SHA512 e70c4f2784efed74c0d23bea0ab69dd6dad04ea312f63c6629f6e52de3c4432943fc4dc616e91f54856ede766ab36e50ff02fa328cea800d6789c3a7a83706bf
+DIST firefox-110.0.1-ast.xpi 487472 BLAKE2B 35b1baf84ce3ccda479ee7134c7bebac7b661ec8b2e29d86fe72a84378b5d84aa91db06ede4f77966d8d8d98a1ee36de461cf1b098b94a59a3433bc55e5780a4 SHA512 a3cf5081331b33eb0d72ce3850600a2ae65f662ed8ca3366a43fec320807462d7c238be821eedc0d773d94d2f3330e7e326da3d59e51d3ea0e852b009e7abfad
+DIST firefox-110.0.1-az.xpi 490047 BLAKE2B 248be1d5983d5893372edfd88469fa78f7682a0af81995b43a7a80ce1909d6ca4265abe06feb8490e771465ef10df7c328eb5d2a267b4f24e918962f27c87047 SHA512 f4a3a6f7f639cc15d9693d61b690a436a8f9905205e7f1163df2a2fc4c8a554cb4b2e17f65901765b61c97003dd0b51da28e0531797487d2c344967811ec3b01
+DIST firefox-110.0.1-be.xpi 652589 BLAKE2B 7e24ef23bae7dd17019d0eb26bc5155c2640ca8cb0e444172615bfaf4094edd1a3621bb4c7087dc876f2fc7a7a87fc11bf0f04ede7d2c19380b73362d65acc27 SHA512 d99866a721b7cfe617fc67aeccd46c267e933d90c04f8ea5093ced0594d4612a73af7e6df2ba5edc2d5597224cbfc13c8e1e25963ac7a90bcd949611804392ea
+DIST firefox-110.0.1-bg.xpi 580006 BLAKE2B 93a7955fcf8a82befa1e63d953d0ffa96455b424b242ae9871679c924dc66064fe408707571afc841d3d8e9d3e6cc7e8e9bfaef3329a1d08720075418e49121c SHA512 79b448eed896d30bb8f2e5fb9d5384c6d1f9d7c5b266a3ec42634ace5ac6a1b8bd0daafce9c2bc04ccf742185fe8f2747e330c426b97e76020211ec8b398ea7f
+DIST firefox-110.0.1-bn.xpi 579351 BLAKE2B ea2de565b3fdafbea385bb83bd2c05f85cde88b0672bcb227fe38edeb5d4e4d6bcdc7db246ec454df19dde0f71a00be6556470fd74fd1e0986b4c6d8759fca1d SHA512 e0209b1bd84c68466b1bd19aa6302284b1afb219653ecee738dbf1b3e958fce6a0571029a4e1fbd3a02d293e556156ec93ab25a4035a361976c44b60dfde6d65
+DIST firefox-110.0.1-br.xpi 546492 BLAKE2B 7a77d5f87ed80e9147fdb267cd5d895867e8b771b3434b46c8ec9aca5017f9f70bfd8f95dbe54b2c89866602a0bb7247ea0be70752ecf831bdeabf501ed72385 SHA512 01d9177ffcfcfe5c97292dbf37fd26b48a3766385984d99d7c7517b708544849070e5109bf4b76163a27b2930d490bc7de84e1986568de6f9932a2d6441d809c
+DIST firefox-110.0.1-bs.xpi 461738 BLAKE2B 3f8c995d9110a1c64df610a390180bfc61bcd10e76ae482e12479e5260053614a484d8b0c059a3914e839dd3f0364df7db20f2fbb256e7ef1b065517178a0c56 SHA512 484be8a4e21f1c96ecef82c498b99275c106f2ff0360a73636979822533d7de69b344c074871fb34c512480bf9520641d1f93073c65a4047e1b9543585f767e7
+DIST firefox-110.0.1-ca-valencia.xpi 540143 BLAKE2B 07d29d002e31af30b92a1ba351c27164a7b3d2d04d7b3108b8b82498cd83bb3b0bda0ef2ed3a58c2d58781ecb19fba19abe5365bc49605e83c695dc400cdff76 SHA512 e6e83a71c198f7c7a9bf6243c0bcfc41d00afd546090da7a0db56037c872744b590845e2c925c80a09612f0f0e6488105aac3dbf266c593a84e083b0d9e1b733
+DIST firefox-110.0.1-ca.xpi 554782 BLAKE2B 993174fa389a61f3928a1f7ab3d85ebf4262973d0a02b30e3c8212ea874e96a0258cf6a93c24c0676c27b818704e98abb1c431810f59f17da06ee8a3e85583d0 SHA512 f2c67e989a845cf6de2ee15034c10400f8ed29f7cce1428ad5a8f3225e99dca098947717612bc5903dc5cad766252895e2062b98e4d38c3107c934cf2e249d65
+DIST firefox-110.0.1-cak.xpi 555439 BLAKE2B 39321c170a54f9f9c9b2ccc4f593b202f36b3f77034e3f0daddc0fc4eef4450c8bf6bbd003b5380dfa4a95c019c4770137b5ae754c380ff4ce23e5d66797980f SHA512 26cc556ef9f8cb71c8b4b586841cc1a995305e40484575179868b28f970a58f073b931f427aab1987787de166ecda13446b73f1f9718be58e60c1f808a304639
+DIST firefox-110.0.1-cs.xpi 591256 BLAKE2B 9ce58a740280b1d558572cf80d7b4a0acba0ed40724f05f77339ee82e63b4408d0585c22f04f7f4c8c70cd13d7411602682b63570078c8a72c71525c4f78a4f6 SHA512 d876df2b729642c802654800f078d4468559337c06519eda42d09094a21cf36fa47f86fa9136b38d25dba88cb5932e1009d5e6bd9d233b29e05131741c27fbef
+DIST firefox-110.0.1-cy.xpi 567860 BLAKE2B 43ff3c283b99da68a1da1d4da5a9ba79f964667fef0bcbb1fbbabf3d8249151cab9dadd699b6d00d71ec7a811074aeee800313625aaaf807d439cc2fe7a79b05 SHA512 1730660ce7cbac77c2678e1e41c5803cfd7b65d8e1c9ad2daa3f3e2f99ee2407d131832774a24b1a42903bd9e527f45c7bd91836ede42f1384d625d24b8f5013
+DIST firefox-110.0.1-da.xpi 558098 BLAKE2B a86eb8a832b7845337bf16ccb912338f2c6a8095df87a9c5da460709162224c9e95112e1535b29078c121f5bb5f81f7921be1607efab092fedfdddb95200454f SHA512 4e7b08422062cbe0c5fec98ed2891350ecb112193a580131e1ec5db0acd3415135c3621ba380a2d8cdafbcb57336599882c98325c1756d5d97df63b5e00014c7
+DIST firefox-110.0.1-de.xpi 578967 BLAKE2B 150502ce8379c5d3984abb0a10b8e01d3880332999198f2f4ff24ea94e52fdd405f0e92b006d8b237e61161c52dce2260f8cfd2771ff1b19b10ab255e47af8f1 SHA512 2b8d1297c7501591f0892b82b28796df12c5503728071f2009a946f4377ba45d17dbd9b96b2c69c448fc372f8653500b1199d01eba937b5584dfe23c75392801
+DIST firefox-110.0.1-dsb.xpi 589305 BLAKE2B d13ecdaabcff9c2d0512cfd661307334363c973ffaa3dae0fdbfe7f135cc54502a442388930adc6e0ed6efc749d71bbf64ccd698c4a922fdd4bf648581f72c6f SHA512 d2a59f6d7f378f6fb90dc4fee0f5ae54011d4b203cda9a5a3f31c479e6af78e61739934667ecfa0b5fb4c2c95d7d302df10ee793a3acc8eca928365b922bf483
+DIST firefox-110.0.1-el.xpi 667175 BLAKE2B e67d7c7ce81fdf6d6a3148caf78fd656f6dca4da13f394e1bf698c6b21f58123e984b771d2a4d58b2c58d762d7fe5f8f3557408cf3f09599244bb67c3186b971 SHA512 4df5453baa25f405a181239b53884a6832df441bbaa4074466f7f2ed794639f1bf586f435cb0493f008b60ec6448e9a8328d0c8a64649600b5d9f70866bf1171
+DIST firefox-110.0.1-en-CA.xpi 531661 BLAKE2B 79101ddb54ebdabfd73b5def3475f58e6bb95221f641c459ecd2577c09ba24fc8405fde7175b6e04ba4e003fa6f86d098735a8c9ebc9ea23226f9abd3cc123e6 SHA512 0f55c7bb763e50a78b5b79ceac09e2bba33f76b1da2b4ca832cd575070fa7f604eeb3a51cbcefddbe98809911afc8be7146ff8347ed64f3e07c5080bfab055e1
+DIST firefox-110.0.1-en-GB.xpi 535373 BLAKE2B 185027bd208518e8cd83810eb4ff62f122d012a9307882664a99d148d56f656a73d32e5337e46ea9ec357ec965843d8c0ca008f5c7ad8492b55d924bf587ba29 SHA512 3a20306c6642052f89011f41940216cff1019e3f5a1db0e365d0d20b9fcb22b0fe310b080c16b6a2b4f392cc8da008009b226fa9f717c19de10920e8d4b38cd2
+DIST firefox-110.0.1-eo.xpi 560361 BLAKE2B 8fd238057a0c7130f89f1a00eec3887ebde1f44b2570c2cefa74660d7f31036046375feec0322f1c5f41d6059dd38285230e75fa80cdad067863887f6c880776 SHA512 1d8f7f247705cde60d3f06f1c3cc5b9f03310c570c0daf53b663122878dfdc6d3775d29003f90ebe3c87c0122d97876402ee8054dc756f626adc4f97ddd4fec2
+DIST firefox-110.0.1-es-AR.xpi 573024 BLAKE2B 4f949a9109f969ddcfe629f5e000dbf5cffd4780583dfb22f92068c1395632c3c325bba4b9cb90e3a39223cf68529f88537fe7209b50a84f3d1dc9e5b3d1050d SHA512 a0df270daace758b7ef6ab213c12bb9d83aee48a7273d72c5d71ae7b3ad4f155dc918e732f5cc26ce6fc7c05db5f434d2b9c68b1bde057697c31004cdffc3393
+DIST firefox-110.0.1-es-CL.xpi 572237 BLAKE2B 1aa7a0b37e51907acc24ef75ccd08af0ff58d2b033bb73050cc37077fda4e2998b1eb36b903d38a8a4cd4285ef85d9e3e91db80de03c2db5d60d6d25c2185b9e SHA512 e5bea09eb21f767be59c9d28eaea19423798189618c5a0301fed8577cbca715d86183c1b4545acf32c486027e70c0932fb0238f014f888ea271d5b5fdc7a83c6
+DIST firefox-110.0.1-es-ES.xpi 566006 BLAKE2B b23ab5735bd9913e8312955339b308eaabae13edb1882671129cb9e05f79cc0d1934b6bdb5e1331a3e1d2eace87a0142c5ba7f556957c23f0e0449eb6444a7fb SHA512 9ef79e41a0ab1f642e6e3fd1242dde69e62d2949dd1406b3b6f4461a966924e33911502e2c61914c155dafe867aa443116585c6248f87fc380f21465ba88fd03
+DIST firefox-110.0.1-es-MX.xpi 575385 BLAKE2B 45debea3205ed98a5ac31a68d644fe9d9ada17b324d0aab0adaea4df1c5c5e4cbf68bbdcad7ae56c4ad5336b9dc9466c530c0bdd8e94821136680910f0a8b767 SHA512 bc18cf218ebb7f47fb82971380a7eeb45bda0a6535635965a53da5849d73edecc827fa4c7bc6c23b32056d63868693d12ea19cd693d31ac344ae26d22389622b
+DIST firefox-110.0.1-et.xpi 534629 BLAKE2B 23144d9df4f55a6a554bb72410ff9636a9174ce47f6026469a9de69c8f5304f1e8cb67e5a654ef320abf68e7350092ad12bd6bc27cde2ca77c6e039dfd4622e9 SHA512 caea76c1bb6c15f6964dbca87874a5f3e4679a43bb63a91434a6e8c8268926a1c3d9dc652dae6ef0c783e54a611a38dcc69cefe6ed068793903d12afe1464c12
+DIST firefox-110.0.1-eu.xpi 561985 BLAKE2B d81c9a2eda8c6481984c273c8d2cb067d4e7dbe52906265f2448fe416ddc33bd3ed98561443f5a9eae074fbe86b2d6142f1a975d3527c863bc6685ed8d6e4a21 SHA512 03482ca0c9f429aeafdf1a3e7eef88afe29f07b7d2d6aa8c2c3b6d95aad33cd853fdc4d35c8b29d739f9f51e72c6c8a56e74a9a91509238abba604daf48fe276
+DIST firefox-110.0.1-fa.xpi 571856 BLAKE2B c2d276fb4cddf1ed6e7685c5b32bec0ea2f17476d2a9b14ffaadc4b5135298b483631d37fcb3971635620178481686208220cb77319f64d65b809e8110243ca0 SHA512 112a68b654c4e0c045d2c92ca175b55af54c85cb7b05a0309633b99b0d0e09ca8da88ebad5bda149276297104351f8dc351ed177aba9878d03348617038431d9
+DIST firefox-110.0.1-ff.xpi 474140 BLAKE2B c4939880aa82cdc102402aed327c6bfbd56f5e08f92c642a4bf98f1b7c70bab879e237276b26bc349d97001afb6db6eb67ca535db4e4d21dcf3e51cdd1a953f2 SHA512 e7fe318145196c9598e0cb1e3ee3cd1536b5b56d90988bf1ba7f11863fe01f1e5f0afb5e35f5e534a1420a3aa11faf508af2ec6f01fe01386767c1b2b89b36e5
+DIST firefox-110.0.1-fi.xpi 557015 BLAKE2B 21debc9177df1267fc60c182e6d58cf4683de888dddbaa5f2ae3f5c4003b37b19c3364c95f4df766d7e34ef0e3aa127bdc63b59576601e6a0721dbb3757988b1 SHA512 c17b1326a0c692b7b65c6aee3bb1c0a08c0ab80cb90196c5be2cf88ce0c0e002e17e2d83e894bfe20d1393849ea0120eb73974c0086492c091a871fe50154f8d
+DIST firefox-110.0.1-fr.xpi 584582 BLAKE2B 2fa49279be90c5c92855105947314bf9b178eb858ca29e27772783727d101b134f349ce3aa816ff056391191cf19d18dd1e5485add5b148f144f0a08f627bad0 SHA512 7a6ae285cd757e16019e4071e5d289150258a6bb3825ad1e499b111dd0f2609d24554994e5e94ac6a467c9169e5c9a0e62625af88877732b60a8c14c3e1f7ca7
+DIST firefox-110.0.1-fy-NL.xpi 568580 BLAKE2B b66dfc23eda3c4aebf779aaa307e8be5a4959aaa58ccb6915d8deabb9aabc51332438e2d6f223eb800ebe5acb7835e20337af39ec7a956db3fa789ddf8184cbc SHA512 1fae0fe2164f73ac101239cfcddcc8aaaf278c0b2d5468fc0ceb97cf2e42024410d18e8ad5c5e7d35f28bd768b69e0d2ff5b93d0921ac400def2adffd0702df2
+DIST firefox-110.0.1-ga-IE.xpi 470626 BLAKE2B 0fc0b038a16cad527c9b33a7e4e3854b0c8385f8770f6ab504e36c7a61b914b51488ad8b5093d048f9f4a6fa55860fa8973c4b92b0dc42123cf7ab0a054bec40 SHA512 f4d75ecf9a1b1058e92e1c60067f0b7615f17259955b219b63c5ba56504657b3bab24b67cbe2fc68a8071a4f367a7e5fb403f99b081068829c15061c327a10d4
+DIST firefox-110.0.1-gd.xpi 548688 BLAKE2B ec41a0892ce0d250767a755e6d652c6639452932c3f52ebc229c6e7f597344457a6893e0b71511d44a32f76bf08e76ad421fecc708fdc4efdcdc93dc9ef439a6 SHA512 eb2daba1782e9d1013b46a64393f50db14a8c29d6592945e451686aa849a55291105f398af8b04aba5c9752d3e7a65d1338233ca6f060690f4622a3e729997bb
+DIST firefox-110.0.1-gl.xpi 543500 BLAKE2B 26ae2d3ee8dc69b0c5414dcf157148b2f4a3935d7ae9d6b4c8cf046f9c0d76941edabe9e2681a96e12bc5dee480119d656d1a2720361ceec52d7804ce835fc33 SHA512 7a28bcfd6854312900e0b2ae92184c3f80671ed3293a33b6045f2837702a3fde5087432a07f2ac9a4cac902a773928a1aaa5a73d8d66e9b53c0e27ba286227b5
+DIST firefox-110.0.1-gn.xpi 583840 BLAKE2B b9257807061bdeae91838a66371e4b38f0060062990332b1232d322277eb2129776395fbc0e47fb6440d45857afaab6c83f4ffb8509f19a016781ef37af5ef28 SHA512 2fee9be639ab7e81abe4483f2eebd7717f1360ad4625da37ab99e1964f82371629e687fcd691bbb316b3999b627e4e26f239cecf98723dcd74c7ebbddcd9a196
+DIST firefox-110.0.1-gu-IN.xpi 528996 BLAKE2B 63bd913283290097d6281eda373f61c40e7b00bcf99bb5811c7bf5b4403aa895888b826c75d37f65220316c59bef4f227f3925ee3344f6284578affb73971e19 SHA512 f6a35580a77fce17045535245f5da1154067a6b3c6fb6557558cd7b867bf9d45d882fd37993eff21f167080bfcce54ff90c3facfeeea4f872dfb8b180eb66ee1
+DIST firefox-110.0.1-he.xpi 578901 BLAKE2B 480127e6f98e1ed0d40ac52146ddbb08253943c6a1c7924e287c96915170a27abf3b628d6f9cf83bef571c6a18153bcb6ff028de23676db8770da8f0fbec328a SHA512 058a67411ceb24a2de63bf1458d8bb0e4a89346c13672404094490758b0c86b22ad576a14626089af38a6e6c64918fe7ee5835ff18395dbc56a3ce5ea0f9dd95
+DIST firefox-110.0.1-hi-IN.xpi 557876 BLAKE2B a1a614751a71fffe649606dbb90510dbd7ddda4287c9b2f34ec04202e450859bc0fbcb198e9e4f25f3f6a8dae2487a8dcc0128bff5bc1aa90e5e9656ec1b15f8 SHA512 c14df5b22cb301ebbe0583fb1867036b3389b3596482dde955a67bf6ed725a7eb2ef82a60be4fb434e5dff3c0658c5bf3d172a06e723ea3b9cb255aa148b38a4
+DIST firefox-110.0.1-hr.xpi 547286 BLAKE2B d4c51fdefdf635321152242f1ed46c5879e9a5d79df5571dd1720fbfa9b3461180bfe7ff15194985524144658d3e8c6fe3617b9b1d8793d08bb06369fdfe3c18 SHA512 9b7197ae615b0c8ed445366a41b113e058875908fe700c4cf1d4dc3aeb5f8429266722502d05c6a881a4c4c45ef9b52c769b7f9f4bb752cd1910f87594fe01b3
+DIST firefox-110.0.1-hsb.xpi 588111 BLAKE2B f828f6f13f5c3aa46c3467ba43ef57d59285515498702b482554e4c914736e95b2a210cd50e63f347547c11d94919c99ea39274e0f211f1dbd6e12574b69ca1d SHA512 308a7c8298277bc50fa96f9e7c3bf20a2d84bf4c0ef0c034220b0ca46615ebcfdd8c60e8aca828bbbe6c11844639b4cc6936f8b16fed2b5dc847c176f1d2592c
+DIST firefox-110.0.1-hu.xpi 593294 BLAKE2B f10152c37ef61b368f57aa2356b79eacb635b6b229ccf1c903243071d0c54042d374bd0aabd064d96fe06a9852047cd1d70622718f99b619924ae0df4c065245 SHA512 28dce369da1479f41212dce5e8e93b6baba8d921d50a8babe1f82b7c226948e38ee2541ae3a6bb101e27a4c2488fc9228148435412fd395fbffd60fc476cf58c
+DIST firefox-110.0.1-hy-AM.xpi 595642 BLAKE2B 45a8c0f0629f1fb9073d1bb25e6863412a1641cbb54c11a60234c38e2251a646598151f53c69f97bd9c4bdbf16f2abcdf114f703cc6eb10d546504152fb3ebfa SHA512 656141bc35d571ba62af6f68de5325f88d2229120c9b2537e2ef9250a9188549180a0ebdf9f15a8b55357f7477b9322117c868dae2ceb743b6d014a262e96e2e
+DIST firefox-110.0.1-ia.xpi 557000 BLAKE2B d99fe7b87e97652cd799fd5f54e4d05b997f7b71bef2a01ce133d88d0b63526dbc416e405975b16bc9735789cdb393b7569bb0952337ed0e14e8a38190bdb58b SHA512 037ab2b66116c1a3aef5d8ccc2b3d35a2fddf52a9fb9d5de0968b30797c60edfa6cfe8d5c2ebfc7664dfea4bacfd1d8a77c8f3a677ae812ea0febaef2c3741ab
+DIST firefox-110.0.1-id.xpi 553925 BLAKE2B 4ecf68d7b51185466ae3e0d17b6f6444bcbfa79dd4416bab395418754bd386794feac352d94dd863528cd780afffbd19f08b06b0fc63837707ea58ac99eab550 SHA512 a7fc0e1217fc9b87dfaa9f61d069dc7814b0cf21e7b3c13e2c27eb00fb13aeea166029e3b5a1df268598a1c29322aa3520a8e4fe87d9223ce645300e060c5510
+DIST firefox-110.0.1-is.xpi 565678 BLAKE2B 9d61eb7a948cd5db62522e22d06544f245ba0756f0c976e039dd25d81c4b7c7860eff715701c964b523c51d87d0adb4125099f195e0330580b494b196f965582 SHA512 2b3fa4888b73153f8cf54ca2774180d2599feb873ec27583dd40b74977f5c4f21125dd08fb78f4d9a3376bc7b1a4f61dad57459be689b630e23dd34a9e742538
+DIST firefox-110.0.1-it.xpi 496389 BLAKE2B 9e6c166f9a5c593e60b5a412c65fdc406e3503defaee645ff95f309b36a0aca0e3c04e2f673d8ec939ab403a8b58120cffa6d29bc2343f43d101394b20546c5c SHA512 2ff0b85ace287f441c9555eee687d4615914015227596a25deef732bfe28b671bcc6708b24d80bdf76f9746474ba22185a182feb2c785e112142774ed8b5a7c9
+DIST firefox-110.0.1-ja.xpi 618099 BLAKE2B 22c984eb82c5c60eb8ba73e180d2e49dafcf2f2e2d43fd8225210ac6b6fbc4c3795fc9c7b3309feb9fb0fd3b63d9c6082874cab76a32647db7283d19516cbc4f SHA512 fb4f9d8d160858cb41689c068440f4d92512d88abb89552f9b86d6f3099f195106ffbcc79394932ed35736384baaba91e0b85c28b976e794488ac17f433cdbb2
+DIST firefox-110.0.1-ka.xpi 622398 BLAKE2B b994485b789599845081f988a00757337346c756ac668a6725a105b568d27d6b7e91f2b30020630b7276a01a12acb4e8ef30f3ea3a2e20c70ea9b1ce0939559c SHA512 dedd48f2c112bc91c33f2c7e7a2c37dfe8aeaa4c518fb4c70fe943fd894d4910aa8707ce04ab85313594232a3ea88d5fd5903873832db898465a8fe976f3b006
+DIST firefox-110.0.1-kab.xpi 574109 BLAKE2B ddd6c900391ea990214a9519fec1ce5bf3d7cc53fa2c911b2381981bdd150c36730c24dab33f020943e6beb29d81d2b3db6c0bf6ac855792cb3912583c5dc1b3 SHA512 17f785a4f17f00e9533d80ee555f93587a01f3325cdf7d59030aaacccad20a3749089c927d7ceec1a97c518393949c00f451b13e6b82f94a2caf2d58969bf1dc
+DIST firefox-110.0.1-kk.xpi 645408 BLAKE2B 19fe16e808d1c56c986e287d81132609319225f3632668d35ad0b962542485afef898d4e16ce31bb870048f3588869e673ece1b8b2756fd7fb9ff7df26b28678 SHA512 2374665376df4c91092f0941124914f91acab821b2266ba50da31d3d0728ab0672ff2fa5ccb23eef895228c10d8aca1aa27a035dbe408c177e67f75158ed0022
+DIST firefox-110.0.1-km.xpi 531022 BLAKE2B e48a5998b96761a9ccd45fb652a9bc57c4d059cdb9ec3f89aeda95001f577ab383e504875c2434f696a65deab2a3480ae7a652bd37e6753b79174fb87292bd71 SHA512 f86918783de58240704d31e862fe5c9f154759e247e0014a4f96b7bcccf1300f0e01f55690b7fe77486709bccaadf5f39887061fc99e41f57d360d405a514403
+DIST firefox-110.0.1-kn.xpi 496283 BLAKE2B 494b3062e67194616f175ab2ac28703517a604812d9aa62573b7a88472b601c0535d205260998e6601d5dbd5a3ae709c37e3057b6d8add0866b1e1df0e784806 SHA512 bcadf4ecae0fcab880746c7a7e1af4264842e0d8018da4cf14129f984cea1e16ac4df06bde37c239caf3fed4e38b5925680ab8ba3c32fbf31ec79f9400493606
+DIST firefox-110.0.1-ko.xpi 605669 BLAKE2B 098dc89757c071f1adcc72706243902217453721d8e286bb5b150f0c5f2ac2289a76010efb5712310596eeee120b5f3c75be2d0aca264c174516848416369c2f SHA512 02c32fd971dff31134e346f2a6d7e7571e1bd66b48a9a22d73b6febfe3154a4a26ad67109665376801fc9c357650019f7f81711a51638fd7840b4874ae09c7c8
+DIST firefox-110.0.1-lij.xpi 471131 BLAKE2B 32a0dab00ca3f88ac5888a03060d84572c355b003586a64f835a1692e8bdf9d6323af365ac50b8ce5cdba0e1413306785f6e61454ec9bad51aea5bf47b99bcc0 SHA512 046d60d3f22c4dc04255aefd05fb7595e98d0aa8e23bf9f7a7e2cf3a1640f93bf00e7e273380c958829da9630996ca27c9f65fa1619d7ac99a22e5d678a510ce
+DIST firefox-110.0.1-lt.xpi 566274 BLAKE2B c62706836c6c811b8a598ffa4b95947914fe36e61a6270aae08c67918b8f8b511beed118d83fe64cf20e82fcae6ac50625b14ac45578cc3c9e1fe4dc2715bba3 SHA512 9706f26b25ad251f108688a8e70e287efacb9e6a6dcb7ae28150e73542c19117d8401d1b53413432b30bf74f2ddcbdc1b8e8307eb66071880bd8e7c0c695e41a
+DIST firefox-110.0.1-lv.xpi 470793 BLAKE2B c32deea4792d7e1aeeccfd6cc441d44b79b7a50bdd954f4dc11019cae14e6c0f46c6d8cffb35ceff98e8eec22165ea27ad9f35603d2f6b34e5d42e8a8d5b35e4 SHA512 dd7b3a023d1102b94ad17e4d90180deb9cc8718458e882225e4ee560643669de03268224be1903169da402b744f7c82f31bc6aeb75f33f27410ebac80a66c46a
+DIST firefox-110.0.1-mk.xpi 484130 BLAKE2B 8c1d0e291091cc24788bc2995e995354ca9673431ac16ea1f1226aa337f362236b2f4ba8c423aed06be6a103cdbd347271fcec1d59de2d4b5018e597397ebe80 SHA512 85b51c86185c62961e09868079f8df1b8afcc1af2f6661dbaff7d29b7eee0fa8b6c1bc6dd5d8aa0136b4b3557c71ed223b58e78f235d207f41035f4d4fae42a4
+DIST firefox-110.0.1-mr.xpi 531177 BLAKE2B c98c4fc1316675d22b52d06f49d369b1826272dc1afcb4ac63c270069d53b4cdba73cc13aab57fb3463401e081a20fc98ec2d857072241498874725d2fa70f6c SHA512 4d96809400dcb37939b35d3602f54623d7fdff64bee6a3713aa17e7988bb8b64dfee11370d1fef58504fd495e13e9571919655ab311e2b715fef4567a0cc2ff4
+DIST firefox-110.0.1-ms.xpi 450477 BLAKE2B 10f6fa3167d8b38aa47a8157ebb3181020d138b6afccc73be5258730caa593dbb227f174e7a78efed8c2727bad626fba2ab206a9d1da16098778950f9d20cf7f SHA512 3ced367ef704177e1b54bd915062db772184e3df59ea92c845253aa22b1b2c765a24e7655fb4a0c073eca636e5a6c67be0f9bba4375226cd071a3a75c71dfbc6
+DIST firefox-110.0.1-my.xpi 516587 BLAKE2B e3b051aa6a12345b3f910870d048a7fdfd6a50b7dd89b87b27350140a09049298de8c33aeec22fbe22d3b2999a40cc2e20eb6533e3c0fb2c1b43db178dd8430d SHA512 dd3b15be3c78b538aa9e54ae6acab9a41e8d8b9f76f6ee4e2a3d15b06db0f13bb0b39a1384f87ef3bdaf1ec3236b3eba84c20305e4e4e1143acd1e83e3bd95b7
+DIST firefox-110.0.1-nb-NO.xpi 554926 BLAKE2B 94eaa949d7bcd99e7d2eaeabff8b2c10e444553cc76cdb624fdccb6b5d75cb5e102aa7c562413f1c3af9c743f85e2e3cda308442ff9fb6efac761448d49a2213 SHA512 9450f612385951319080d01ada65f7f270af00a207ef70e57ff62afaa6252de9f8479abc5ae5c36eafd216c382b30a98d7b5ae0d83fed683a90c483b5ba50a95
+DIST firefox-110.0.1-ne-NP.xpi 484690 BLAKE2B 7ed7dab09a96b697d6f4e8c77792d81d25468fde369dc5ecf4ec947cd829dd7803b024430701b371afa6aea763241dc2a7673abec270a0cb713d65debe1aff5a SHA512 6677edea8977b2f6b1b4542a043b32730442ec40f3a014a58bb51880f2c011f95865e91f0d05cff2c2423612d254af304a5ff9eac03e1ad1444eeaad4375b31c
+DIST firefox-110.0.1-nl.xpi 562664 BLAKE2B bae7c1ea4cbf71a4d636daac3b685999fbeb623679d54d2ed30e659a5626d18e7527e7a6b06a7a694747b3e763740ace08c356efe06898fc17823317eedb9c60 SHA512 f463bbf904e7e4d4864c0e33f475a028801df873265f2829e9973930c86391d44694b0a7e5966bb3652e3335a6c9cbfcace8bb0e67c2189944bde59004ee6b94
+DIST firefox-110.0.1-nn-NO.xpi 556391 BLAKE2B fd348d530509dfac108252864843b8f13941e92029e9516b9394fd7ea7d8cd4c024eb4ace185337d4519d4a09d9eed4737df49b924ec691b7a3fb5d27fde4b57 SHA512 22614d7c522229baac153e154c8db9155cc8acc7cf242ad6d630ae7c5945ff65dd5b5f80598fe26c817ebd42799af9b7599119ab547c775e8bf15a4fd3512fdd
+DIST firefox-110.0.1-oc.xpi 579322 BLAKE2B 94963f95a54b2ae734c2e02f48fa95261fb426740d43e702082231f00fd868cae571b9310e4c10d27b1c70c75ee2f920dd07c6caedefdbe229d08988144ce446 SHA512 970e99170c1f0e076ff96107c62ccc82ffcd28a95c463198cb07d15fb92be6c64de9c2dd89f9670427dc90e4cf4d6cc599f595c6752ad147ef3dd5976e163a45
+DIST firefox-110.0.1-pa-IN.xpi 636181 BLAKE2B 91deba1d6dfd1bd0b25d409f75181471809d2e7e1b6187778d02c77b0f074b51640f27e19bdffeb60c992713cc0ba2155044c5306c8551311ac6dd87e7dd1649 SHA512 d68622fed4b7ff788a239af3a9f5f218cf4645c8161257ff32444e564747e9cce0daee8b1daf5f06c4e803ed09ac4a26fa7efe110e5a885055cf5616a48a75d2
+DIST firefox-110.0.1-pl.xpi 586009 BLAKE2B fc1658161514dda0feabd03334e7b308af4e41777146e80df24d329a8c8642713eb3440c1acbfbb22ca905002b27b882a9917a36295ade66e2d2830b1ef5f7e5 SHA512 69ec98eb1cf9ec558ab49551b3b79c9eae5d86d993102dcd27d44c1d52b9de2fabe6fdaf17a8f668a7de0c4f5efecf7c15ed699ec145c922cd826aa041af8e4d
+DIST firefox-110.0.1-pt-BR.xpi 567197 BLAKE2B 038e4afe6a59fa36673b95a8650593d1f9282f62d24734ef14e721f5889eff0e1bd7ae1e155c75d619d942058107c99d909c9253e95e6984f645dc76f7e54f15 SHA512 ccb6a5016d0fbba58e58d3a4a1bd7981b7f37d4fddb8f9cfc78d50bfd1b5ff2b7e23db252797c4965daf7a1da9eddd46d86dfe0ce62623b172f1bc9f9f887bc4
+DIST firefox-110.0.1-pt-PT.xpi 572576 BLAKE2B 0034d80daaa4c0347864e60e67d1b32e0f322f77e4fdaed11a477ca520b90ca2dcb463877ef3ffe685a1cb19af5e4a549892c104c302efb22c5fc8ae20f400ff SHA512 d2d9236b8bda720b719f416b87a7de431966919500dec18550afd4aefb4e00081505746b7d639390000d0365e7bc62901dc54ff377b01714f0ee1c463428c0dd
+DIST firefox-110.0.1-rm.xpi 560564 BLAKE2B 4ef2dde8ea34fae800a3b61ba597222571ef03c1405cace0b1195149f4ed86ef28c48863735e81fd3ac5beb0c0308225e474007b271a3e183e8d8580002ab564 SHA512 00651230d1e2fcef180e9bfd2ee8d788011aab1f649c1cc89169abe97f0df810be7bafa3944c4b11945b39d69c93e716279c2511c81112989941fc1a6f74cb4c
+DIST firefox-110.0.1-ro.xpi 533696 BLAKE2B b391090477181a00f4ee7157b15d27a38ea70ab5445894cc1126d271df213d41aecb25003d3bb4eca65e2537850a473a684ec8eb1365381a53b7f211cf79ca26 SHA512 cdf42fa01933b7f96b3bb30ae0cf15365586a6cfa8323f7eee3becf082013152f4857d713436fcf56f7571d0fbcd09ee2d12fa3884045b0ca9f637a44aac4833
+DIST firefox-110.0.1-ru.xpi 657162 BLAKE2B 160acedc67e633a5707dd570a894bdd48b9878b24ed3d500093c44425fa6b6f1540db1acbb7f0e29ff2d468fd99d4b1500a38e5dc668f20e9a79bc640262cd56 SHA512 27b3decdbb1efd5cd7ea1fe08679ee36fb9a03bae8a970ca37b58099eb5d8bd3001551650665d6c2f4dac45c5b40b0e23615a16d807523057328996c7e7d9f59
+DIST firefox-110.0.1-sco.xpi 505312 BLAKE2B 936d925886109a41ade7e97b4dea59385e2b34202d6fba7c7a4a52798ee83b2a95ff25b4b6b87cf42b837e1f14b20cd9aa00db6870c69f8afac30a998b5fa886 SHA512 99e2a0268880af56dec094b8ac20a94f78a5a803c9c89882f89dc489199ec560454a45a6403ffb4bff3171c3f3c3ceb2e901514be0767f644fd364a0cc21924a
+DIST firefox-110.0.1-si.xpi 574131 BLAKE2B 6b3e7d2bcc49b63dd1513f5e6cf26866671fca9d676aed47c15064e40207750472726b03c07885405435d581356ffb315291534b068ddaa9b129a3c22a7d3c3d SHA512 ba35ea58e83806c79466b54dbaee4a967e15d0428b43bd1278dc906eaa9ac8bd9b63fe766f0e93897a93434e257bea74a9fb9ad12f59e119a8fe2601e7afd76b
+DIST firefox-110.0.1-sk.xpi 593385 BLAKE2B 11f06197922726aac3468beceea4c21c475fd6dbe6527727560cf17574834fa0fdf29423ae4f4a4fc634461ae15f7683f42706ff3692b3d212f7fcd446b931c8 SHA512 9505aab4f34cbca685673f0f10a414b0a0f7d3e3a6378495b4ab3fae78c344c3e75d5fd7c882565b41f719776910890aa05d8c4add0520049504bcf824918de7
+DIST firefox-110.0.1-sl.xpi 566382 BLAKE2B 3f540db0494283e5e04b39ce652b42c9ecb53d72b31179e587387c9bb23531fbc47b1984c918f0477bd57a138a162c5d0fb9b6dec636d35c61b8af84824218c5 SHA512 72a8749a7d1b3258500a6b9dbf0c3b21c1deb7b9b1cffd3ff4df747add278c77f49f39381d4f3ee45fd78881d0a41b2bea00d1d7d0bcd54d601d38d307e27c4b
+DIST firefox-110.0.1-son.xpi 422457 BLAKE2B 04babac264fea21675959f429d017a0286535521441664f4b286af09583d4c4b5ae687490cf2771077589dbfc11e746a785c1c1ee0d60160d5f51f135f0231da SHA512 bc23e6d30e2d35baf7fa7be12784433eceac4b61db4ca49d3f67de48279ea3dbbfe5fafa885a8388527ad306efd0cdced6593a603e94c6c1bf1217ed2966e3aa
+DIST firefox-110.0.1-sq.xpi 581639 BLAKE2B 582d99cc5b5166ba2db0c56578ea0202d82b415e14b75a65b4b473c9aa6ff46c0713094331aa3fa3fcef5a0c6ba3554f715ef99c352deeaad94d2562d98bea9f SHA512 e8c7d39303c8d46d7704d876bde12475a853b457a4468f384d6326eecee382558a211f22a6b1859cc781619e4d40545ecb6076d091c32aff958b6065e7d3dbe5
+DIST firefox-110.0.1-sr.xpi 621092 BLAKE2B 6db5a1392adc982f001b86afcf2949d65da6c6de458c9adac673b350f28ef46c8ffb4e1d7655d627b58e59cc98498255635399f7a3c2c72ac404f17c67175461 SHA512 2be1ac69ba2a2eb3a222e9898d5a4210ee57a5d22e4548f455ac3a47f6bbe579eee6ab4bcaee9b1f7f6377e8248e518625b5dd8092bcc678f9dc736b02b16241
+DIST firefox-110.0.1-sv-SE.xpi 566330 BLAKE2B 52f7e626a9877a78871342afd2ac44116c6d9545148d147ebb9e88b7ce1fed398e952587009fe587c328fac4785994442cf14373305b747611c200845e9bbb08 SHA512 037563730b0d99c6c9ecfe84f6dec9c6e48eade137725b2efc940b9ede58a66c995aa8c3d53af9f8874f7ada38962b72491361493f755d58ea8bd68102466301
+DIST firefox-110.0.1-szl.xpi 518021 BLAKE2B d695e0efc72ccc5fe5427483dc1a491c170fcc393825c89eb9c1bd1383807b3c6ae02bcea8b635848075905750cb606b2c6020886a970f5606e06d13e6109da0 SHA512 f9fc39bcb3a6cd43f19c169ef54bb74c62d6d032aaa34209f636353d6fca9fe5116698af123bf15d3958149292eaa241c357abcbb644b0eacdbd1e5a0ef59030
+DIST firefox-110.0.1-ta.xpi 508561 BLAKE2B f5cea728483ffcb17486f98bf6b1b013e23bd989a496056dd2faf10893e67ef4aae3030907fbb75a33ecda69cbc93594df4ffe4883d252718748a5e763e33246 SHA512 fc92e80acdd56432fc5fde6b355652b29540ecb984501b80b91d5c5c7cc34051a9e2e1ffc1feebefe9a5d210a1986d3204243f7f6bd1fe2bf49748da7ca767e3
+DIST firefox-110.0.1-te.xpi 556285 BLAKE2B e03fddc6c5e13315a2d25b792afe325016771f687cb08cd333dc11b991aa526e1d17c340d82a8692937acf7575d7936e816ed87f710a40247a7ec12773695bd9 SHA512 0830cbdf0dce054c10f63db171f43550825c6c26a1815f8a8a2fcce726bdb3caf86004bf85d7d394b4d8aa6141ab1e57ea25802e632ac853756497994cd03855
+DIST firefox-110.0.1-th.xpi 636774 BLAKE2B 1f1c92fbc46586ceb586575f836db0b54b9394726daed762788631415d8c31000783f46195bf22e219eee14e18d881b8cfc5ee13f6b568bbd80bdd823d0ce82c SHA512 a3b4c3c0e4d3f0a3bf4734085e7e82c0b7dcd9aab046156fa58798e341a237b62503e69a8b2d2409dceee4eeeb71202393e57d1583cc47c995b93afa70212b16
+DIST firefox-110.0.1-tl.xpi 523711 BLAKE2B 12800962c30143477c7649117ebbb34a28900fb472c599e782059ad8729680d93b442eaaf6412a0734676591c2891141c77647674893f68f15351e4e25efe094 SHA512 dac94ffc2ff490b28295ac89856b79a37367bd25d85ce1ec08cd5f0e0ed6ddb875e1d7e28a89d22243cc4cfe67074f22dde8fd9e209f378eed2dd5722126b83e
+DIST firefox-110.0.1-tr.xpi 577878 BLAKE2B 3b505e078f4d613931aca5c4e8ea50353f4e3deae3b658c51d41bf198270b54c1c09e85fef8f54697d353ba551212a3ce172f44a13e2c810db368ff3e613ddd4 SHA512 377a409eeb8a468505027dfe791095b94e1f3e140844e57f3d9475d0839bd9ae75ae6d76aa4bbc4fa26262762270a8dfcf34c2d426cbe918f3f3cf273bb60a9a
+DIST firefox-110.0.1-trs.xpi 487282 BLAKE2B 876ca3ea39e8fff980321c64abc784445cf2321e2b1263b788070a0f74c3894450503bc24eb2596916a6e95f75c96778287c4d27dc23389c39c4e3747d49250e SHA512 0761c94c9d1bf22a3e35cb08892630203a5066e8e854daa2b235c395e38723de8bd8f00f1dec867e8298b91a82db537dbecac7083184200ac57148e3d45f4ab9
+DIST firefox-110.0.1-uk.xpi 650248 BLAKE2B fbf07118a60a0d1eaec119d7e6503b73a1805c64a1f2c1febba4ff7fa8df652223c0c8aa67545eb818f19430685d59c43c4ef009d0e0316de867f431337c0615 SHA512 efc9fcdaca232510f3034cee2c8d6ef858d4080bbffa640e55c4b3aaf9e7d7ff054a6d6bf13c0ae9b90b74901759c79f7c3c81ee5f932528832e4022e3ca5c7f
+DIST firefox-110.0.1-ur.xpi 558069 BLAKE2B 9911c2a1d230b7179f21233de4421d1699795591c982d664c453a1ef9a441f852a5f31c8114e44e31961a52bbd58d8f034a65a160ffd3c38f16dcdaf2f758653 SHA512 c2703d2f5b3cd3d2823a5445b81415db8db4523acb544444155b6e7e499fd324459642599e2d11be2e3607cd7bd260e8de0e358b73886d5fc4a3af9f0a16c5b7
+DIST firefox-110.0.1-uz.xpi 478758 BLAKE2B 217317687e596fc7a03eeb8ea24ed24f1be9d99000c489663bba604d63f6536d98c34cf8d752750d4003098e7e2cb6bbfa4daa579c803df3feb1adcffb25b932 SHA512 90e5412a06a243abc54115b0406662eb3d9ba48e8299a16e01794ae07da4b6e39307f015e6f52e7e99751507ac3b854e29fbfbd8ace4952117b09757cf817e5d
+DIST firefox-110.0.1-vi.xpi 600480 BLAKE2B 5b8266aa34e1f55b0b1776e44528a1e8d49db7571ee7ee6e5abca0ab2142841d28c83fe8677efe9a50d3194d2090b7072b8383918903fc6e2b9cd0d067bebddb SHA512 2dcea5f3063a0b83a86b0f65cf5008346575a4ee287faee8ac6e4298b53e221d4075f18a38bf64bd4822b67cc58c0f95e7cf26ec06d7f2bdca86dbcbeb0e699d
+DIST firefox-110.0.1-xh.xpi 416890 BLAKE2B a9dc27bf5848f9f8d4513398b633d1d17ae6e99f61dd27c3ed5aa4a933019e11c6bb0c39b925f81e4e0c5ab687aa9e23b3baa5016190e1717a45f8850e86d22e SHA512 28e5edb88683286464039f14d3a901aa3bf0d31dd3ac192c897396521896e25afe73f32a5d70b57440b3145737c1cd26b052a4983aab2a2ae63386835305f5bd
+DIST firefox-110.0.1-zh-CN.xpi 599824 BLAKE2B aa00d351216e606dc79e0e81dc2d32b7e465e3877b2410f19c9cc864e33b84a36f9b44b45a32689bd45a0250a5fb205cf7c6607d74dbe63b477bdb106cc31aa5 SHA512 f8afe4451da1b47ba4be65fdcd42770fab9e86ffa870722316b645b9301778fe6c2dc1ced395dd5a4c23f6972d4f4ffa2ea4e26d97acc1a524171fc5539e51c9
+DIST firefox-110.0.1-zh-TW.xpi 602201 BLAKE2B b7c64c74c480fd9459765e578d7c07ca656392a35317ca8a40e633df793176c307abac230498dfa704b1e88c4478b7f7ba39e8078370bc935c4c9528d74f30dc SHA512 3375915a30562cbf4ecf6aac3a1083135bc8afda22f17ac0f4edd9013f749de0e06c685fb85f7b59364e242a8d86a49f0c3a5e46248f7f576cf56a31ec9bad5d
+DIST firefox-110.0.1.source.tar.xz 494223300 BLAKE2B ff196016e0271f7828163b8f767f3321b5ee08ef6bd0b03b134e17a1e5b62666f10ae80a14569438f6ac1c995a7a8422265eaabbc505b6a86e95a66b5db07209 SHA512 42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21
diff --git a/www-client/firefox/firefox-102.8.0.ebuild b/www-client/firefox/firefox-102.8.0.ebuild
index 61c8a1fa1f78..52cb88971193 100644
--- a/www-client/firefox/firefox-102.8.0.ebuild
+++ b/www-client/firefox/firefox-102.8.0.ebuild
@@ -38,7 +38,7 @@ MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
 MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
 
 inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
 	virtualx xdg
 
 MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
@@ -1267,4 +1267,8 @@ pkg_postinst() {
 	elog "Or install an addon to change your useragent."
 	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
 	elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
 }
diff --git a/www-client/firefox/firefox-110.0.1.ebuild b/www-client/firefox/firefox-110.0.1.ebuild
new file mode 100644
index 000000000000..9d76745a09fd
--- /dev/null
+++ b/www-client/firefox/firefox-110.0.1.ebuild
@@ -0,0 +1,1370 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-110-patches-01j.tar.xz"
+
+LLVM_MAX_SLOT=15
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="rapid"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
+IUSE+=" wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver +gmp-autoupdate screencast"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wifi? ( dbus )"
+
+# Firefox-only REQUIRED_USE flags
+REQUIRED_USE+=" screencast? ( wayland )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	!www-client/firefox:esr
+	screencast? ( media-video/pipewire:= )
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/clang:15
+	sys-devel/llvm:15
+	clang? (
+		|| (
+			sys-devel/lld:15
+			sys-devel/mold
+		)
+		virtual/rust:0/llvm-15
+		pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+	)
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.24.3
+	net-libs/nodejs
+	virtual/pkgconfig
+	!clang? ( >=virtual/rust-1.65 )
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		wayland? (
+			>=gui-libs/wlroots-0.15.1-r1[tinywl]
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.87
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	screencast? ( media-video/pipewire:= )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-72.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libxkbcommon[X]
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && tc-ld-is-lld ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${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}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
+	addpredict /dev/dri
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+}
+
+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="6600M"
+		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 && tc-ld-is-lld ; 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!"
+
+			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!"
+
+			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"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				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 use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# May need a wider addpredict when using wayland+pgo.
+			addpredict /dev/dri
+
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	! use ppc64 && rm -v "${WORKDIR}"/firefox-patches/*bmo-1775202-ppc64*.patch
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# 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
+
+	# 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_environment_reset
+}
+
+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; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+		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,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/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
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	if use ppc64; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	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
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		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
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		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 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 PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	if use system-python-libs; then
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
+	else
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled",          false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled",          true);
+			EOF
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+	local show_normandy_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	elog
+	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
+	elog "useragent checks. To temporarily fix this, enter about:config and modify "
+	elog "network.http.useragent.forceVersion preference to \"99\"."
+	elog "Or install an addon to change your useragent."
+	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
+	elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+}
diff --git a/www-client/firefox/firefox-110.0.ebuild b/www-client/firefox/firefox-110.0.ebuild
deleted file mode 100644
index 7f87eb3892ad..000000000000
--- a/www-client/firefox/firefox-110.0.ebuild
+++ /dev/null
@@ -1,1366 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-110-patches-01j.tar.xz"
-
-LLVM_MAX_SLOT=15
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="manual"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi +X"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast"
-
-REQUIRED_USE="|| ( X wayland )
-	debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" screencast? ( wayland )"
-
-FF_ONLY_DEPEND="!www-client/firefox:0
-	!www-client/firefox:esr
-	screencast? ( media-video/pipewire:= )
-	selinux? ( sec-policy/selinux-mozilla )"
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/clang:15
-	sys-devel/llvm:15
-	clang? (
-		|| (
-			sys-devel/lld:15
-			sys-devel/mold
-		)
-		virtual/rust:0/llvm-15
-		pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
-	)
-	app-alternatives/awk
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	!clang? ( >=virtual/rust-1.65 )
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )
-	pgo? (
-		X? (
-			sys-devel/gettext
-			x11-base/xorg-server[xvfb]
-			x11-apps/xhost
-		)
-		wayland? (
-			>=gui-libs/wlroots-0.15.1-r1[tinywl]
-			x11-misc/xkeyboard-config
-		)
-	)"
-COMMON_DEPEND="${FF_ONLY_DEPEND}
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.87
-	>=dev-libs/nspr-4.35
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	pulseaudio? (
-		|| (
-			media-libs/libpulse
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	libproxy? ( net-libs/libproxy )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	screencast? ( media-video/pipewire:= )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-72.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		>=media-libs/libepoxy-1.5.10-r1
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)
-	X? (
-		virtual/opengl
-		x11-libs/cairo[X]
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libxkbcommon[X]
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-libs/libxcb:=
-	)"
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )"
-DEPEND="${COMMON_DEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libICE
-		x11-libs/libSM
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang && tc-ld-is-lld ; then
-		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
-			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
-			einfo "virtual/rust:0/llvm-${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}*[profile]" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
-# placed here until toolchain-funcs.eclass gets an official support for mold linker.
-# Please see:
-# https://github.com/gentoo/gentoo/pull/28366 ||
-# https://github.com/gentoo/gentoo/pull/28355
-tc-ld-is-mold() {
-	local out
-
-	# Ensure ld output is in English.
-	local -x LC_ALL=C
-
-	# First check the linker directly.
-	out=$($(tc-getLD "$@") --version 2>&1)
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# Then see if they're selecting mold via compiler flags.
-	# Note: We're assuming they're using LDFLAGS to hold the
-	# options and not CFLAGS/CXXFLAGS.
-	local base="${T}/test-tc-linker"
-	cat <<-EOF > "${base}.c"
-	int main() { return 0; }
-	EOF
-	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
-	rm -f "${base}"*
-	if [[ ${out} == *"mold"* ]] ; then
-		return 0
-	fi
-
-	# No mold here!
-	return 1
-}
-
-virtwl() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
-	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
-	tinywl -h >/dev/null || die 'tinywl -h failed'
-
-	# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
-	addpredict /dev/dri
-	local VIRTWL VIRTWL_PID
-	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
-	local -x WAYLAND_DISPLAY
-	read WAYLAND_DISPLAY <&${VIRTWL[0]}
-
-	debug-print "${FUNCNAME}: $@"
-	"$@"
-
-	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
-	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
-}
-
-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="6600M"
-		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 && tc-ld-is-lld ; 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!"
-
-			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!"
-
-			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"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				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 use pgo ; then
-			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
-			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
-			# (PORTAGE_SCHEDULING_POLICY) update...
-			addpredict /proc
-
-			# May need a wider addpredict when using wayland+pgo.
-			addpredict /dev/dri
-
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	! use ppc64 && rm -v "${WORKDIR}"/firefox-patches/*bmo-1775202-ppc64*.patch
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# 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
-
-	# 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_environment_reset
-}
-
-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; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		if tc-is-gcc; then
-			have_switched_compiler=yes
-		fi
-		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,
-	# AS is used in a non-standard way by upstream, #bmo1654031
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	export AS="$(tc-getCC) -c"
-	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-	mozconfig_add_options_ac '' --enable-project=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-tests \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--enable-system-policies \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/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
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	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
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use X && use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	elif ! use X && use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld or mold when using clang.
-			if tc-ld-is-mold ; then
-				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
-			else
-				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-			fi
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409.
-			# mold does not support gcc+lto combination.
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# lld is upstream's default
-			if tc-ld-is-mold ; then
-				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
-			else
-				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-			fi
-
-		else
-			if tc-ld-is-mold ; then
-				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
-			else
-				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
-			fi
-		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
-		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
-	else
-		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
-
-		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 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 PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo; then
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-
-		if ! use X; then
-			virtx_cmd=virtwl
-		else
-			virtx_cmd=virtx
-		fi
-	fi
-
-	if ! use X; then
-		local -x GDK_BACKEND=wayland
-	else
-		local -x GDK_BACKEND=x11
-	fi
-
-	${virtx_cmd} ./mach build --verbose || die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/lynx/lynx-2.9.0_pre11.ebuild b/www-client/lynx/lynx-2.9.0_pre11.ebuild
index 7ee4c3489530..c9298033afc1 100644
--- a/www-client/lynx/lynx-2.9.0_pre11.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre11.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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="brotli bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 9ceba929695b..64b5eb98f37c 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index b39491bccf29..1dce1b8b8b63 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,3 +1,2 @@
-DIST urlwatch-2.22.tar.gz 136306 BLAKE2B e7f10872e5d7f42ec0ac1073783431c4b0e4fcdcf40884a9f7f52aee36705fbdbaaf5f9e671223715040c6f68cc580f531ba753c9326a2b1380d2fb707f66f1c SHA512 f2c1e0d279689d1e5761203ba139614b972c6266c30877262d59759b0ce63342a820a063f001039848427ea4af4325505c636762cdedb3dc60ebd09e859914f4
 DIST urlwatch-2.24.tar.gz 141175 BLAKE2B 7868ba757493c97ef65136d3da67ef3bb6b0d62e52ab150e169d66adea420872990527a622d305bd14923ff367041d615dcea1495871258040ec2cbb73ee7613 SHA512 ed84cb69ecd8894851c3be0165edfa1dfee92a0b49ea1383e4cfd7c31eb0604f99b1a90d9508753064b58bdd8fc4c0369d817303858d07562b37c3f2ac4cae52
 DIST urlwatch-2.25.tar.gz 168241 BLAKE2B 85f76e849495f5457f43ccd37035aae84c6ae4c8649005e617a6a585bf3b73d30914f8c7a89c0fb9bb04cc07a8797d77be07807e8d7c64976355749417b39e40 SHA512 af14c5b4e11345e56e6f326c114629f1e074215d6cc66d9c642424b2a689dc80339157f1b2547fdbe7b7a13d520e2b83bf23c7477da4ae4e43d108e6452624ca
diff --git a/www-misc/urlwatch/urlwatch-2.22.ebuild b/www-misc/urlwatch/urlwatch-2.22.ebuild
deleted file mode 100644
index 7a488bf29146..000000000000
--- a/www-misc/urlwatch/urlwatch-2.22.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://thp.io/2008/urlwatch/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_sphinx docs/source dev-python/alabaster
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# Require the pdftotext module
-		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test.pdf-job12]"
-		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test-password.pdf-job13]"
-		# Requires the pytesseract module
-		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/ocr-test.png-job26]"
-	)
-	pytest -vv ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version dev-python/chump; then
-			elog "Install 'dev-python/chump' to enable Pushover" \
-				"notifications support"
-		fi
-		if ! has_version dev-python/pushbullet-py; then
-			elog "Install 'dev-python/pushbullet-py' to enable" \
-				"Pushbullet notifications support"
-		fi
-		elog "HTML parsing can be improved by installing one of the following packages"
-		elog "and changing the html2text subfilter parameter:"
-		elog "dev-python/beautifulsoup4"
-		elog "app-text/html2text"
-		elog "dev-python/html2text"
-		elog "www-client/lynx"
-	fi
-}
diff --git a/www-misc/urlwatch/urlwatch-2.25.ebuild b/www-misc/urlwatch/urlwatch-2.25.ebuild
index b8f55930bcc2..746a7b008c8f 100644
--- a/www-misc/urlwatch/urlwatch-2.25.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.25.ebuild
@@ -4,13 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://thp.io/2008/urlwatch/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://thp.io/2008/urlwatch/
+	https://github.com/thp/urlwatch/
+	https://pypi.org/project/urlwatch/
+"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index eb04a9d7820e..7991c86018fd 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/lighttpd/lighttpd-1.4.68.ebuild b/www-servers/lighttpd/lighttpd-1.4.68.ebuild
index ca80b451af8f..d221ec143d74 100644
--- a/www-servers/lighttpd/lighttpd-1.4.68.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.68.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.t
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index af881738fd54..fa2f4f5bf36f 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1 +1,2 @@
 DIST nginx-unit-1.29.0.tar.gz 903909 BLAKE2B d9e2544ce7ffb4f9a510afaef2ddbf54a4482558d0cd3dd526c1371413e32fc72e848c95d3866928c1accc19bc2aecdb4c26b6907bfa57c382db53cc2f9fad3e SHA512 6b0a6718be5c3312f5e17fc39ae35ca849049c97d29c63a7effda7f994274af29eed88970389bb3010a2103c431e69920c951de5004853004d1aa604d868bd9f
+DIST nginx-unit-1.29.1.tar.gz 906654 BLAKE2B 1068a1002b05f6f9f28b19745e3c1c0f1d1def89fad8489174fd7b38ddd8c9678f27a3b105f98a17d537621cdd2cbedf9f39b4c284a7918d290287f3c324fa49 SHA512 c99cea78804ead999e62777132fe204e0f87e1b58e55b0b4a074ab8d203149c14c8faef64872a44404f8fca5bfd98d2f9e4aae2db89bebeee15f27cabbc9f247
diff --git a/www-servers/nginx-unit/files/nginx-unit.confd b/www-servers/nginx-unit/files/nginx-unit.confd
new file mode 100644
index 000000000000..b9ce82d332ce
--- /dev/null
+++ b/www-servers/nginx-unit/files/nginx-unit.confd
@@ -0,0 +1,25 @@
+# /etc/conf.d/nginx-unit
+
+# non-privileged processes to run as specified user
+#NXT_USER="nginx-unit"
+
+# non-privileged processes to run as specified group
+#NXT_GROUP="nginx-unit"
+
+# Address of the Control API Socket
+#NXT_CONTROL="unix:/run/nginx-unit.sock"
+
+# PID file
+#NXT_PID="/run/nginx-unit.pid"
+
+# Log File Name
+#NXT_LOG="/var/log/nginx-unit"
+
+# Modules directory name
+#NXT_MODULES="/usr/lib64/nginx-unit"
+
+# State directory name
+#NXT_STATE="/var/lib/nginx-unit"
+
+# tmp directory name
+#NXT_TMP="/usr/tmp"
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r1 b/www-servers/nginx-unit/files/nginx-unit.initd-r1
new file mode 100644
index 000000000000..32ef624d2103
--- /dev/null
+++ b/www-servers/nginx-unit/files/nginx-unit.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/unitd"
+pidfile="/run/nginx-unit.pid"
+NXT_USER=${NXT_USER:-nginx-unit}
+NXT_GROUP=${NXT_GROUP:-nginx-unit}
+NXT_CONTROL=${NXT_CONTROL:-unix:/run/nginx-unit.sock}
+NXT_PID=${NXT_PID:-/run/nginx-unit.pid}
+NXT_LOG=${NXT_LOG:-/var/log/nginx-unit}
+NXT_MODULES=${NXT_MODULES:-/usr/lib64/nginx-unit}
+NXT_STATE=${NXT_STATE:-/var/lib/nginx-unit}
+NXT_TMP=${NXT_TMP:-/usr/tmp}
+
+command_args=" --user ${NXT_USER} --group ${NXT_GROUP} --control ${NXT_CONTROL} --pid ${NXT_PID} --log ${NXT_LOG} --modules ${NXT_MODULES} --state ${NXT_STATE} --tmp ${NXT_TMP}"
+
+depend() {
+	use dns logger netmount
+}
+
+start_pre() {
+    checkpath -d /var/lib/nginx-unit -o root:root -m 0770
+}
+
diff --git a/www-servers/nginx-unit/nginx-unit-1.29.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.0-r1.ebuild
new file mode 100644
index 000000000000..ecf1568f4165
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.29.0-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic python-single-r1 systemd toolchain-funcs
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-4 php8-0 php8-1 "
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	php8-0? ( dev-lang/php:8.0[embed] )
+	php8-1? ( dev-lang/php:8.1[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
+RDEPEND="${DEPEND}
+	acct-user/nginx-unit
+	acct-group/nginx-unit"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+	default
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+		--user=${PN}
+		--group=${PN}
+	)
+
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
diff --git a/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
new file mode 100644
index 000000000000..944eabe1322d
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic python-single-r1 systemd toolchain-funcs
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-4 php8-0 php8-1 "
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	php8-0? ( dev-lang/php:8.0[embed] )
+	php8-1? ( dev-lang/php:8.1[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
+RDEPEND="${DEPEND}
+	acct-user/nginx-unit
+	acct-group/nginx-unit"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+	default
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+		--user=${PN}
+		--group=${PN}
+	)
+
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
+
+pkg_postinst() {
+	chown ${PN}:${PN} "${EROOT}"/var/lib/nginx-unit
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2595f74b916d..25b05656fda8 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,8 +1,16 @@
 DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
+DIST apache-tomcat-10.1.6-src.tar.gz 6073924 BLAKE2B debc363395becd96a856a03ffd5846e786c27781318b9c08c428498a010dc77e334e6fd15ffea1545dc15b1c226fdd73f24d15f70361b39d37316c48a0c5e66e SHA512 54df5784fbbe9c29b5569783c836e1490a6c08610ffe3c98123cc8bee8b483fcb73f46a15487dc5a6c9c7926ba63bab79e1794b07c00c22798ea0984e56f12f5
+DIST apache-tomcat-10.1.6-src.tar.gz.asc 849 BLAKE2B 71f512c0def69b9c23d4440a988f1f889c57c55e731fc00080a6c919c13360ad2b8a7bbdc65b0e632b5e4b66eb96e58301d720fb433b3b3b50e107de17fd6fe6 SHA512 51d560236ebdc9f9c6e77e6ac98306ec8e9e3079efda7f0a2b6cb0cc3256571881acd891668d606d873d0b5a1be3ba3cd5a095d44cba6e852f1cd5fd8e1e9d41
 DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
 DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
+DIST apache-tomcat-8.5.86-src.tar.gz 6038952 BLAKE2B b57a203fb2e215f0a07485d5ae70398e0e2d56b37cd7172f33680c8b57faa97929904349ee93b3d975cb24ac2c9e2d15240d59d4a3295d0a7deb96b8069269ef SHA512 fbc57d314fb8885e9986a26515b6536f2bffdb3476af71417eb9dab1623f36ea80da431bc1dc8874aa99dd6575919a0d3a828d84a87404a73ed22de601097e12
+DIST apache-tomcat-8.5.86-src.tar.gz.asc 849 BLAKE2B ff388f97a189c9b45eaac42a1e670c8cddf52903421f053ec1df0518937f3c8b0bc650009cc93bb0a7440aa0607f955bbc219d80a34ab050851554b5736f3235 SHA512 85e961b6569e6c8421b83246653c86a53843232dc7a3eb5d466e6f11fb4b4f1a5dcee43403a43c8950774395acf7f576f7184c7dfa84084f08ff9a203b6104fd
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
+DIST apache-tomcat-9.0.72-src.tar.gz 6227773 BLAKE2B f784df0dd40539f38343942d818f3735521fbd3c978a3fa9c1c4cb7a4a46b71a23bdd55530b2ba6ae4a6ae89bf651a1c73fea0380e485097eb77cc75ac4d7075 SHA512 5dfcf1b4ce90b41164170eada109ccccb9c4357ca979f88dc89548284164b482c5d87788d93188de20b68ae346e870ab01525a980be3f8ee72af27e83f82d3a1
+DIST apache-tomcat-9.0.72-src.tar.gz.asc 833 BLAKE2B f79bd955a01d846427a454d9a50f9a614e16757edf79beeeef7b9498e79356944085b0f39bd8e1a1181e7152e042a06ce310ccf7da3549b8b16acee2eaf4ba56 SHA512 4e8afa0ae0d7eded96f33d2391c018bac7dbf44754cbf98bc965fd0d3c2c3fbbac9c68304066e93cb4e9e36bc8bcf2f8378f5b357df360582df0aae239b61585
 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
+DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
+DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
new file mode 100644
index 000000000000..341813c73123
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
@@ -0,0 +1,122 @@
+diff --git a/build.xml b/build.xml
+index bea41a8..08ef1db 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1457,9 +1457,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!-- not needed for us
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1519,8 +1519,9 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide jdt jar externally
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+     <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
+     <local name="migration.jar.filename" />
+     <basename property="migration.jar.filename" file="${migration-lib.jar}"/>
+@@ -1530,8 +1531,9 @@
+         <exclude name="${migration-lib.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide migration tool externally
+     <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+     <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one -->
+     <!-- After module release
+     <local name="openssl-lib.jar.filename" />
+@@ -2213,11 +2215,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!-- we provide tomcat native as another package and we don't need commons-daemon
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2378,8 +2381,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!-- net is not accessed from emerge
+       <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
+       <link href="https://jakarta.ee/specifications/platform/10/apidocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -3300,6 +3305,7 @@ asf.ldap.username=${release.asfusername}
+           depends="setup-bnd">
+ 
+     <!-- Download Commons Daemon -->
++<!-- not needed
+     <antcall target="downloadgz-2">
+       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
+@@ -3308,8 +3314,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
+       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download JDT (Eclipse compiler) -->
++<!-- we provide JDT
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${jdt.loc.1}"/>
+       <param name="sourcefile.2" value="${jdt.loc.2}"/>
+@@ -3319,8 +3326,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jdt.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download WS API -->
++<!-- we provide jaxrpc
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+       <param name="destfile" value="${jaxrpc-lib.jar}"/>
+@@ -3329,6 +3337,8 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
+     </antcall>
++-->
++<!-- we provide wsdl4j
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+       <param name="destfile" value="${wsdl4j-lib.jar}"/>
+@@ -3337,8 +3347,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Tomcat Migration Tool for Jakarta EE -->
++<!-- we provide migration tool
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${migration-lib.loc}"/>
+       <param name="destfile" value="${migration-lib.jar}"/>
+@@ -3347,7 +3358,7 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${migration-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${migration-lib.checksum.value}"/>
+     </antcall>
+-
++-->
+   </target>
+ 
+   <target name="download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
new file mode 100644
index 000000000000..8888e3589ce3
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
@@ -0,0 +1,113 @@
+diff --git a/build.xml b/build.xml
+index d407be0..7c69a1b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1148,9 +1148,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!-- not needed for us
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1210,7 +1210,9 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide jdt jar externally
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++-->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1719,7 +1721,7 @@
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+           description="Prepare to build web services extras package">
+-
++<!-- we provide jaxrpc
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+       <param name="destfile" value="${jaxrpc-lib.jar}"/>
+@@ -1728,7 +1730,8 @@
+       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
+     </antcall>
+-
++-->
++<!-- we provide wsdl4j
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+       <param name="destfile" value="${wsdl4j-lib.jar}"/>
+@@ -1737,11 +1740,13 @@
+       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
+     </antcall>
+-
++-->
++<!-- ignored above
+     <copy file="${jaxrpc-lib.jar}"
+           tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
+     <copy file="${wsdl4j-lib.jar}"
+           tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
++-->
+   </target>
+ 
+   <target name="extras-webservices"
+@@ -1850,11 +1855,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!-- we provide tomcat native as another package and we don't need commons-daemon
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2020,8 +2026,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!-- net is not accessed from emerge
+       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="https://docs.oracle.com/javaee/7/api/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -2933,6 +2941,7 @@ asf.ldap.username=${release.asfusername}
+           description="Download components necessary to compile" >
+ 
+     <!-- Download Commons Daemon -->
++<!-- not needed
+     <antcall target="downloadgz-2">
+       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
+@@ -2941,8 +2950,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
+       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download JDT (Eclipse compiler) -->
++<!-- we provide JDT
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${jdt.loc.1}"/>
+       <param name="sourcefile.2" value="${jdt.loc.2}"/>
+@@ -2952,7 +2962,7 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jdt.checksum.value}"/>
+     </antcall>
+-
++-->
+   </target>
+ 
+   <target name="download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
new file mode 100644
index 000000000000..985d5d4f94fb
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
@@ -0,0 +1,99 @@
+diff --git a/build.xml b/build.xml
+index b420c2a..abecfde 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1436,9 +1436,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!-- not needed for us
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1498,7 +1498,9 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide jdt jar externally
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++-->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -2154,11 +2156,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!-- we provide tomcat native as another package and we don't need commons-daemon
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2319,8 +2322,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!-- net is not accessed from emerge
+       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -3234,6 +3239,7 @@ asf.ldap.username=${release.asfusername}
+           depends="setup-bnd">
+ 
+     <!-- Download Commons Daemon -->
++<!-- not needed
+     <antcall target="downloadgz-2">
+       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
+@@ -3242,8 +3248,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
+       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download JDT (Eclipse compiler) -->
++<!-- we provide JDT
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${jdt.loc.1}"/>
+       <param name="sourcefile.2" value="${jdt.loc.2}"/>
+@@ -3253,8 +3260,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jdt.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download WS API -->
++<!-- we provide jaxrpc
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+       <param name="destfile" value="${jaxrpc-lib.jar}"/>
+@@ -3263,6 +3271,8 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
+     </antcall>
++-->
++<!-- we provide wsdl4j
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+       <param name="destfile" value="${wsdl4j-lib.jar}"/>
+@@ -3271,7 +3281,7 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
+     </antcall>
+-
++-->
+   </target>
+ 
+   <target name="download-test-compile"
diff --git a/www-servers/tomcat/tomcat-10.1.6.ebuild b/www-servers/tomcat/tomcat-10.1.6.ebuild
new file mode 100644
index 000000000000..9c25e9b767b7
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.6.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	eapply "${FILESDIR}/${PN}-10.1.6-build.xml.patch"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.86.ebuild b/www-servers/tomcat/tomcat-8.5.86.ebuild
new file mode 100644
index 000000000000..717b0f622eb2
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.86.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	doc? (
+		dev-java/jax-rpc-api:0
+		dev-java/wsdl4j:0
+	)
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	eapply "${FILESDIR}/${PN}-8.5.86-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.72.ebuild b/www-servers/tomcat/tomcat-9.0.72.ebuild
new file mode 100644
index 000000000000..77edaf178766
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.72.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	eapply "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index ff5a3c434619..bf0aa8db0c9f 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 5fef12f3e0ef..b20e76beee7c 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1 +1,2 @@
 DIST igt-gpu-tools-1.26.tar.xz 1573468 BLAKE2B 31fa9cd61fd9a120c72e78cb5ecbc686477ae82572c702bdd6bbc11ba49dc052b7cf52fa486b93e51c87389d73f892577c1d22ebe71d6f50b1565f32355021d1 SHA512 6eb67f68da1c79fac61e5abd57433ef51dbeb2b6f0923dc84aefb81d7059fbc94378fadcd7321a8f059edd9bac640032bf53c3aa058cf570fe5c31924396af8f
+DIST igt-gpu-tools-1.27.1.tar.xz 2321940 BLAKE2B b6c4fee31c97cd5005c1f2cd5c18c181582adfb27e92444a8e78d1c105acb78a424bd4e4af8d13333776c81531fbfd24dc4b7db0da9858f5b803f64962d6269d SHA512 20923505e9afe6e5064bf8f4056e027ff0321cd29d8982157a608369aea6fbef24c93756de96ef6296e09d539957fc6cdad4097cbab5af33f8828f762da0d8c0
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1.ebuild
new file mode 100644
index 000000000000..e5263c2dbe35
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.27.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="Intel GPU userland tools"
+
+HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
+fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+REQUIRED_USE="
+	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
+	overlay? (
+		video_cards_intel
+		|| ( X xv )
+	)
+	doc? ( tests )
+	runner? ( tests )
+"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/elfutils
+	dev-libs/glib:2
+	sys-apps/kmod:=
+	sys-libs/zlib:=
+	sys-process/procps:=
+	virtual/libudev:=
+	>=x11-libs/cairo-1.12.0[X?]
+	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
+	>=x11-libs/libpciaccess-0.10
+	x11-libs/pixman
+	chamelium? (
+		dev-libs/xmlrpc-c:=[curl]
+		sci-libs/gsl:=
+		media-libs/alsa-lib:=
+	)
+	overlay? (
+		>=x11-libs/libXrandr-1.3
+		xv? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXv
+		)
+	)
+	runner? ( dev-libs/json-c:= )
+	unwind? ( sys-libs/libunwind:= )
+	valgrind? ( dev-util/valgrind )
+	"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	man? ( dev-python/docutils )
+	overlay? (
+		>=dev-util/peg-0.1.18
+		x11-base/xorg-proto
+	)
+	video_cards_intel? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+BDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
+	default_src_prepare
+}
+
+src_configure() {
+	local gpus=""
+	use video_cards_amdgpu  && gpus+="amdgpu,"
+	use video_cards_intel   && gpus+="intel,"
+	use video_cards_nouveau && gpus+="nouveau,"
+
+	local overlay_backends=""
+	use overlay && use xv && overlay_backends+="xv,"
+	use overlay && use X && overlay_backends+="x,"
+
+	local emesonargs=(
+		$(meson_feature chamelium)
+		$(meson_feature doc docs)
+		$(meson_feature man)
+		$(meson_feature overlay)
+		$(meson_feature runner)
+		$(meson_feature tests)
+		$(meson_feature valgrind)
+		$(meson_feature unwind libunwind)
+		-Doverlay_backends=${overlay_backends%?}
+		-Dlibdrm_drivers=${gpus%?}
+	)
+	meson_src_configure
+}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
index 7bc5bd711ea5..e5263c2dbe35 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
 if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit ${GIT_ECLASS} meson python-any-r1
 
 DESCRIPTION="Intel GPU userland tools"
@@ -29,6 +29,7 @@ REQUIRED_USE="
 		|| ( X xv )
 	)
 	doc? ( tests )
+	runner? ( tests )
 "
 RESTRICT="test"
 
diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
index e2f12ba51f8a..fd625c5baf89 100644
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From aeb01fb49314017aa70b63531f728e61c983d4b9 Mon Sep 17 00:00:00 2001
+From f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
 Date: Fri, 27 Jan 2023 06:40:05 -0800
 Subject: [PATCH] Disable things we don't want
@@ -6,36 +6,38 @@ Subject: [PATCH] Disable things we don't want
 v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 ---
- meson.build                   | 11 +++--------
+ meson.build                   | 13 +++----------
  src/egl/opengl/meson.build    | 33 --------------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
  src/util/meson.build          |  7 +------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 4 insertions(+), 92 deletions(-)
+ 7 files changed, 4 insertions(+), 94 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index f93a731d..245d1655 100644
+index 6ad6ea7a..1c46da4f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -81,14 +81,7 @@ endif
+@@ -87,16 +87,7 @@ endif
  
  dep_threads = dependency('threads')
  
--dep_glu = dependency('glu', required : dep_x11.found())
--if not dep_glu.found()
+-dep_glu = dependency('glu', required : false)
+-# GLU is part of OpenGL.Framework
+-if not dep_glu.found() and host_machine.system() != 'darwin'
 -  _glu_name = 'GLU'
 -  if host_machine.system() == 'windows'
 -    _glu_name = 'glu32'
 -  endif
--  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+-    required : dep_x11.found())
 -endif
 +dep_glu = disabler()
  
  # GBM is needed for EGL on KMS
  dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -127,6 +120,8 @@ else
+@@ -135,6 +126,8 @@ else
    dep_glut = dependency('', required : false)
  endif
  
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 64479e5f3dfa..a0ad9373bd6c 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 29a64821bd89..b061ccbf2fac 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,2 +1 @@
-DIST xorg-server-21.1.6.tar.xz 4977496 BLAKE2B 8bcfa0a29f7b84b3ba9357d8ae9b1c7a5dc108159cf059f9c76c2c15f00be0d34964a3240937d146ae5f58a2d94deb091facacab984f8f905848bef5679cf46a SHA512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239
 DIST xorg-server-21.1.7.tar.xz 4933292 BLAKE2B 327e217dcd632d9c013a330dbb0f93bf3c1bf6088906fcb3ff2959574fb6958c215a2ab6ed41b57250a9f200bcc3987bf87c5ffd11c7a7088c7fe6f1a245bd4b SHA512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch b/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch
deleted file mode 100644
index def3c58714b4..000000000000
--- a/x11-base/xorg-server/files/xorg-server-21.1.4-BadIDChoice.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/857483
-https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
-
-From f61307631203ab0266c035db07c2f776cf7c6cf4 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Tue, 12 Jul 2022 14:44:48 +0200
-Subject: [PATCH] dix: Fix overzealous caching of ResourceClientBits()
-
-Commit c7311654 cached the value of ResourceClientBits(), but that value
-depends on the `MaxClients` value set either from the command line or
-from the configuration file.
-
-For the latter, a call to ResourceClientBits() is issued before the
-configuration file is read, meaning that the cached value is from the
-default, not from the maximum number of clients set in the configuration
-file.
-
-That obviously causes all sort of issues, including memory corruption
-and crashes of the Xserver when reaching the default limit value.
-
-To avoid that issue, also keep the LimitClient value, and recompute the
-ilog2() value if that changes, as on startup when the value is set from
-the the xorg.conf ServerFlags section.
-
-v2: Drop the `cache == 0` test
-    Rename cache vars
-
-Fixes: c7311654 - dix: cache ResourceClientBits() value
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-(cherry picked from commit 2efa6d659508346358a1ef27b2393e18843f66a3)
---- a/dix/resource.c
-+++ b/dix/resource.c
-@@ -620,12 +620,15 @@ ilog2(int val)
- unsigned int
- ResourceClientBits(void)
- {
--    static unsigned int cached = 0;
-+    static unsigned int cache_ilog2 = 0;
-+    static unsigned int cache_limit = 0;
- 
--    if (cached == 0)
--      cached = ilog2(LimitClients);
-+    if (LimitClients != cache_limit) {
-+        cache_limit = LimitClients;
-+        cache_ilog2 = ilog2(LimitClients);
-+    }
- 
--    return cached;
-+    return cache_ilog2;
- }
- 
- /*****************
--- 
-GitLab
-
-
diff --git a/x11-base/xorg-server/xorg-server-21.1.6.ebuild b/x11-base/xorg-server/xorg-server-21.1.6.ebuild
deleted file mode 100644
index 552f91189bcb..000000000000
--- a/x11-base/xorg-server/xorg-server-21.1.6.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/libbsd
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	xorg? (
-		>=x11-libs/libxcvt-0.1.0
-	)
-	xnest? (
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libX11-1.1.5
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux:=
-	)
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2021.4.99.2
-	>=x11-libs/xtrans-1.3.5
-	media-fonts/font-util
-	test? ( >=x11-libs/libxcvt-0.1.0 )
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
-	sys-devel/flex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )"
-
-UPSTREAMED_PATCHES=(
-	# https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
-	"${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
-	# bug #835653
-	use x86 && replace-flags -Os -O2
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-		--sysconfdir "${EPREFIX}/etc/X11"
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-		$(meson_use !minimal dri1)
-		$(meson_use !minimal dri2)
-		$(meson_use !minimal dri3)
-		$(meson_use !minimal glamor)
-		$(meson_use !minimal glx)
-		$(meson_use udev)
-		$(meson_use udev udev_kms)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use xephyr)
-		$(meson_use xnest)
-		$(meson_use xorg)
-		$(meson_use xvfb)
-		-Ddocs=false
-		-Ddrm=true
-		-Ddtrace=false
-		-Dipv6=true
-		-Dhal=false
-		-Dlinux_acpi=false
-		-Dlinux_apm=false
-		-Dsecure-rpc=false
-		-Dsha1=libcrypto
-		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-	)
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		emesonargs+=( -Dxwayland=false )
-	fi
-
-	if use systemd || use elogind; then
-		emesonargs+=(
-			-Dsystemd_logind=true
-			$(meson_use suid suid_wrapper)
-		)
-	else
-		emesonargs+=(
-			-Dsystemd_logind=false
-			-Dsuid_wrapper=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The meson build system does not support install-setuid
-	if ! use systemd && ! use elogind; then
-		if use suid; then
-			chmod u+s "${ED}"/usr/bin/Xorg
-		fi
-	fi
-
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-21.1.7.ebuild b/x11-base/xorg-server/xorg-server-21.1.7.ebuild
index 3e9ae63f6df6..b39b84ace650 100644
--- a/x11-base/xorg-server/xorg-server-21.1.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.7.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index a94e6e2e507d..87a4500a57f1 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,2 +1 @@
-DIST xwayland-22.1.7.tar.xz 1273476 BLAKE2B 9e128ff85690c6fb35eb196eefd49b1cf24aed290fd74cdb6e2fb8ad72d61b8dd9dccf83bdafc9a8e1ba13dc61135a7756dbae5ff40490d2076516d72818dbb1 SHA512 dc4187d4e9e1bbf5f431a4a71da01b773be3a8870c3f82da599739d9f72756ac69c1fb8cc3b6c96c88da3c1dd40ce42429a3a003c08f90fc337ebaf6200de649
 DIST xwayland-22.1.8.tar.xz 1273668 BLAKE2B ad1f3e0a6a3782b271653864380d0beb0db60293fb96ab8f218caaeef245967ad46ca505fb516a936115c9d49e6a32bffb725bc6c95dc98a6c4c24521c6022df SHA512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a
diff --git a/x11-base/xwayland/xwayland-22.1.7.ebuild b/x11-base/xwayland/xwayland-22.1.7.ebuild
deleted file mode 100644
index afcd2774aad0..000000000000
--- a/x11-base/xwayland/xwayland-22.1.7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 74c2a87abd47..f281a2dabcc0 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index ae6197c480be..f2fbc998ec07 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -2,45 +2,53 @@ DIST NVIDIA-Linux-aarch64-510.108.03.run 211471630 BLAKE2B 4177e12907bb577d96734
 DIST NVIDIA-Linux-aarch64-515.86.01.run 221097882 BLAKE2B f8562f9ef1d29451792e00f5489ae7bf63d1a9c5a13354f119667e5572f473abe14a82383c7f61251213ef16463c064059316c7da09a5d61207823b17a7183bf SHA512 43161f86143b1558d1f558acf4a060f53f538ea20e6235f76be24916fe4a9c374869645c7abf39eba66f1c2ca35f5d2b04f199bd1341b7ee6c1fdc879cb3ef96
 DIST NVIDIA-Linux-aarch64-525.85.05.run 262667903 BLAKE2B e6e4d2d8a90f5abbfc4d67ee1a74c062fcd91b4d46d247702e937d8e82c2ddeac19418a74908b90d31265819dfa93791c53cb111b41fe51732851c9d2e74c21e SHA512 85312583dbd55791273308aa3c3bf43241e0b28cbe850e56bd6997dcedd2db51af337d062587886ca4000cf39428a748c87d6e270648e09d4f0870856757a7d0
 DIST NVIDIA-Linux-aarch64-525.89.02.run 263020466 BLAKE2B 7f912746c186450b09b7e4b0e26731a8480a02e02a6d0009c1c96e33f91dd47604b262e8d42568b8c9127598cf17a19e7bf5cf29472a9e2b1cc8d765b2b39370 SHA512 a74d11453522dde936c022b6c8ef8df0349a10f825caaab3e7a58002f4afcd12160865ad9e5745b055430d978ebdcc0583dfe8b339ba60eead99517d49ee7191
+DIST NVIDIA-Linux-aarch64-530.30.02.run 218532678 BLAKE2B 96abcd638192c21556eb04969776c6c0ab0ab566b74de9455d0d4130bf4abd78dc12c93781f9fdf571ed1c07a59a71f893d4cf9fb9c0fc7298117cd58d02aaad SHA512 ed9a0c057e6cf97a1cf166f11b684427e7c93ae7ad1a0f00f8ef674b73aaa555d8134fe18d85ba8a233d4e68972e92f27501c1165e1cb1bc709174c679c06e32
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.161.03.run 272397700 BLAKE2B eaa94b7398b3aaadf30c33c95c95b167094ca56114e2e3032978b0959264ac8b8663181485eb1af0282a59b43f912c0ecd48e5eadcb06b6fda601b357ac49bc7 SHA512 26b1640f9427847b68233ffacf5c4a07e75ed9923429dfc9e5de3d7e5c1f109dfaf0fe0a0639cbd47f056784ed3e00e2e741d5c84532df79590a0c9ffa5ba625
 DIST NVIDIA-Linux-x86_64-510.108.03.run 329603898 BLAKE2B ec7327628cc0d5929f91fa7dcf09d741341b15a509169d8de187f66a99a9196077362bd9a370ba5e294fd644a3aee1bd3abfc45f20c9cb5b05660d299c9e0479 SHA512 70fbd91b0dc5db119acf20654854c417bb14889e84145e2675dc893e7247a9c34f90820cddb8202cf5c3219abc286c7014b247a2ce94bdb5681a1bca96f41a29
 DIST NVIDIA-Linux-x86_64-515.86.01.run 363743089 BLAKE2B aa03a0f059da99fa549cd9d672cef0194f2b22b349470d80ce626b3f4afb89b1f130b451735f92f5a66dfec02735bd6395053be609668371991837e3be4026cb SHA512 9a31e14afc017e847f1208577f597c490adb63c256d6dff1a9eae56b65cf85374a604516b0be9da7a43e9af93b3c5aec47b2ffefd6b4050a4b7e55f348cf4e7b
-DIST NVIDIA-Linux-x86_64-525.47.07.run 413838999 BLAKE2B 6921e903f45d49eadec8a690d8c86fefd0bc534a4412fa1a076db4b5cd2840c0c2c4076ab4ec0b562b9888bd4f0061f7d260c1e14b88653e912b17079e85d17b SHA512 51417a35a10a165f64751ce6bc7da2ab182d467bf3e6d3fac876c009fa413e044e16a1f32abbcca71209f8f29c2184c358aa9f88eddfb4ee80cea6817e1ee725
+DIST NVIDIA-Linux-x86_64-525.47.11.run 416273031 BLAKE2B fc9c5fb8b12a2a1a27750cd2692ca58552d60ad3647574c7489c4fa813960df027e604789344a9e46e6ecbc74f50e54e07bfd83883f73b3608a33cca55fd9a4e SHA512 13901de0aa26d0919695481b5bbe4c109dc0f4e58ec51692932c763ca741c8b9514096bd3859f95950de0d81c66f24f08ba9141771bf3a3d84eadb4219a81c4c
 DIST NVIDIA-Linux-x86_64-525.85.05.run 415131239 BLAKE2B 38bdcce884011cfc0a1b5d08807c0a163ac7807621f3ec69feabbdf27af9e0409491db893912776b05a45f8f56c06f281a84074ab8ff21a71774b890bdff2cf8 SHA512 db30b9186cdcf22b2dde267c08a10cadfc3d37190c57a26a71e282b0f661b187b5b28764418eacf8b2344ebfa8feb7480ae1de31b3bc3026feaf9482a3b51741
 DIST NVIDIA-Linux-x86_64-525.89.02.run 414116295 BLAKE2B 22a6da77876557c256cb5571b6ae78133bc150ceb16aaf331a332bdd891df40beac07ac70efedb11ec2458fcdf2a23247b54274d509a2b54e50f4da1251425e7 SHA512 a991c5a843957aa81cf619c39d699100ff69fc723fb195c68fd50cd69ee9d5651a223d3b5d254c8c1b7c8cad09e24846ba4e64869a8b3777e85cd3e5ba515bb5
+DIST NVIDIA-Linux-x86_64-530.30.02.run 344142236 BLAKE2B 68a7bc7baf8f09fa827c9e370e70a2c00d083554d4926eec523923815b71722c28c990cfb9b689e4cd5ed990de42f884e66a57a30f6ad87fe4cd3654c2fa2c9c SHA512 62a497a3f1b2f32692f756113a34caaf193f4d4d2488e02b832c9ebb8ef1a8c72722ae29b044068fac8c7edc25376ebb50cfc26e28ca9a74f37895138260de22
 DIST NVIDIA-kernel-module-source-515.86.01.tar.xz 7504412 BLAKE2B 20b1b9eb6e2fbc7adfa0b78c6acc88c9da8346888c3d1f1ec01a6c1252feccfc104e338605bfaf7617f0b78c7d0de05b32577394714be3575aa67b37c0e843ca SHA512 075fb8b9c3f43f21f51035460a9bc306b11214eb029e950a5bfbc283dc1d3403210ae303148442d31b2c5bf618923bd1762ab5a91234d005f50177fc02fa8ba4
 DIST NVIDIA-kernel-module-source-525.85.05.tar.xz 10081192 BLAKE2B b80f1893fe18dcb62ad2d1daaa7c1642e8699c7acda0bf55a104e10824ece908e45e8202949262fce5459b3bebe3582fa52aa506333989388eea94d65e26da11 SHA512 1ed3e69d959d68a351541483cbf552730ec1748faee3bacf1b9f0099650bc3244ed11a4aee84e51187321f59fbedaa92d24a66439265c9f2e436db82a6876ee0
 DIST NVIDIA-kernel-module-source-525.89.02.tar.xz 10094060 BLAKE2B 950058e9441302ffef78440be6fa3c25c0d768ea09433bcd943989cdc42e265ce78f3eb4447d77e834c7ffdee61a9bc09abc8bf10fa7f1dc0f75bc43c2c4ea55 SHA512 5044130d0a9a1237ae4ebaf6016e4959230fdeb2d5100cb8068906d2759246c4aeb965686cca67a498d0699e9d3b16f6e005b1eb342a32169a8f05dfd03d3730
+DIST NVIDIA-kernel-module-source-530.30.02.tar.xz 10484236 BLAKE2B 378bd1aeff96272452d90162c314dc2b05072cbec93b0be10cf974d889e178000005e1f1eee200ce85fcb80e7223a63c81cec95585189f90877be22352d8b83e SHA512 af03ed04af1c538f343c7f81497139bcadcec9d5dd2a607d9f6f9ca96b4e073c3dd4a0eec3a88e4e020e09c346fe7aaa007cff9af5b36814b2f14b66abaa266c
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.161.03.tar.bz2 146227 BLAKE2B 4c733877adbe5f44e2d112fe2401657c2e2809ff76d0eac29409be7c624e073d4a2fbcfb39eb706625d93d1f3c753d47271a6c2c660270824cfea350e07c751a SHA512 eab1308b85dd66ae4332aff766a237e77c763af45a0e62eba0958abcaa493950aa19edd95039d03e783d78d0ad1fe8348a13d5b64fa103410acfa6ad5f95a884
 DIST nvidia-installer-510.108.03.tar.bz2 144494 BLAKE2B de7c3f5c50350318a3e95bfbdd8fa7f51f187298497e88519f9d4719e26f310f2420ef8e500866cee0e6c22e888c4282a65e1edcc9c7e3d4d4799ff8e6856789 SHA512 b90efcc082b6de0ca42fe203ae0b60aafc8623377f31fd5262401e933bf630b11c843d5e02951374a9276e5d08eaa0c28bf2aa4987b8f9ae8719ada6e62ea7c1
 DIST nvidia-installer-515.86.01.tar.bz2 144637 BLAKE2B 840e2258224e0d19dfe092bc8e8d5986ff771a9fbacfc6c682c513e2757072b68252ebbe4ec8a491997db80f3e1c6879b9dc8f93134caf6f0e6ea3360253fbd9 SHA512 3f55ab79283f1730b5cf5898d9df97a78b8d86f0ac124af9e31c7a960f4a82e46bc262fc0cd8ae9c29c3bab65e2be1ca3565d0a470017a153fa58f61241b34b2
 DIST nvidia-installer-525.85.05.tar.bz2 147738 BLAKE2B 08d1f0e8d50a51b2057d190c0fe17d0b5ba1e313541cfff3ccd782348d2049ff85ef7b4e0c2a6dbdbb074a51b536db04cc11b856d02e22c2775788155163db39 SHA512 9b59a0ae0f64974d67f95a55bf21b1cda887ce60a5f8de07d83684ed36271e0fab15d50105e56df7bb6343e2749e014d174c7c7cdd37981983f178c246348f9d
 DIST nvidia-installer-525.89.02.tar.bz2 147686 BLAKE2B 0ffc3750f497ea9b8023d1a48e6b8c537971a6a616cdb465a4af5072d6c3c577ca439a1b573e1eacb7cf302d405b8e1b582efaaefadcaf39e33742ed22998dd9 SHA512 9d6b71c8a332caf052b642d8205830136b51151a04818dfda36e0b5adb5f3e2111c128f410a50239c38483225b38712b781fc0bce6dbc5fb8c7a6787f73f5104
+DIST nvidia-installer-530.30.02.tar.bz2 147913 BLAKE2B f59e5224b5b7929ff54ba666c66b8d9373d90755edd6552f009b35e69f217b29c49c9a00e2d74eeecbbddc99a38c3f580250a7b0c1f56e07d074aa301b736bbb SHA512 cb8d5ae2b3e4d41935d51c219cae6e7953d732157bc848b54da15ffb862621a17bc44f0fce5310de8c52178a5fcd5cb1a6828dec31abe85225d1cb5800185667
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.161.03.tar.bz2 38348 BLAKE2B a137e38463f806d25e91d81faefaabc5cd5e51e6537b0a9e641ff96b6029c522eca3766b46a240bd5d25cf04fc11c8eca6b1ae2cbdcc17bc7f0d059fcba67fc7 SHA512 f3b95c22b600b1e09797ff346b7bddb7d84abab01b5383b08626e3172cae8c84fcb3d0ce6425769eafad9602656704c51b934131b3e0b7512de82e5acafcfd15
 DIST nvidia-modprobe-510.108.03.tar.bz2 39055 BLAKE2B c195f55a60eb058b2da704d2aea245aab82a5129ac974cf0d5eeb6b39256c749b7b7de144e067887eac3fb03061d4f87a9c694429078d0eb0242227df1a65a3f SHA512 9ba4fd40b06ffc2f880944dc4b58155a746422cbb02cd17f6af59e3975d46861f182d9257fe654c35d991f7799d95a0a0ed0fe4bfac4426d997a22e3b270fd37
 DIST nvidia-modprobe-515.86.01.tar.bz2 39100 BLAKE2B 00157bc2cc78c58389772dd92c0e389420b93068c673153be32ae385efd50071ed9986c3bfe0d9242a539536c1cd3fd9c502ed7d00523aa653c7a9085a6333bb SHA512 14c82274bc87da0b4f2f8d3a53d02ea55fb003a32ed10a2259598db86655cccbf39fa6bded836cf2bb667c2eb842ae0ccfcf39fe32ee78ff291827673d02634c
 DIST nvidia-modprobe-525.85.05.tar.bz2 40018 BLAKE2B c065dcf143af716c02bae44c86f4325a6c4714aa937c3ea8a54ee3b4cfdd96a86bbad8f481daf8493dbd0e1400e301d58492d9996d16098d649a9e73d8ee824d SHA512 bddef88dece5e06711a4b47b9762ede13431470f2d1082a217737f6bd726ee3278acb1ea526c24198033ee6bbc0add5398d5ce90ea00c9e189a49b13842d72fe
 DIST nvidia-modprobe-525.89.02.tar.bz2 40010 BLAKE2B 5c7ee71c5f88a2680c5236abb9bb7ebdb3d09d42282663f33330ef75ffbbbe0f6cbb00e2b500426bd18d31f29a872e7a4ca532185baa8f7660eaaa47105a93ca SHA512 e29204f855291524a25c5db0e930d78aba539a374523293baf0c3c86c0c4c1c336f0d6473d0862b2e942efb2fefb1c2732cdfa20dde8f981b047ba34e48f2138
+DIST nvidia-modprobe-530.30.02.tar.bz2 40007 BLAKE2B 65e7b078e65653765aaa6a243bde81f88f9d5fd7d2ca3650bf35b8033b2ba533875510d6d8f92122b488835c9ca641437ad81e0668c740cde5326404d7b385ca SHA512 747ae9b1fbf841bd4bc0d197da4551b9da73db61f402921caafcc6ea4243d7f14b69522ee450d45154246d97d01fa8ab3060d23cace759a1bc3654ba66417c6c
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.161.03.tar.bz2 46540 BLAKE2B 7a9af37c570fd50341a620cb8324294e4e29ebcd165f7254ca8c7a0d3010b40ee3f6721e2e6cddb5378629bc20014a4d916141e4109f6167c688c506c7e0852c SHA512 45c49cbb2a61fdcead639bf2032950f97a403fb70870c46c71003d30477bce2936bd2e2dc6ba234987cd2397dca958e83e78850289e70d07e4cb9818a8ddf8b9
 DIST nvidia-persistenced-510.108.03.tar.bz2 47222 BLAKE2B bed22370ff15df7097e927e07c444a405702f53b9e5591b816a5c0bf1d9f78a045571ece830db86d4724a9b0466a8d67f2e45ec010c69f603a9bce5cd2b8da48 SHA512 39df00ead66f7a6b0e001484333c0dda09fc30daf0df0c8fec4f5913fb88e7a2d214830e7f20632aaf89acdd9af1f11d78b50eacc10cc9bd2b534f390aad52f7
 DIST nvidia-persistenced-515.86.01.tar.bz2 47153 BLAKE2B a7d213790895876453d34580f563ee0aee98ee145fdd8e7bdb726f91298da0f16a4101922a908d367af3ffd6ce1418128f7c5dc0a1e2789143832dc1b96ffc35 SHA512 ffe735178b3b5a0430bae8678b5f7fca407a0389de7f57a1789f67d3b4087cf7c638e6ded8a1cf7ef3ca642d0f889d9f2795fa0e18291101ef1b2a9e3bc4a174
 DIST nvidia-persistenced-525.85.05.tar.bz2 48165 BLAKE2B b0d396e22b2ec2d09d156b0024d308edf65ff5de1afb5d20e1fa33329f84776b7892f69feb2707a4d199bcce491ff647f24368f312f65df575bbadbe8fa31584 SHA512 8154c49072079b55ac9b6ea784004c47a4906b0ba1f2ef1cfc7f90bc7cb2259b14dd5655d0b36496f2546719f9b928f68689e4f449186913286fa838fc1fec13
 DIST nvidia-persistenced-525.89.02.tar.bz2 48135 BLAKE2B b7f0d085d18a45468bbb9d85a84ef9b7917d29f5158a836bacdbba7f3a3c05a2b6470b1a2b2a0f817396f234e620318a0d139ee8380783bb12511d764a09b235 SHA512 927a89de9392fa545e7ecd11f952c00657df92e6b1cfde6cff69851b09c04796a439768a8c6fb3b1b0e322239554ab029bf8235164f5e28ecf997b31733bef28
+DIST nvidia-persistenced-530.30.02.tar.bz2 48184 BLAKE2B d118d0c626ad24162f9ced705ea9db849638b719d5b16da0d0152ebac00a181eeac10f49524552cf9929b91ce6957cead958c845eadcd86d9646004adca2430c SHA512 9c2cc9396011cfbe8ea1e086605f12c17b8571e16eb37c1b25c1531ba95a8b5bf7fcdcdec6c5d455f767eb850c45b054e2edf3355dadd3c62102163a6bd106a5
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.161.03.tar.bz2 1062425 BLAKE2B 20523f1e5ab39dfe8ac657afdfafe3d99df2cfb521a475f54804dd50233d4e2ac5dc5fb0e3394997963daa5d06bc2b55088ebdcbf894c16cc9d25aba316834c5 SHA512 61725a6f77930d9c12de6fef57d9f5bb93a5e62e60d0db1707b7f469bce00464192930c4f46e9074e7bcbc4922fc86e9b22ddfdf092f8f46b0c6820505e3b87e
 DIST nvidia-settings-510.108.03.tar.bz2 1075907 BLAKE2B 537d38bd6a5fdca0182af9a7604764c14fb832a1dd2f0d6f2eb1532f06f3822ed9e2190293c1300b7f8971990883ea491269e7ab4838cd724196742e21352ce0 SHA512 3eed794ad7988143719c6d905e375d514daa441d9ed71eca7eff6cae4cdf4fbf08331f9b0451bcd961920f1ffc1797a257943900eef45e225b312b61232275ef
 DIST nvidia-settings-515.86.01.tar.bz2 1080128 BLAKE2B eed02cf9b73fc12c1d862df71d7fe9a4e4e8486831d1940c6e5187b751abe02deb0ebc495d251ffcd401f8ce78b16077d5cd9272c0f472d8c6465a958bf66c85 SHA512 d2c50bf587f53336a1d80ae88b382ef04e8c9ef24893f8ec901934eebb1358038ed67ac7501d98257c486a0fe2e818edd91832b3f989311c061d7a8b85818229
 DIST nvidia-settings-525.85.05.tar.bz2 1087280 BLAKE2B 2513d4b6e07c890249b2ab29ce1241666af8c939e5925854298ba858aca3e46f100a9327476cb75be0b056aee40153907780f021ff617d6fb8fe4d87604258b0 SHA512 f61f17f752392b7c39b7d5457b868eaa724020301288ce72621839135ed58b1c0979c491c111818d91f96e1253be74182aae6f538ade59e28071b420bd1a1a97
 DIST nvidia-settings-525.89.02.tar.bz2 1087020 BLAKE2B 5c1716a112046c09a390b0fd8212d32fb000e0214da6f5245722d2f84a9797509ef9b730a0774a4b719b9cd06afaa809262f1772a62a9c2eb386d7ab874a3ec3 SHA512 bd0527173a23e5c2142dca1a4a00f4844c8f83707627555812034ad2d23b0fa861cef047f3b83e3db3d0aaeb30411f745bf9ae892b576bb502169259a4e48893
+DIST nvidia-settings-530.30.02.tar.bz2 1086298 BLAKE2B 630cb04012119a6f13410d95c357d2cd4fbe792cc738aac13299809fa0f91ebfadc9f41661db2b2b75c654b063b89464ba510fd7810ec615e9fa965c1080e2b4 SHA512 b954e8e7b3430fa2377e28f29a9f02bbac1abe1f87cb54c2d2708248aec8df02a7f71b6a3738db523a4b571253101c2fe1814a461d741c7052d64ff096a67bb5
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.161.03.tar.bz2 108669 BLAKE2B 6c12e38759ce64c5637d6301e2d5c89b8d53ad4df84beea276b76cf6927eb6ff9596534b7097088d41447886ebb79e00b037c747a47531b13a56373df7ef8969 SHA512 0cccb61c3b875b47fc78cda627aace3a730e7c267389e0fcd4ab780aefaae3c48d95d137becdba7fc12adb284ede9307c85a3ae347d31a57a6283fece6046a9a
 DIST nvidia-xconfig-510.108.03.tar.bz2 109729 BLAKE2B 48378155d57f9b4a2b58b044daa1f2f2ed9b897b77f0453f67c7b03200cc09689b628f88a87c0f4c8ae149f11cbe6364eda34c2636cc1e1fce33b799d8225138 SHA512 17462e7826225804685eaea4dba05252dce138f95c72285abe607ee1b2a6269d2f4e5c0833802037d29350d1218ed9982053871b0b08c4f5f329d497da299fab
 DIST nvidia-xconfig-515.86.01.tar.bz2 109747 BLAKE2B d6253f9d052be5aaa1a2be82bf4a36c971aae8b6e9f61e4ff5f27ec415d945bab8289678d6a2495ff7521c66478421090a452ceb19d87803de4290aeb7f69bba SHA512 f4e66f23d9227671158ee0b99b1ccc44f25dc6a910d3b00332d135fb94f21b67f581804b53a40945a652777c898e20069962721931c7b58d2c33d38925da5e35
 DIST nvidia-xconfig-525.85.05.tar.bz2 110595 BLAKE2B 249263ad84c72c5682836bc3717774b95238197319a88b35adb9174e6023c385c49bf95ed1bf89a6d4fef0ba445a9802e437324358bddbe999f61849ea68afc0 SHA512 b2cad5f509e817e1e9f43bfce279a512d5899dbbb3dae212161b1ce7237ac3598e335779fbb7abb8b77327827838d7d310522f0b0a014498cff26f4ed5824841
 DIST nvidia-xconfig-525.89.02.tar.bz2 111065 BLAKE2B 762354ad413253389ca8f57fbfcc483a0b26026420f24f0b72af03716b4226e7a97d95a0e0a88e161200dac5d2257792ab0ae8b581436c3b92c733cf75a80a21 SHA512 a90df9a051472962aa7423fab3bcf6dbaab4669a223181da41922ec65c5c78927c68fef43c8031685439f037bae9d4553d7b388878109d45c8bdd5004cbf954f
-DIST open-gpu-kernel-modules-525.47.07.tar.gz 10306658 BLAKE2B 87243cffb77cd797eca51cf844c87bc9269f394635445043eaed1e554cf79341ba061aaab10018763baf1457c0ca54f1dd9cbdeab648cdf7273a2cd187fe5cfd SHA512 32948a8980e7240ee3d66185f2378e483b0a0b22513856fb22e09f91b020d3e6f4278c2b214c29a6c153cb375c3dcb6f5c73e5d22a00cbfc4bdd2e92f36ce94f
+DIST nvidia-xconfig-530.30.02.tar.bz2 110940 BLAKE2B 28a641642cb924fe15455fdf6d1b0861d08d475cbb4b69c23535857a1e3a28b133bc063f3f74241d55ee6def5d4ba70066943fcc1b5ae0ad80478466abbdeba7 SHA512 595ff2cbbe3393c38e7daa7ea72ff21f2e77773c7bf284f0b72aca41b587e6c87405e513b88aea74784853bf371c02de0924a327ad23be4042353b19c3e2fc1e
+DIST open-gpu-kernel-modules-525.47.11.tar.gz 10311870 BLAKE2B 50e6d021014eb05fab8baa6f1f0c9698e6e8b1c573788fc3a91918b457674dfb7f13a70e8020643eb431fe053eef585122eaf48366989afe39b497ade9f1010b SHA512 9d551e7fc121eafb508faf2fd564df878259ec59c926ea7aa1b8c0b77a28eb7011419e045aa4513a644b82d9ac7c7e8e12d5dcee1ebf2b7b58c17fba26cab5d3
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings-530.30.02-desktop.patch b/x11-drivers/nvidia-drivers/files/nvidia-settings-530.30.02-desktop.patch
new file mode 100644
index 000000000000..d1cdbcec448a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-settings-530.30.02-desktop.patch
@@ -0,0 +1,11 @@
+These __PLACEHOLDER__ are replaced by nvidia-installer which we don't use.
+--- a/nvidia-settings/doc/nvidia-settings.desktop
++++ b/nvidia-settings/doc/nvidia-settings.desktop
+@@ -5,5 +5,5 @@
+ Comment=Configure NVIDIA X Server Settings
+-Exec=__UTILS_PATH__/nvidia-settings
++Exec=nvidia-settings
+ Icon=nvidia-settings
+-Categories=__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__
++Categories=System;HardwareSettings;
+ 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.07.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.07.ebuild
deleted file mode 100644
index df55231da30f..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.07.ebuild
+++ /dev/null
@@ -1,629 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker user-info
-
-NV_KERNEL_MAX="6.2"
-NV_PIN="525.85.05"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://developer.nvidia.com/vulkan-driver"
-SRC_URI="
-	https://developer.nvidia.com/downloads/vulkan-beta-${PV//.}-linux
-		-> NVIDIA-Linux-x86_64-${PV}.run
-	$(printf "https://download.nvidia.com/XFree86/%s/%s-${NV_PIN}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${PV}.tar.gz
-		-> open-gpu-kernel-modules-${PV}.tar.gz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/vulkan"
-KEYWORDS="-* ~amd64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
-REQUIRED_USE="kernel-open? ( driver )"
-
-COMMON_DEPEND="
-	acct-group/video
-	sys-libs/glibc
-	X? ( x11-libs/libpciaccess )
-	persistenced? (
-		acct-user/nvpd
-		net-libs/libtirpc:=
-	)
-	tools? (
-		>=app-accessibility/at-spi2-core-2.46:2
-		dev-libs/glib:2
-		dev-libs/jansson:=
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,abi_x86_32(-)?]
-		x11-libs/libX11[abi_x86_32(-)?]
-		x11-libs/libXext[abi_x86_32(-)?]
-	)
-	wayland? (
-		gui-libs/egl-gbm
-		>=gui-libs/egl-wayland-1.1.10
-		media-libs/libglvnd
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
-	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
-)
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!SLUB_DEBUG_ON
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-
-	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
-	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of another option that requires it such as CONFIG_KVM."
-
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-peermem(video:kernel)
-		nvidia-uvm(video:kernel)"
-	use kernel-open &&
-		MODULE_NAMES=${MODULE_NAMES//:kernel/:kernel-module-source:kernel-module-source/kernel-open}
-
-	linux-mod_pkg_setup
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# do some extra checks manually as it gets messy to handle builtin-only
-	# and some other conditional checks through CONFIG_CHECK
-	# TODO?: maybe move other custom checks here for uniformity
-	local warn=()
-
-	if linux_chkconfig_builtin DRM_NOUVEAU; then
-		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
-		warn+=(
-			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
-			"    modules (can be safely kept as a module (=m) instead)."
-		)
-	fi
-
-	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
-		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
-		# configs (bug #840439), but without Fedora's kernel patch to
-		# workaround this issue (which is unlikely to work for us anyway)
-		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
-		warn+=(
-			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
-			"    (i.e. blanks when X/wayland starts, and tty loses display)."
-			"    For prebuilt kernels, unfortunately no known good workarounds."
-		)
-	fi
-
-	if ! linux_chkconfig_present FB_EFI &&
-		! linux_chkconfig_present FB_SIMPLE &&
-		! linux_chkconfig_present FB_VESA
-	then
-		# nvidia-drivers does not handle the tty (beside mode restoration) but,
-		# given few options are viable, try to warn if all missing
-		warn+=(
-			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
-			"    needed to get a display for the tty console. In most cases, it is"
-			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
-			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
-			"    or not using the tty may be able to safely ignore this warning."
-		)
-	fi
-
-	if kernel_is -ge 5 18 13; then
-		if linux_chkconfig_present FB_SIMPLE; then
-			warn+=(
-				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI or"
-				"    FB_VESA as it currently may be broken with >=kernel-5.18.13 + NVIDIA:"
-				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
-				"    (feel free to ignore this if it works for you)"
-			)
-		fi
-
-		if linux_chkconfig_present SYSFB_SIMPLEFB &&
-			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
-		then
-			warn+=(
-				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
-				"    from providing a working tty console display (ignore if unused)."
-			)
-		fi
-	fi
-
-	(( ${#warn[@]} )) &&
-		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules"
-
-	# Try to match toolchain with kernel only for modules
-	# (experimental, ideally this should be handled in linux-mod.eclass)
-	nvidia-tc-set() {
-		local -n var=KERNEL_${1}
-		if [[ ! -v var ]]; then
-			read -r var < <(type -P "${@:2}") ||
-				die "failed to find in PATH at least one of: ${*:2}"
-			einfo "Forcing '${var}' for modules (set ${!var} to override)"
-		fi
-	}
-
-	local tool switch
-	if linux_chkconfig_present CC_IS_GCC; then
-		if ! tc-is-gcc; then
-			switch=
-			nvidia-tc-set CC {${CHOST}-,}gcc
-			nvidia-tc-set CXX {${CHOST}-,}g++ # needed by kernel-open
-		fi
-	elif linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: using ${PN} with a clang-built kernel is largely untested"
-		if ! tc-is-clang; then
-			switch=llvm-
-			nvidia-tc-set CC {${CHOST}-,}clang
-			nvidia-tc-set CXX {${CHOST}-,}clang++
-		fi
-	fi
-
-	if linux_chkconfig_present LD_IS_BFD; then
-		# tc-ld-is-bfd needs https://github.com/gentoo/gentoo/pull/28355
-		[[ $(LC_ALL=C $(tc-getLD) --version 2>/dev/null) == "GNU ld"* ]] ||
-			nvidia-tc-set LD {${CHOST}-,}{ld.bfd,ld}
-	elif linux_chkconfig_present LD_IS_LLD; then
-		tc-ld-is-lld || nvidia-tc-set LD {${CHOST}-,}{ld.lld,lld}
-	fi
-
-	if [[ -v switch ]]; then
-		# only need llvm-nm for lto, but use complete set to be safe
-		for tool in AR NM OBJCOPY OBJDUMP READELF STRIP; do
-			case $(LC_ALL=C $(tc-get${tool}) --version 2>/dev/null) in
-				LLVM*|llvm*) [[ ! ${switch} ]];;
-				*) [[ ${switch} ]];;
-			esac && nvidia-tc-set ${tool} {${CHOST}-,}${switch}${tool,,}
-		done
-	fi
-
-	# pass unconditionally given exports are semi-ignored except CC/LD
-	for tool in CC CXX LD AR NM OBJCOPY OBJDUMP READELF STRIP; do
-		BUILD_PARAMS+=" ${tool}=\"\${KERNEL_${tool}:-\$(tc-get${tool})}\""
-	done
-
-	if linux_chkconfig_present LTO_CLANG_THIN; then
-		# kernel enables cache by default leading to sandbox violations
-		BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-	fi
-
-	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
-		ewarn "(Gentoo will not accept patches for this)."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${NV_PIN},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${NV_PIN},} || die
-	rm nvidia-settings && mv nvidia-settings{-${NV_PIN},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${NV_PIN},} || die
-	mv open-gpu-kernel-modules-${PV} kernel-module-source || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-		-i kernel{,-module-source/kernel-open}/conftest.sh || die
-
-	# adjust service files
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
-
-	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-
-	# makefile attempts to install wayland library even if not built
-	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
-		nvidia-settings/src/Makefile || die
-
-	# temporary option, nvidia will remove in the future
-	use !kernel-open ||
-		sed -i '/blacklist/a\
-\
-# Enable using kernel-open with workstation GPUs (experimental)\
-options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
-}
-
-src_compile() {
-	tc-export AR CC CXX LD OBJCOPY OBJDUMP
-	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
-
-	local xnvflags=-fPIC #840389
-	# lto static libraries tend to cause problems without fat objects
-	is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
-
-	NV_ARGS=(
-		PREFIX="${EPREFIX}"/usr
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_LD="$(tc-getBUILD_LD)"
-		BUILD_GTK2LIB=
-		NV_USE_BUNDLED_LIBJANSSON=0
-		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-		WAYLAND_AVAILABLE=$(usex wayland 1 0)
-		XNVCTRL_CFLAGS="${xnvflags}"
-	)
-
-	if use driver; then
-		if linux_chkconfig_present GCC_PLUGINS; then
-			mkdir "${T}"/plugin-test || die
-			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
-			:> "${T}"/plugin-test/test.c || die
-			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
-				=~ "error: incompatible gcc/plugin version" ]]
-			then
-				eerror "Detected kernel was built with a different gcc/plugin version,"
-				eerror "Please 'make clean' and rebuild your kernel with the current"
-				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
-				die "kernel ${KV_FULL} needs to be rebuilt"
-			fi
-		fi
-
-		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
-		if use kernel-open; then
-			# building the nvidia "blob" fails with lto, and also need
-			# to strip in case of a different toolchain for the kernel
-			filter-lto
-			strip-unsupported-flags
-		fi
-		linux-mod_src_compile
-		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe
-	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
-		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-			emake "${NV_ARGS[@]}" -C nvidia-settings
-	elif use static-libs; then
-		# pretend GTK+3 is available, not actually used (bug #880879)
-		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
-			-C nvidia-settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-	local -A paths=(
-		[APPLICATION_PROFILE]=/usr/share/nvidia
-		[CUDA_ICD]=/etc/OpenCL/vendors
-		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-		[FIRMWARE]=/lib/firmware/nvidia/${PV}
-		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-		[VULKAN_ICD_JSON]=/usr/share/vulkan
-		[WINE_LIB]=/usr/${libdir}/nvidia/wine
-		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-	)
-
-	local skip_files=(
-		# nvidia_icd/layers(vulkan): skip with -X too as it uses libGLX_nvidia
-		$(usev !X "
-			libGLX_nvidia libglxserver_nvidia
-			nvidia_icd.json nvidia_layers.json")
-		$(usev !wayland libnvidia-vulkan-producer)
-		libGLX_indirect # non-glvnd unused fallback
-		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
-		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-	)
-	local skip_modules=(
-		$(usev !X "nvfbc vdpau xdriver")
-		$(usev !driver gsp)
-		installer nvpd # handled separately / built from source
-	)
-	local skip_types=(
-		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
-		OPENCL_WRAPPER.\* # virtual/opencl
-		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
-	)
-
-	local DOCS=(
-		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-	)
-	local HTML_DOCS=( html/. )
-	einstalldocs
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usev driver "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
-$(use amd64 && usev !abi_x86_32 "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For general information on using ${PN}, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		doins "${T}"/nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-	fowners :video /usr/bin/nvidia-modprobe #505092
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	if use persistenced; then
-		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-		systemd_dounit "${T}"/nvidia-persistenced.service
-	fi
-
-	if use tools; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-	# mimic nvidia-installer by reading .manifest to install files
-	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
-	local m into
-	while IFS=' ' read -ra m; do
-		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
-			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
-			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-		case ${m[2]} in
-			MANPAGE)
-				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
-				continue
-			;;
-			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
-		esac
-
-		if [[ -v paths[${m[2]}] ]]; then
-			into=${paths[${m[2]}]}
-		elif [[ ${m[2]} =~ _BINARY$ ]]; then
-			into=/opt/bin
-		elif [[ ${m[3]} == COMPAT32 ]]; then
-			use abi_x86_32 || continue
-			into=/usr/${libdir32}
-		elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
-			into=/usr/${libdir}
-		else
-			die "No known installation path for ${m[0]}"
-		fi
-		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-			dosym ${m[4]} ${into}/${m[0]}
-			continue
-		fi
-		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
-			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
-
-		printf -v m[1] %o $((m[1] | 0200)) # 444->644
-		insopts -m${m[1]}
-		insinto ${into}
-		doins ${m[0]}
-	done < .manifest || die
-
-	# MODULE:installer non-skipped extras
-	: "$(systemd_get_sleepdir)"
-	exeinto "${_#"${EPREFIX}"}"
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	dobin nvidia-bug-report.sh
-
-	# MODULE:powerd extras
-	if use amd64; then
-		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
-	fi
-
-	# symlink non-versioned so nvidia-settings can use it even if misdetected
-	dosym nvidia-application-profiles-${PV}-key-documentation \
-		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# don't attempt to strip firmware files (silences errors)
-	dostrip -x ${paths[FIRMWARE]}
-}
-
-pkg_preinst() {
-	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(egetent group video | cut -d: -f3)
-	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
-		ewarn "this may lead to system instability/freezes with this version of"
-		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
-	fi
-
-	if [[ -v NV_LEGACY_MASK ]]; then
-		ewarn
-		ewarn "***WARNING***"
-		ewarn
-		ewarn "You are installing a version of ${PN} known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-
-	if use kernel-open; then
-		ewarn
-		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
-		ewarn "and only usable with Turing / Ampere and later GPUs, aka GTX 1650+."
-		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
-		ewarn
-		ewarn "Many features are not yet implemented in the drivers and limitations are"
-		ewarn "to be expected. Please do not report non-build/packaging bugs to Gentoo."
-		ewarn "Switch back to USE=-kernel-open to restore functionality if needed for now."
-	fi
-
-	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
-		elog
-		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
-		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for wayland."
-		elog
-		elog "If you experience issues, either disable wayland or edit nvidia.conf."
-		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.11.ebuild
new file mode 100644
index 000000000000..f4a9b9e7ecd4
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.11.ebuild
@@ -0,0 +1,629 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
+	systemd toolchain-funcs unpacker user-info
+
+NV_KERNEL_MAX="6.2"
+NV_PIN="525.89.02"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://developer.nvidia.com/vulkan-driver"
+SRC_URI="
+	https://developer.nvidia.com/downloads/vulkan-beta-${PV//.}-linux
+		-> NVIDIA-Linux-x86_64-${PV}.run
+	$(printf "https://download.nvidia.com/XFree86/%s/%s-${NV_PIN}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+	https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${PV}.tar.gz
+		-> open-gpu-kernel-modules-${PV}.tar.gz"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+SLOT="0/vulkan"
+KEYWORDS="-* ~amd64"
+IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
+REQUIRED_USE="kernel-open? ( driver )"
+
+COMMON_DEPEND="
+	acct-group/video
+	sys-libs/glibc
+	X? ( x11-libs/libpciaccess )
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
+	tools? (
+		>=app-accessibility/at-spi2-core-2.46:2
+		dev-libs/glib:2
+		dev-libs/jansson:=
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
+	)
+	wayland? (
+		gui-libs/egl-gbm
+		>=gui-libs/egl-wayland-1.1.10
+		media-libs/libglvnd
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
+	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
+)
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES"
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
+	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of another option that requires it such as CONFIG_KVM."
+
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)
+		nvidia-peermem(video:kernel)
+		nvidia-uvm(video:kernel)"
+	use kernel-open &&
+		MODULE_NAMES=${MODULE_NAMES//:kernel/:kernel-module-source:kernel-module-source/kernel-open}
+
+	linux-mod_pkg_setup
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI or"
+				"    FB_VESA as it currently may be broken with >=kernel-5.18.13 + NVIDIA:"
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+				"    (feel free to ignore this if it works for you)"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	BUILD_TARGETS="modules"
+
+	# Try to match toolchain with kernel only for modules
+	# (experimental, ideally this should be handled in linux-mod.eclass)
+	nvidia-tc-set() {
+		local -n var=KERNEL_${1}
+		if [[ ! -v var ]]; then
+			read -r var < <(type -P "${@:2}") ||
+				die "failed to find in PATH at least one of: ${*:2}"
+			einfo "Forcing '${var}' for modules (set ${!var} to override)"
+		fi
+	}
+
+	local tool switch
+	if linux_chkconfig_present CC_IS_GCC; then
+		if ! tc-is-gcc; then
+			switch=
+			nvidia-tc-set CC {${CHOST}-,}gcc
+			nvidia-tc-set CXX {${CHOST}-,}g++ # needed by kernel-open
+		fi
+	elif linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: using ${PN} with a clang-built kernel is largely untested"
+		if ! tc-is-clang; then
+			switch=llvm-
+			nvidia-tc-set CC {${CHOST}-,}clang
+			nvidia-tc-set CXX {${CHOST}-,}clang++
+		fi
+	fi
+
+	if linux_chkconfig_present LD_IS_BFD; then
+		# tc-ld-is-bfd needs https://github.com/gentoo/gentoo/pull/28355
+		[[ $(LC_ALL=C $(tc-getLD) --version 2>/dev/null) == "GNU ld"* ]] ||
+			nvidia-tc-set LD {${CHOST}-,}{ld.bfd,ld}
+	elif linux_chkconfig_present LD_IS_LLD; then
+		tc-ld-is-lld || nvidia-tc-set LD {${CHOST}-,}{ld.lld,lld}
+	fi
+
+	if [[ -v switch ]]; then
+		# only need llvm-nm for lto, but use complete set to be safe
+		for tool in AR NM OBJCOPY OBJDUMP READELF STRIP; do
+			case $(LC_ALL=C $(tc-get${tool}) --version 2>/dev/null) in
+				LLVM*|llvm*) [[ ! ${switch} ]];;
+				*) [[ ${switch} ]];;
+			esac && nvidia-tc-set ${tool} {${CHOST}-,}${switch}${tool,,}
+		done
+	fi
+
+	# pass unconditionally given exports are semi-ignored except CC/LD
+	for tool in CC CXX LD AR NM OBJCOPY OBJDUMP READELF STRIP; do
+		BUILD_PARAMS+=" ${tool}=\"\${KERNEL_${tool}:-\$(tc-get${tool})}\""
+	done
+
+	if linux_chkconfig_present LTO_CLANG_THIN; then
+		# kernel enables cache by default leading to sandbox violations
+		BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+	fi
+
+	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
+		ewarn "(Gentoo will not accept patches for this)."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${NV_PIN},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${NV_PIN},} || die
+	rm nvidia-settings && mv nvidia-settings{-${NV_PIN},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${NV_PIN},} || die
+	mv open-gpu-kernel-modules-${PV} kernel-module-source || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+		-i kernel{,-module-source/kernel-open}/conftest.sh || die
+
+	# adjust service files
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> "${T}"/nvidia-persistenced.service || die
+	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+
+	# makefile attempts to install wayland library even if not built
+	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
+		nvidia-settings/src/Makefile || die
+
+	# temporary option, nvidia will remove in the future
+	use !kernel-open ||
+		sed -i '/blacklist/a\
+\
+# Enable using kernel-open with workstation GPUs (experimental)\
+options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
+}
+
+src_compile() {
+	tc-export AR CC CXX LD OBJCOPY OBJDUMP
+	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
+
+	local xnvflags=-fPIC #840389
+	# lto static libraries tend to cause problems without fat objects
+	is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
+
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		BUILD_GTK2LIB=
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+		WAYLAND_AVAILABLE=$(usex wayland 1 0)
+		XNVCTRL_CFLAGS="${xnvflags}"
+	)
+
+	if use driver; then
+		if linux_chkconfig_present GCC_PLUGINS; then
+			mkdir "${T}"/plugin-test || die
+			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
+			:> "${T}"/plugin-test/test.c || die
+			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
+				=~ "error: incompatible gcc/plugin version" ]]
+			then
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
+			fi
+		fi
+
+		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
+		if use kernel-open; then
+			# building the nvidia "blob" fails with lto, and also need
+			# to strip in case of a different toolchain for the kernel
+			filter-lto
+			strip-unsupported-flags
+		fi
+		linux-mod_src_compile
+		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+	if use tools; then
+		# cflags: avoid noisy logs, only use here and set first to let override
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
+	elif use static-libs; then
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
+
+	local skip_files=(
+		# nvidia_icd/layers(vulkan): skip with -X too as it uses libGLX_nvidia
+		$(usev !X "
+			libGLX_nvidia libglxserver_nvidia
+			nvidia_icd.json nvidia_layers.json")
+		$(usev !wayland libnvidia-vulkan-producer)
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
+		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+	)
+	local skip_modules=(
+		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !driver gsp)
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
+	)
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usev driver "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
+
+For general information on using ${PN}, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
+
+	if use tools; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
+			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
+				continue
+			;;
+			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v paths[${m[2]}] ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} =~ _BINARY$ ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
+
+	# MODULE:installer non-skipped extras
+	: "$(systemd_get_sleepdir)"
+	exeinto "${_#"${EPREFIX}"}"
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	dobin nvidia-bug-report.sh
+
+	# MODULE:powerd extras
+	if use amd64; then
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
+
+	# symlink non-versioned so nvidia-settings can use it even if misdetected
+	dosym nvidia-application-profiles-${PV}-key-documentation \
+		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
+
+	# don't attempt to strip firmware files (silences errors)
+	dostrip -x ${paths[FIRMWARE]}
+}
+
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
+
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
+		ewarn "https://www.nvidia.com/object/IO_32667.html"
+	fi
+
+	if use kernel-open; then
+		ewarn
+		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
+		ewarn "and only usable with Turing / Ampere and later GPUs, aka GTX 1650+."
+		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
+		ewarn
+		ewarn "Many features are not yet implemented in the drivers and limitations are"
+		ewarn "to be expected. Please do not report non-build/packaging bugs to Gentoo."
+		ewarn "Switch back to USE=-kernel-open to restore functionality if needed for now."
+	fi
+
+	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for wayland."
+		elog
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.89.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.89.02.ebuild
index fe47ef3070bc..93e59196de1b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.89.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.89.02.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( driver )"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-530.30.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-530.30.02.ebuild
new file mode 100644
index 000000000000..42ca4a2076b0
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-530.30.02.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
+	systemd toolchain-funcs unpacker user-info
+
+NV_KERNEL_MAX="6.2"
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+SLOT="0/${PV%%.*}"
+#KEYWORDS="-* ~amd64 ~arm64" # beta branch
+IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
+REQUIRED_USE="kernel-open? ( driver )"
+
+COMMON_DEPEND="
+	acct-group/video
+	sys-libs/glibc
+	X? ( x11-libs/libpciaccess )
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
+	tools? (
+		>=app-accessibility/at-spi2-core-2.46:2
+		dev-libs/glib:2
+		dev-libs/jansson:=
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
+	)
+	wayland? (
+		gui-libs/egl-gbm
+		>=gui-libs/egl-wayland-1.1.10
+		media-libs/libglvnd
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
+	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+)
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES"
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
+	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of another option that requires it such as CONFIG_KVM."
+
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)
+		nvidia-peermem(video:kernel)
+		nvidia-uvm(video:kernel)"
+	use kernel-open &&
+		MODULE_NAMES=${MODULE_NAMES//:kernel/:kernel-module-source:kernel-module-source/kernel-open}
+
+	linux-mod_pkg_setup
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI or"
+				"    FB_VESA as it currently may be broken with >=kernel-5.18.13 + NVIDIA:"
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+				"    (feel free to ignore this if it works for you)"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	BUILD_TARGETS="modules"
+
+	# Try to match toolchain with kernel only for modules
+	# (experimental, ideally this should be handled in linux-mod.eclass)
+	nvidia-tc-set() {
+		local -n var=KERNEL_${1}
+		if [[ ! -v var ]]; then
+			read -r var < <(type -P "${@:2}") ||
+				die "failed to find in PATH at least one of: ${*:2}"
+			einfo "Forcing '${var}' for modules (set ${!var} to override)"
+		fi
+	}
+
+	local tool switch
+	if linux_chkconfig_present CC_IS_GCC; then
+		if ! tc-is-gcc; then
+			switch=
+			nvidia-tc-set CC {${CHOST}-,}gcc
+			nvidia-tc-set CXX {${CHOST}-,}g++ # needed by kernel-open
+		fi
+	elif linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: using ${PN} with a clang-built kernel is largely untested"
+		if ! tc-is-clang; then
+			switch=llvm-
+			nvidia-tc-set CC {${CHOST}-,}clang
+			nvidia-tc-set CXX {${CHOST}-,}clang++
+		fi
+	fi
+
+	if linux_chkconfig_present LD_IS_BFD; then
+		# tc-ld-is-bfd needs https://github.com/gentoo/gentoo/pull/28355
+		[[ $(LC_ALL=C $(tc-getLD) --version 2>/dev/null) == "GNU ld"* ]] ||
+			nvidia-tc-set LD {${CHOST}-,}{ld.bfd,ld}
+	elif linux_chkconfig_present LD_IS_LLD; then
+		tc-ld-is-lld || nvidia-tc-set LD {${CHOST}-,}{ld.lld,lld}
+	fi
+
+	if [[ -v switch ]]; then
+		# only need llvm-nm for lto, but use complete set to be safe
+		for tool in AR NM OBJCOPY OBJDUMP READELF STRIP; do
+			case $(LC_ALL=C $(tc-get${tool}) --version 2>/dev/null) in
+				LLVM*|llvm*) [[ ! ${switch} ]];;
+				*) [[ ${switch} ]];;
+			esac && nvidia-tc-set ${tool} {${CHOST}-,}${switch}${tool,,}
+		done
+	fi
+
+	# pass unconditionally given exports are semi-ignored except CC/LD
+	for tool in CC CXX LD AR NM OBJCOPY OBJDUMP READELF STRIP; do
+		BUILD_PARAMS+=" ${tool}=\"\${KERNEL_${tool}:-\$(tc-get${tool})}\""
+	done
+
+	if linux_chkconfig_present LTO_CLANG_THIN; then
+		# kernel enables cache by default leading to sandbox violations
+		BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+	fi
+
+	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
+		ewarn "(Gentoo will not accept patches for this)."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+		-i kernel{,-module-source/kernel-open}/conftest.sh || die
+
+	# adjust service files
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> "${T}"/nvidia-persistenced.service || die
+	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+
+	# makefile attempts to install wayland library even if not built
+	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
+		nvidia-settings/src/Makefile || die
+
+	# temporary option, nvidia will remove in the future
+	use !kernel-open ||
+		sed -i '/blacklist/a\
+\
+# Enable using kernel-open with workstation GPUs (experimental)\
+options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
+}
+
+src_compile() {
+	tc-export AR CC CXX LD OBJCOPY OBJDUMP
+	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
+
+	local xnvflags=-fPIC #840389
+	# lto static libraries tend to cause problems without fat objects
+	is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
+
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		BUILD_GTK2LIB=
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+		WAYLAND_AVAILABLE=$(usex wayland 1 0)
+		XNVCTRL_CFLAGS="${xnvflags}"
+	)
+
+	if use driver; then
+		if linux_chkconfig_present GCC_PLUGINS; then
+			mkdir "${T}"/plugin-test || die
+			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
+			:> "${T}"/plugin-test/test.c || die
+			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
+				HOSTCC="$(tc-getBUILD_CC)" CC="${CC}" M="${T}"/plugin-test 2>&1) \
+				=~ "error: incompatible gcc/plugin version" ]]
+			then
+				eerror "Detected kernel was built with a different gcc/plugin version,"
+				eerror "Please 'make clean' and rebuild your kernel with the current"
+				eerror "gcc (or re-emerge for distribution kernels, including kernel-bin)."
+				die "kernel ${KV_FULL} needs to be rebuilt"
+			fi
+		fi
+
+		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
+		if use kernel-open; then
+			# building the nvidia "blob" fails with lto, and also need
+			# to strip in case of a different toolchain for the kernel
+			filter-lto
+			strip-unsupported-flags
+		fi
+		linux-mod_src_compile
+		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+	if use tools; then
+		# cflags: avoid noisy logs, only use here and set first to let override
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
+	elif use static-libs; then
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
+
+	local skip_files=(
+		# nvidia_icd/layers(vulkan): skip with -X too as it uses libGLX_nvidia
+		$(usev !X "
+			libGLX_nvidia libglxserver_nvidia
+			nvidia_icd.json nvidia_layers.json")
+		$(usev !wayland libnvidia-vulkan-producer)
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
+		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+	)
+	local skip_modules=(
+		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !driver gsp)
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
+	)
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usev driver "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
+
+For general information on using ${PN}, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
+
+	if use tools; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
+			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
+				continue
+			;;
+			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v paths[${m[2]}] ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} =~ _BINARY$ ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
+
+	# MODULE:installer non-skipped extras
+	: "$(systemd_get_sleepdir)"
+	exeinto "${_#"${EPREFIX}"}"
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	dobin nvidia-bug-report.sh
+
+	# MODULE:powerd extras
+	if use amd64; then
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
+
+	# symlink non-versioned so nvidia-settings can use it even if misdetected
+	dosym nvidia-application-profiles-${PV}-key-documentation \
+		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
+
+	# don't attempt to strip firmware files (silences errors)
+	dostrip -x ${paths[FIRMWARE]}
+}
+
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
+
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
+		ewarn "https://www.nvidia.com/object/IO_32667.html"
+	fi
+
+	if use kernel-open; then
+		ewarn
+		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
+		ewarn "and only usable with Turing / Ampere and later GPUs, aka GTX 1650+."
+		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
+		ewarn
+		ewarn "Many features are not yet implemented in the drivers and limitations are"
+		ewarn "to be expected. Please do not report non-build/packaging bugs to Gentoo."
+		ewarn "Switch back to USE=-kernel-open to restore functionality if needed for now."
+	fi
+
+	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for wayland."
+		elog
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+	fi
+}
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 697730a8d769..3557b19982df 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1 +1,2 @@
 DIST xf86-video-amdgpu-22.0.0.tar.xz 376956 BLAKE2B 30936b45cce499791272e9194d5180c208e5159d1b3643ce6f261b2e92a30127a55096cdb07391cb4e91b9b47bbc9a4c5673ee66bdca5cd6f86fc74c7e3d6077 SHA512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a
+DIST xf86-video-amdgpu-23.0.0.tar.xz 381268 BLAKE2B f2d6c4e3548d4a5befb3f24d2a73924522ad111d85be4cd8520987d16b24de4ca80a22159f52d1f5cef3812628f14070dd62e013ab07603e053865a5975c8ab4 SHA512 bf26f147629a34e84a0ae8435119e170b9c95edafcab1995b63bb8f55abef32f2efbf4536eb070e64b2ae1460424b1b27a4206cb9836d33ddc6dfbee404f718b
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
new file mode 100644
index 000000000000..d495e0b881f3
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_DRI="always"
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+
+IUSE="udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
+	x11-base/xorg-server[-minimal]
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 18e70cf733fc..876bb84c34ba 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7a62019cb85a..8de7a387b7f5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
 DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
+DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild b/x11-libs/cairo/cairo-1.17.8.ebuild
new file mode 100644
index 000000000000..a27acb5ec771
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+	SRC_URI=""
+else
+	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug +glib gtk-doc test"
+RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib
+
+RDEPEND="
+	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+	# Upstream
+	"${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddwrite=disabled
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		-Dpng=enabled
+		$(meson_feature aqua quartz)
+		$(meson_feature X tee)
+		$(meson_feature X xcb)
+		$(meson_feature X xlib)
+		-Dxlib-xcb=disabled
+		-Dxml=disabled
+		-Dzlib=enabled
+
+		$(meson_feature test tests)
+
+		-Dgtk2-utils=disabled
+
+		$(meson_feature glib)
+		-Dspectre=disabled # only used for tests
+		$(meson_feature debug symbol-lookup)
+
+		$(meson_use gtk-doc gtk_doc)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+		mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+		rmdir "${ED}"/usr/share/gtk-doc/html || die
+	fi
+}
diff --git a/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
new file mode 100644
index 000000000000..a9bf577f9616
--- /dev/null
+++ b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
@@ -0,0 +1,109 @@
+From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri, 3 Feb 2023 15:40:12 +0100
+Subject: [PATCH] tee: Fix cairo wrapper functions
+
+Follow-up to !391 to apply the same changes to the (disabled by default)
+tee surface.
+
+Fixes: #634
+---
+ src/cairo-tee-surface.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c
+index 7a94c9bca..4994a5a60 100644
+--- a/src/cairo-tee-surface.c
++++ b/src/cairo-tee-surface.c
+@@ -220,12 +220,12 @@ _cairo_tee_surface_paint (void			*abstract_surface,
+     num_slaves = _cairo_array_num_elements (&surface->slaves);
+     slaves = _cairo_array_index (&surface->slaves, 0);
+     for (n = 0; n < num_slaves; n++) {
+-	status = _cairo_surface_wrapper_paint (&slaves[n], op, source, clip);
++	status = _cairo_surface_wrapper_paint (&slaves[n], op, source, 0, clip);
+ 	if (unlikely (status))
+ 	    return status;
+     }
+ 
+-    return _cairo_surface_wrapper_paint (&surface->master, op, source, clip);
++    return _cairo_surface_wrapper_paint (&surface->master, op, source, 0, clip);
+ }
+ 
+ static cairo_int_status_t
+@@ -244,13 +244,17 @@ _cairo_tee_surface_mask (void			*abstract_surface,
+     slaves = _cairo_array_index (&surface->slaves, 0);
+     for (n = 0; n < num_slaves; n++) {
+ 	status = _cairo_surface_wrapper_mask (&slaves[n],
+-					      op, source, mask, clip);
++					      op, source, 0,
++                                              mask, 0,
++                                              clip);
+ 	if (unlikely (status))
+ 	    return status;
+     }
+ 
+     return _cairo_surface_wrapper_mask (&surface->master,
+-					op, source, mask, clip);
++					op, source, 0,
++                                        mask, 0,
++                                        clip);
+ }
+ 
+ static cairo_int_status_t
+@@ -274,7 +278,7 @@ _cairo_tee_surface_stroke (void				*abstract_surface,
+     slaves = _cairo_array_index (&surface->slaves, 0);
+     for (n = 0; n < num_slaves; n++) {
+ 	status = _cairo_surface_wrapper_stroke (&slaves[n],
+-						op, source,
++						op, source, 0,
+ 						path, style,
+ 						ctm, ctm_inverse,
+ 						tolerance, antialias,
+@@ -284,7 +288,7 @@ _cairo_tee_surface_stroke (void				*abstract_surface,
+     }
+ 
+     return _cairo_surface_wrapper_stroke (&surface->master,
+-					  op, source,
++					  op, source, 0,
+ 					  path, style,
+ 					  ctm, ctm_inverse,
+ 					  tolerance, antialias,
+@@ -310,7 +314,7 @@ _cairo_tee_surface_fill (void				*abstract_surface,
+     slaves = _cairo_array_index (&surface->slaves, 0);
+     for (n = 0; n < num_slaves; n++) {
+ 	status = _cairo_surface_wrapper_fill (&slaves[n],
+-					      op, source,
++					      op, source, 0,
+ 					      path, fill_rule,
+ 					      tolerance, antialias,
+ 					      clip);
+@@ -319,7 +323,7 @@ _cairo_tee_surface_fill (void				*abstract_surface,
+     }
+ 
+     return _cairo_surface_wrapper_fill (&surface->master,
+-					op, source,
++					op, source, 0,
+ 					path, fill_rule,
+ 					tolerance, antialias,
+ 					clip);
+@@ -361,7 +365,7 @@ _cairo_tee_surface_show_text_glyphs (void		    *abstract_surface,
+     for (n = 0; n < num_slaves; n++) {
+ 	memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
+ 	status = _cairo_surface_wrapper_show_text_glyphs (&slaves[n], op,
+-							  source,
++							  source, 0,
+ 							  utf8, utf8_len,
+ 							  glyphs_copy, num_glyphs,
+ 							  clusters, num_clusters,
+@@ -374,7 +378,7 @@ _cairo_tee_surface_show_text_glyphs (void		    *abstract_surface,
+ 
+     memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
+     status = _cairo_surface_wrapper_show_text_glyphs (&surface->master, op,
+-						      source,
++						      source, 0,
+ 						      utf8, utf8_len,
+ 						      glyphs_copy, num_glyphs,
+ 						      clusters, num_clusters,
+-- 
+2.39.2
+
diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild
index dbe4aa355e0b..c00a3a0b6d00 100644
--- a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild
@@ -4,26 +4,28 @@
 EAPI=8
 
 MY_P="tinynotify-send-${PV}"
-
 DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
-HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
-SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/tinynotify-send/"
+SRC_URI="https://github.com/projg2/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
 
-RDEPEND="x11-libs/libtinynotify:="
-DEPEND="${RDEPEND}"
+DEPEND="
+	x11-libs/libtinynotify:=
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
+"
 
 src_configure() {
 	local myconf=(
-		$(use_enable doc gtk-doc)
+		--disable-gtk-doc
 		--disable-regular
 		--disable-system-wide
 	)
diff --git a/x11-libs/libtinynotify-cli/metadata.xml b/x11-libs/libtinynotify-cli/metadata.xml
index d17b2795134e..66d473d268b3 100644
--- a/x11-libs/libtinynotify-cli/metadata.xml
+++ b/x11-libs/libtinynotify-cli/metadata.xml
@@ -6,11 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to>
-		<remote-id type="github">mgorny/tinynotify-send</remote-id>
+		<remote-id type="github">projg2/tinynotify-send</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1-r1.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1-r1.ebuild
index 3fd392196e9c..610292371673 100644
--- a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1-r1.ebuild
+++ b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1-r1.ebuild
@@ -4,24 +4,26 @@
 EAPI=8
 
 DESCRIPTION="A system-wide notifications module for libtinynotify"
-HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/"
-SRC_URI="https://github.com/mgorny/libtinynotify-systemwide/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/libtinynotify-systemwide/"
+SRC_URI="https://github.com/projg2/libtinynotify-systemwide/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
 
-RDEPEND="
+DEPEND="
 	sys-process/procps:=
-	x11-libs/libtinynotify:="
-DEPEND="${RDEPEND}"
+	x11-libs/libtinynotify:=
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
+"
 
 src_configure() {
-	econf $(use_enable doc gtk-doc)
+	econf --disable-gtk-doc
 }
 
 src_install() {
diff --git a/x11-libs/libtinynotify-systemwide/metadata.xml b/x11-libs/libtinynotify-systemwide/metadata.xml
index de90f98171a9..0b69695892f4 100644
--- a/x11-libs/libtinynotify-systemwide/metadata.xml
+++ b/x11-libs/libtinynotify-systemwide/metadata.xml
@@ -6,11 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/libtinynotify-systemwide/issues/</bugs-to>
-		<remote-id type="github">mgorny/libtinynotify-systemwide</remote-id>
+		<remote-id type="github">projg2/libtinynotify-systemwide</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
index fee73d38bf30..b7935df8fb2c 100644
--- a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
+++ b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A lightweight implementation of Desktop Notification Spec"
-HOMEPAGE="https://github.com/mgorny/libtinynotify/"
-SRC_URI="https://github.com/mgorny/libtinynotify/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/libtinynotify/"
+SRC_URI="https://github.com/projg2/libtinynotify/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
+IUSE="debug"
 
-RDEPEND="sys-apps/dbus:0="
-DEPEND="${RDEPEND}"
+DEPEND="sys-apps/dbus:0="
+RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 DOCS=( README )
@@ -21,7 +21,6 @@ DOCS=( README )
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
-		$(use_enable static-libs static)
 	)
 
 	econf "${myconf[@]}"
diff --git a/x11-libs/libtinynotify/libtinynotify-9999.ebuild b/x11-libs/libtinynotify/libtinynotify-9999.ebuild
deleted file mode 100644
index 17f57c6cdd00..000000000000
--- a/x11-libs/libtinynotify/libtinynotify-9999.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
-
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-inherit autotools git-r3
-
-DESCRIPTION="A lightweight implementation of Desktop Notification Spec"
-HOMEPAGE="https://github.com/mgorny/libtinynotify/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static-libs"
-
-RDEPEND="sys-apps/dbus:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libtinynotify/metadata.xml b/x11-libs/libtinynotify/metadata.xml
index 65f92d78d224..644499183aba 100644
--- a/x11-libs/libtinynotify/metadata.xml
+++ b/x11-libs/libtinynotify/metadata.xml
@@ -6,11 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/libtinynotify/issues/</bugs-to>
-		<remote-id type="github">mgorny/libtinynotify</remote-id>
+		<remote-id type="github">projg2/libtinynotify</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 54677d87317b..d6c3c42a53ee 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
index 5cbefb2fe18b..b2b199f8570b 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit autotools xdg-utils
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
 SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )"
+	branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )"
 
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..4e06d355d20d
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter"
+SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="appindicator branding"
+
+DEPEND="x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2
+	appindicator? (
+		dev-libs/ayatana-ido
+		dev-libs/libayatana-indicator:3
+	)"
+
+BDEPEND="
+	dev-util/intltool
+	dev-util/xfce4-dev-tools
+	sys-devel/gettext
+"
+
+RDEPEND="${DEPEND}
+	x11-themes/gnome-themes-standard
+	>=x11-themes/adwaita-icon-theme-3.14.1"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed \
+			-e "/xft-hintstyle/s:slight:hintslight:" \
+			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			-i "${WORKDIR}"/${PN}.conf || die
+		# Add back the reboot/shutdown buttons
+		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
+			>> "${WORKDIR}"/${PN}.conf || die
+	fi
+	default
+
+	# Fix docdir
+	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-kill-on-sigterm
+		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
+		--with-libindicator=ayatana
+		$(use_enable appindicator libindicator)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
index 91860c1597e0..7cb2960c3068 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit autotools xdg-utils
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter"
 SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )"
+	branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )"
 
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml
index f465836dc081..bea26602d3d4 100644
--- a/x11-misc/lightdm-gtk-greeter/metadata.xml
+++ b/x11-misc/lightdm-gtk-greeter/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">Xubuntu/lightdm-gtk-greeter</remote-id>
 		<remote-id type="launchpad">lightdm-gtk-greeter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/polybar/polybar-3.6.3-r2.ebuild b/x11-misc/polybar/polybar-3.6.3-r2.ebuild
index 6abbfc9d38c9..ef368ca2f59a 100644
--- a/x11-misc/polybar/polybar-3.6.3-r2.ebuild
+++ b/x11-misc/polybar/polybar-3.6.3-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A fast and easy-to-use tool for creating status bars"
 HOMEPAGE="https://github.com/polybar/polybar"
 SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 40866f5b141a..b4431926f5bf 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1 +1,3 @@
 DIST qt5ct-1.5.tar.bz2 81089 BLAKE2B 8bf02a6c53c68f30e0647ff7c40c9d80044cbf914ee13f9e7f13ad6424e5cf73b9460af70ea484d498bfb693e8f8b018f7e32cac6205ffa2dba05930c6d0610c SHA512 fc16c7849a89aa8ee9480162888294638bc01f83b89d86c978397e58f6da4360cf07b9f558635b8a5b13bd10d18f3ad49663fe8a76183da9ae55aac23230b1e5
+DIST qt5ct-1.6.tar.bz2 85354 BLAKE2B 74c8976005cfedb65da25d7229014ab22b97bfc7ad5a0cb1a2263bf272cc4b4c9f9f3542913c16f45af84e27e9e093c86ce7f6bbafc646caeb8b7259dcc3ae3d SHA512 10172c664eaf573aa998a64c654c99a27400a47d52fc4b3691f2d1108d5a4df20d2d5c9a9235c52708759ed2be267d1bec9a792bfedb6e472f3cfe9ee1eced0c
+DIST qt5ct-1.7.tar.bz2 85464 BLAKE2B fc39d489a0e1e2cb8e0caeb587ea9dd434dca4adefcc788fe3936a6f7bbc3c55b22072915580e1b0376d0b37433b59e355e220f3dc280a0de2d2600a37df237a SHA512 97f1afc137e750abbb8c4e442cb6e09d2aa0c4979de2117ea644d484e1f7489bec144332814aae961bfaa5f8ac9ddf027c7a665274a65aef26fc4bf7c45610c0
diff --git a/x11-misc/qt5ct/qt5ct-1.6.ebuild b/x11-misc/qt5ct/qt5ct-1.6.ebuild
new file mode 100644
index 000000000000..dac5f4a047cf
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=[dbus]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dev-qt/qtpaths:5
+"
+
+src_install() {
+	cmake_src_install
+
+	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}
diff --git a/x11-misc/qt5ct/qt5ct-1.7.ebuild b/x11-misc/qt5ct/qt5ct-1.7.ebuild
new file mode 100644
index 000000000000..dac5f4a047cf
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-1.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=[dbus]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dev-qt/qtpaths:5
+"
+
+src_install() {
+	cmake_src_install
+
+	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}
diff --git a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
index 907a2a7510f5..065d94897723 100644
--- a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
@@ -25,7 +25,7 @@ else
 			-> ${P}.tar.bz2"
 		S="${WORKDIR}"/${PN}-v${PV}
 	fi
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-3+"
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 6e80951c7dbd..7cad37d07bb7 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -8,7 +8,7 @@ inherit cmake pam systemd
 DESCRIPTION="Simple Login Manager"
 HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
 SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/sw-notify-send/metadata.xml b/x11-misc/sw-notify-send/metadata.xml
index d17b2795134e..66d473d268b3 100644
--- a/x11-misc/sw-notify-send/metadata.xml
+++ b/x11-misc/sw-notify-send/metadata.xml
@@ -6,11 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to>
-		<remote-id type="github">mgorny/tinynotify-send</remote-id>
+		<remote-id type="github">projg2/tinynotify-send</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
index 89f5d2ea4b6e..d2711a3030c0 100644
--- a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
+++ b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
@@ -1,26 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P=tinynotify-send-${PV}
 DESCRIPTION="A system-wide variant of tinynotify-send"
-HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
-SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/tinynotify-send/"
+SRC_URI="https://github.com/projg2/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libtinynotify:0=
+DEPEND="
+	x11-libs/libtinynotify:0=
 	~x11-libs/libtinynotify-cli-${PV}
-	x11-libs/libtinynotify-systemwide:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	x11-libs/libtinynotify-systemwide:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( README )
-S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	local myconf=(
diff --git a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
deleted file mode 100644
index a7650200395f..000000000000
--- a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git"
-inherit autotools git-r3
-
-MY_P=tinynotify-send-${PV}
-DESCRIPTION="A system-wide variant of tinynotify-send"
-HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="x11-libs/libtinynotify:0=
-	~x11-libs/libtinynotify-cli-${PV}
-	x11-libs/libtinynotify-systemwide:0="
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-library
-		--disable-regular
-		--enable-system-wide
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/x11-misc/tinynotify-send/metadata.xml b/x11-misc/tinynotify-send/metadata.xml
index d17b2795134e..66d473d268b3 100644
--- a/x11-misc/tinynotify-send/metadata.xml
+++ b/x11-misc/tinynotify-send/metadata.xml
@@ -6,11 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to>
-		<remote-id type="github">mgorny/tinynotify-send</remote-id>
+		<remote-id type="github">projg2/tinynotify-send</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild b/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild
index c6c4bc1676d7..7e6c1580db40 100644
--- a/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild
+++ b/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A notification sending utility (using libtinynotify)"
-HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
-SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/tinynotify-send/"
+SRC_URI="https://github.com/projg2/tinynotify-send/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="app-eselect/eselect-notify-send
+DEPEND="
 	x11-libs/libtinynotify:0=
-	~x11-libs/libtinynotify-cli-${PV}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	~x11-libs/libtinynotify-cli-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-notify-send
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_configure() {
 	local myconf=(
diff --git a/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild b/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild
deleted file mode 100644
index 7f7ee4ddbf61..000000000000
--- a/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-inherit autotools git-r3
-
-DESCRIPTION="A notification sending utility (using libtinynotify)"
-HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="app-eselect/eselect-notify-send
-	x11-libs/libtinynotify:0=
-	~x11-libs/libtinynotify-cli-${PV}"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-library
-		--enable-regular
-		--disable-system-wide
-		--with-system-wide-exec=/usr/bin/sw-notify-send
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	eselect notify-send update ifunset
-}
-
-pkg_postrm() {
-	eselect notify-send update ifunset
-}
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index de004756c804..bb2a1cfa7bad 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt"
 
 src_prepare() {
diff --git a/x11-misc/xclip/xclip-9999.ebuild b/x11-misc/xclip/xclip-9999.ebuild
index ffdfc0010b13..61bcf329f7bf 100644
--- a/x11-misc/xclip/xclip-9999.ebuild
+++ b/x11-misc/xclip/xclip-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	x11-base/xorg-proto
 	x11-libs/libXt
 "
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ef0114fb8d20..44559d585ba5 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1 +1,2 @@
 DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a28921d02218402ca0125e8644be04a14f897e357a224fed12f9a85c6d147b4fa659241004bf49ac16c19b7f5fceb2b6d3295 SHA512 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e
+DIST xkeyboard-config-2.38.tar.xz 884988 BLAKE2B 058543eb04917c785bbb02b5a11a2492c4ad3e1910e764f476e04fd2405e4c158d7e4942da00693efc683a39dd9fe11e55003c1c9ce10cc802744e98ebcd269d SHA512 20848a5a10cfa58265518add796fd97ddd2e39e7a87b18170cd9ebc3ec87268e92641f2cd8aaed1ed80cdbe3801b65a8a916321ffc20a419511b3d2a85b0dd2a
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
new file mode 100644
index 000000000000..a73d92e50be9
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
+	)
+	meson_src_configure
+}
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index ef075996f29b..181eceb917d2 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,2 +1,3 @@
 DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf0962c5b3ff16ee8ce4d31de96a3d94798fc70dee4ee3f05759d16758f2083436fb91c212ab22f719bd3f086fac51ee5d73 SHA512 16fffd2c92d30c985f55093f46249440388a1eeeca9bd70cd06883f75052170c9717925b18dd01b16ce55d03758bbbf5f2b10c76de00f752b3e7ff64e74e646d
 DIST xorg-server_21.1.4-3.diff.gz 163364 BLAKE2B 66211f1b0c2332266af6e317ebbb2e21fe03e32b9c3f1ef7b71df045fe0694162aa62b27f2f7e6e6b72aaa365334a0acf98880674111e57d4042c49ac6521563 SHA512 e0a3805a4a4dce9e7851aca586d808723cbca09da4ce3191d1602497469a4240bffb68835a343e28b6eb2a50f7c815fac12378c08bdcc62b88cb488f13d6c966
+DIST xorg-server_21.1.7-1.diff.gz 168149 BLAKE2B 68011ab5d77efec6c42921c906ff1be4f7b3b2455025d5fb8f33270bddf02f1bd2c3fd0997b9ad356298d0ee4b8b2f1af6244b39281756259a737e3a5d7a6814 SHA512 433f8d19691f3d0f8bd04f4d8dbd201079da8503d4174d01894824b8239c032af35727e5502b4a2491d9975ba0c6ba6d55c504fbc23c0ca65cc7ba695594d143
diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
new file mode 100644
index 000000000000..bc324ffce716
--- /dev/null
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=xorg-server
+MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
+DESCRIPTION="Run a command in a virtual X server environment"
+HOMEPAGE="https://packages.debian.org/sid/xvfb"
+SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="dev-util/patchutils"
+RDEPEND="x11-apps/xauth
+	x11-base/xorg-server[xvfb]"
+
+S="${WORKDIR}"/
+
+src_prepare() {
+	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
+	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
+	eapply_user
+}
+
+src_install() {
+	doman ${PN}.1
+	dobin ${PN}
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index cfad69a35317..d1dd91c6488a 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r2.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r2.ebuild
index b02c7a8fd798..dba9659c6757 100644
--- a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r2.ebuild
+++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/philipl/pidgin-indicator/releases/download/${PV}/${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE=""
 
 # No direct gtk3 until pidgin migrates:
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 79a239e0ff20..d6bfde7ed932 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.27.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.27.1.ebuild
index b39d00301084..683e7101b6b5 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.27.1.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.27.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 src_compile() { :; }
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.27.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.27.1.ebuild
index f29634123585..f217412c7ed0 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.27.1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.27.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 BDEPEND="sys-libs/ncurses"
diff --git a/x11-terms/kitty/kitty-0.27.1.ebuild b/x11-terms/kitty/kitty-0.27.1.ebuild
index 707ea2a4a999..cab374ab5e20 100644
--- a/x11-terms/kitty/kitty-0.27.1.ebuild
+++ b/x11-terms/kitty/kitty-0.27.1.ebuild
@@ -16,7 +16,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
 		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Fast, feature-rich, GPU-based terminal"
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index d3f47cab0a09..a8abe33912cd 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,4 +1,2 @@
-DIST terminator-2.1.1.tar.gz 1033153 BLAKE2B f92235bacf34ec5bfe2400c6bbfc8bbdee3867531fac5129fb59b84459101f2d673e3a6699eecf1fa0d19c33d30467bb043010bd19737c2bc0461cea861c71a7 SHA512 a916b9718801bb015d14bdec2eede24c89101d5ea36d22131b7d34f8dad48b9db9e79811645ce571e3c95c9e4b2f18d6b8508f519de7ff54c4246c5f7b546af2
-DIST terminator-2.1.1.tar.gz.asc 866 BLAKE2B d7362ce47f0cba18a3d10c54dca40b23001c818784cf5b5e4c98fbbd13983cf46e6ce631c4a4f5464c2badbb21e6052ce31456bf8b2d2c2deea6a647ad184b5c SHA512 ab171e0538686599fd86a35d0f5455aa9763c5f29c2c6bd5677cfd678beaeaad4dc141553e0abfecd19279a1a1653f12e07ed20f03ee09ee8ec10edbd63d6c14
 DIST terminator-2.1.2.tar.gz 1039160 BLAKE2B 2ca98c1caeadfffd2c7f737947b216a1db438a426a95cb9871504b827c3e85384df157d96a47c5f3d2cdc33e5e6b0e35cb8019b7a4bbc92fe59603379610e2e0 SHA512 070bf49979dd93e694b536877bac2d6ad274a1e961ef74df90348da6520fc411e7d0a73cd0d0c8fa2989c94ea75758fd15c09357f4f2ca8e7f6a4ab6c1236748
 DIST terminator-2.1.2.tar.gz.asc 866 BLAKE2B 3d998365e039935742635f049513f5c43cd45c067d7d31914bf8284b79af3daccdbd524b35c37ca419b96083e5986d365a6e7654b847d460c85179ff9da1886e SHA512 422b81676c6a53f736d39b5ff771d87e18053c188e0e97807f199080523430ede1e6d90d3f001fb3654b4b6bc90da9cc5f874a2639fa87ef8848868caa71342e
diff --git a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
deleted file mode 100644
index c924de3607f5..000000000000
--- a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Without this patch, terminator's build script runs gtk-update-icon-cache which
-causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
-its own. To avoid that, gtk-update-icon-cache is run later, as part of
-xdg_pkg_postinst in the ebuild.
-
---- a/setup.py	2009-08-12 22:22:53.000000000 -0400
-+++ b/setup.py	2009-08-12 22:22:57.000000000 -0400
-@@ -25,7 +25,7 @@
- 
-   def __init__ (self, *args):
-     self.without_gettext = False
--    self.without_icon_cache = False
-+    self.without_icon_cache = True
-     Distribution.__init__(self, *args)
- 
- 
diff --git a/x11-terms/terminator/terminator-2.1.1-r1.ebuild b/x11-terms/terminator/terminator-2.1.1-r1.ebuild
deleted file mode 100644
index 16cec74dd7c2..000000000000
--- a/x11-terms/terminator/terminator-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1 optfeature verify-sig virtualx xdg
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="https://github.com/gnome-terminator/terminator"
-SRC_URI="
-	https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz
-	verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz.asc )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/gsettings-desktop-schemas[introspection]
-	x11-libs/gtk+:3
-	x11-libs/vte:2.91[introspection]
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	test? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		x11-libs/libnotify[introspection]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-terminator )
-"
-distutils_enable_tests pytest
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/terminator.asc
-
-PATCHES=(
-	"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
-	"${FILESDIR}"/terminator-1.91-desktop.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "D-Bus" dev-python/dbus-python
-	optfeature "desktop notifications" "x11-libs/libnotify[introspection]"
-	optfeature "global keyboard shortcuts" "dev-libs/keybinder:3[introspection]"
-}
diff --git a/x11-terms/terminator/terminator-2.1.2.ebuild b/x11-terms/terminator/terminator-2.1.2.ebuild
index 1f575225d276..9c48b2ff7382 100644
--- a/x11-terms/terminator/terminator-2.1.2.ebuild
+++ b/x11-terms/terminator/terminator-2.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index baa593b54014..96691fcda6e1 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index fe40a156f274..f5a74ce4b0b9 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,2 +1,2 @@
-DIST papirus-icon-theme-20221201.tar.gz 33494699 BLAKE2B 546c7b3530fc039821e2d183f426d4131182c5c923c51b86367352c39d40c7f96e4f1f3e842d1c286db68685ecc5afa5898de2605f299eff781f7d1a801ec3e9 SHA512 2c4f73f3036a66efccbc6c19d6e571782f0d8549a4bcee55d85413f4960dc1941a15cdc667760d73d5e75211444d4c4b9814bdd6294037719dd5cfe03a2ad445
 DIST papirus-icon-theme-20230104.tar.gz 33527798 BLAKE2B 9aa80a3611f0a39aa0fabeb0a20a7d901ed983c046208784bbd268151a7668adf99d0e4d9df9efe544864278dc2ff417a40ab581610f11d204a4288e68173adb SHA512 c07adc6258e9c0b37b250efae91825004b5b440304b9a901dbccec90fe683eee6871f5bf3205e79ee1bf44fe13ce5f014cbfc99b1bb6488e82bd6b0b8b730bfa
+DIST papirus-icon-theme-20230301.tar.gz 33609598 BLAKE2B 7c4910d9992696ebba1e13e965fa39fb339aede971f39bdf1947f1ceaf3744ca30aa3ac348e9735e9e7004872fb6ad34747709968da84d9c13c1ad87bfba97b4 SHA512 bdb0bb4c16b33459c19665953294b34776d2ac712ee6f1e8673396f18673b68a10c90d3b2406febb5d4fad76296eb4f60f0db60a85bf6ee6f15700ee025d9cec
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20221201.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20221201.ebuild
deleted file mode 100644
index a3a26b110a03..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20221201.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xdg
-
-DESCRIPTION="Free and open source SVG icon theme"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-src_prepare() {
-	default
-	# https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/issues/3241
-	cd Papirus/128x128/apps/ || die
-	ln -s beneath-a-steel-sky.svg bass.svg || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r Papirus{,-Dark,-Light}
-
-	# Install variants designed for elementary OS and Pantheon Desktop only
-	doins -r ePapirus{,-Dark}
-}
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild
new file mode 100644
index 000000000000..0279bb437c4d
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit xdg
+
+DESCRIPTION="Free and open source SVG icon theme"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r Papirus{,-Dark,-Light}
+
+	# Install variants designed for elementary OS and Pantheon Desktop only
+	doins -r ePapirus{,-Dark}
+}
diff --git a/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
index cef9b7238795..5a2cfd728d1f 100644
--- a/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
+++ b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="x11-misc/slim"
 
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-22.10.3.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-22.10.3.ebuild
index 42a449c95f43..0fd2cb1608ad 100644
--- a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-22.10.3.ebuild
+++ b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-22.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://ubuntu/pool/main/u/${PN}/${MY_P}.orig.tar.gz"
 # Review COPYING file for updates
 LICENSE="CC-BY-SA-3.0"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index f0b51ad64a81..a57c30f79d34 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 03f96542d3d2..74889b08fd0c 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,3 +1,4 @@
 DIST xfce4-notifyd-0.6.5.tar.bz2 572193 BLAKE2B 498c8eecfd884aa04230fea2ecca3b663f0d6b59b549cc5a56d43ac20a17d4f15a1bd1e3ce8d1681de7307d569096bbbbe169ada447d41f7889daad5a35c8a8f SHA512 9953dd456520bd80e0d48da013703d7b976f953b9b41cd55f3ac236a74c55277d04f38a092e2a9024cd67cbcde3f3989daadf6b4f41e57c7e005c20f4acdf1ac
 DIST xfce4-notifyd-0.8.0.tar.bz2 612641 BLAKE2B 4a368ba2dc8769586d6496ced8116a82e2ef548aa1e99ceb6066223a8c5a215089aed612909301d4bdc110d8172aae3274a988e4066b0b8d3d2fbd9135f8e373 SHA512 3b53036105fc194f87a4a76d5c5c578d0435bacf0fc10b5d0eeba37230cd76c9ce56cd30c840ee1d47baedffb1f1c1f2b8c88a0d6ca36207f0596ebc6ba75271
 DIST xfce4-notifyd-0.8.1.tar.bz2 548158 BLAKE2B d512642d93e486aaec740eaa3b9b7aaa5875dfa6a16c328af8318d616cd3acd2bb891747782431be6237fe3090b80fc9d158866deccef1d99a3e6bf16fbb964b SHA512 555261a5931030e50686c4fb86fe62c5455ecba3ed6251851e0fae8652fbc85cb3c4fff3444a3dd6df3d9c44955d4f3049720c04635560170e3eb2c98aa95122
+DIST xfce4-notifyd-0.8.2.tar.bz2 684013 BLAKE2B ffb5e6ae171db83abeeebd375cbabb73b9a4f0e7d9135593ad2a3bf4c76b2080ce40134922ad1e4d11456166cc9a00cbfda6ee571c0934afc314451153dc6d75 SHA512 8da4bc1f81c1baa91367ba508be87e2bac71180734062cdcb308076acf97a5ccb52382b7e1bd031750253dda6a69882eb92f4679220bb042426092a47eb8c7e0
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.8.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.8.2.ebuild
new file mode 100644
index 000000000000..c81204b5a186
--- /dev/null
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.8.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Notification daemon for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/apps/notifyd/start
+	https://gitlab.xfce.org/apps/xfce4-notifyd/
+"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="sound wayland X"
+
+DEPEND="
+	>=dev-db/sqlite-3.34:3
+	>=dev-libs/glib-2.68.0:2
+	>=x11-libs/gtk+-3.22:3[wayland?,X?]
+	>=x11-libs/libnotify-0.7
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.14.0:=
+	>=xfce-base/xfconf-4.10:=
+	sound? (
+		>=media-libs/libcanberra-0.30[gtk3]
+	)
+	wayland? (
+		>=gui-libs/gtk-layer-shell-0.7.0
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable wayland gdk-wayland)
+		$(use_enable wayland gtk-layer-shell)
+		$(use_enable X gdk-x11)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}